Merge pull request #34992 from JuliaLang/backports-release-1.4

Backports for Julia 1.4.0

Author: KristofferC

Make.inc

@@ -1012,14 +1012,26 @@ endif
 
 # We need python for things like BB triplet recognition.  We don't really care
 # about version, generally, so just find something that works:
-PYTHON := $(shell which python 2>/dev/null || which python3 2>/dev/null || which python2 2>/dev/null || echo not found)
+PYTHON := "$(shell which python 2>/dev/null || which python3 2>/dev/null || which python2 2>/dev/null || echo not found)"
+PYTHON_SYSTEM := $(shell $(PYTHON) -c 'from __future__ import print_function; import platform; print(platform.system())')
+
+# If we're running on Cygwin, but using a native-windows Python, we need to use cygpath -w
+ifneq ($(and $(filter $(PYTHON_SYSTEM),Windows),$(findstring CYGWIN,$(BUILD_OS))),)
+define invoke_python
+$(PYTHON) "$$(cygpath -w "$(1)")"
+endef
+else
+define invoke_python
+$(PYTHON) "$(1)"
+endef
+endif
 
 # BinaryBuilder options.  We default to "on" for all the projects listed in BB_PROJECTS,
 # but only if contrib/normalize_triplet.py works for our requested triplet.
-ifeq ($(shell $(PYTHON) $(JULIAHOME)/contrib/normalize_triplet.py $(or $(XC_HOST),$(XC_HOST),$(BUILD_MACHINE)) >/dev/null 2>/dev/null; echo $$?),0)
+ifeq ($(shell $(call invoke_python,$(JULIAHOME)/contrib/normalize_triplet.py) $(or $(XC_HOST),$(XC_HOST),$(BUILD_MACHINE)) >/dev/null 2>/dev/null; echo $$?),0)
 USE_BINARYBUILDER ?= 1
 else
-ifneq ($(shell $(PYTHON) $(JULIAHOME)/contrib/normalize_triplet.py x86_64-linux-gnu),x86_64-linux-gnu)
+ifneq ($(shell $(call invoke_python,$(JULIAHOME)/contrib/normalize_triplet.py) x86_64-linux-gnu),x86_64-linux-gnu)
 $(warning normalize_triplet.py appears to be non-functional (used python interpreter "$(PYTHON)"), so BinaryBuilder disabled)
 endif
 USE_BINARYBUILDER ?= 0

base/pointer.jl

@@ -159,3 +159,6 @@ isless(x::Ptr{T}, y::Ptr{T}) where {T} = x < y
 +(x::Ptr, y::Integer) = oftype(x, add_ptr(UInt(x), (y % UInt) % UInt))
 -(x::Ptr, y::Integer) = oftype(x, sub_ptr(UInt(x), (y % UInt) % UInt))
 +(x::Integer, y::Ptr) = y + x
+
+unsigned(x::Ptr) = UInt(x)
+signed(x::Ptr) = Int(x)

contrib/refresh_bb_tarballs.sh

@@ -13,7 +13,8 @@ TRIPLETS="i686-linux-gnu x86_64-linux-gnu aarch64-linux-gnu arm-linux-gnueabihf
 
 # These are the projects currently using BinaryBuilder; both GCC-expanded and non-GCC-expanded:
 BB_PROJECTS="gmp mbedtls libssh2 mpfr curl libgit2 pcre libuv unwind osxunwind dsfmt objconv p7zip zlib suitesparse"
-BB_GCC_EXPANDED_PROJECTS="llvm openblas openlibm"
+BB_GCC_EXPANDED_PROJECTS="openblas openlibm"
+BB_CXX_EXPANDED_PROJECTS="llvm"
 
 # If we've been given a project name, filter down to that one:
 if [ -n "${1}" ]; then
@@ -25,6 +26,10 @@ if [ -n "${1}" ]; then
         *${1}*) BB_GCC_EXPANDED_PROJECTS="${1}" ;;
         *) BB_GCC_EXPANDED_PROJECTS="" ;;
     esac
+    case "${BB_CXX_EXPANDED_PROJECTS}" in
+        *${1}*) BB_CXX_EXPANDED_PROJECTS="${1}" ;;
+        *) BB_CXX_EXPANDED_PROJECTS="" ;;
+    esac
 fi
 
 # Get "contrib/" directory path
@@ -45,4 +50,12 @@ for triplet in ${TRIPLETS}; do
 		    make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${gcc} BB_TRIPLET_CXXABI=${triplet} install-${proj}
         done
     done
+
+    for proj in ${BB_CXX_EXPANDED_PROJECTS}; do
+		PROJ="$(echo ${proj} | tr [a-z] [A-Z])"
+        for cxx in cxx03 cxx11; do
+		    make -C "${CONTRIB_DIR}/../deps" BINARYBUILDER_LLVM_ASSERTS=1 USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${cxx} BB_TRIPLET_CXXABI=${triplet} distclean-${proj}
+		    make -C "${CONTRIB_DIR}/../deps" BINARYBUILDER_LLVM_ASSERTS=1 USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${cxx} BB_TRIPLET_CXXABI=${triplet} install-${proj}
+        done
+    done
 done

deps/Versions.make

@@ -1,5 +1,5 @@
 LLVM_VER = 8.0.1
-LLVM_BB_REL = 4
+LLVM_BB_REL = 0
 PCRE_VER = 10.31
 PCRE_BB_REL = 0
 DSFMT_VER = 2.2.3