Upgrade BB triplet naming from -gccX tags to -libgfortranX tags.

This will require us to change our LLVM and OpenBLAS binaries, as they
are the only libgfortran-specific libraries that we ship with base Julia.

Author: staticfloat

contrib/normalize_triplet.py

@@ -31,12 +31,11 @@
     'blank_call_abi': "",
     'eabihf': "eabihf",
 }
-gcc_version_mapping = {
-    'blank_gcc': "",
-    'gcc4': "-gcc4",
-    'gcc7': "-gcc7",
-    'gcc8': "-gcc8",
-    'gcc9': "-gcc8",
+libgfortran_version_mapping = {
+    'blank_libgfortran': "",
+    'libgfortran3': "-libgfortran3",
+    'libgfortran4': "-libgfortran4",
+    'libgfortran5': "-libgfortran5",
 }
 cxx_abi_mapping = {
     'blank_cxx_abi': "",
@@ -53,7 +52,7 @@
     c(platform_mapping)+
     c(libc_mapping)+
     c(call_abi_mapping)+
-    c(gcc_version_mapping)+
+    c(libgfortran_version_mapping)+
     c(cxx_abi_mapping)+
     "$"
 )
@@ -76,7 +75,7 @@ def get_field(m, mapping):
 platform = get_field(m, platform_mapping)
 libc = get_field(m, libc_mapping)
 call_abi = get_field(m, call_abi_mapping)
-gcc_version = get_field(m, gcc_version_mapping)
+libgfortran_version = get_field(m, libgfortran_version_mapping)
 cxx_abi = get_field(m, cxx_abi_mapping)
 
 # The default libc on Linux is glibc
@@ -85,7 +84,7 @@ def get_field(m, mapping):
 
 def r(x):
     x = x.replace("blank_call_abi", "")
-    x = x.replace("blank_gcc", "")
+    x = x.replace("blank_libgfortran", "")
     x = x.replace("blank_cxx_abi", "")
     x = x.replace("blank_libc", "")
     return x
@@ -106,17 +105,17 @@ def p(x):
     return x
 
 # If the user passes in a GCC version (like 8.2.0) use that to force a
-# "-gcc8" tag at the end of the triplet, but only if it has otherwise
+# "-libgfortran5" tag at the end of the triplet, but only if it has otherwise
 # not been specified
-if gcc_version == "blank_gcc":
+if libgfortran_version == "blank_libgfortran":
     if len(sys.argv) >= 3:
-        gcc_version = {
-            "4": "gcc4",
-            "5": "gcc4",
-            "6": "gcc4",
-            "7": "gcc7",
-            "8": "gcc8",
-            "9": "gcc8",
+        libgfortran_version = {
+            "4": "libgfortran3",
+            "5": "libgfortran3",
+            "6": "libgfortran3",
+            "7": "libgfortran4",
+            "8": "libgfortran5",
+            "9": "libgfortran5",
         }[list(filter(lambda x: re.match("\d+\.\d+(\.\d+)?", x), sys.argv[2].split()))[-1][0]]
 
 if cxx_abi == "blank_cxx_abi":
@@ -127,7 +126,7 @@ def p(x):
             "": "",
         }[sys.argv[3]]
 
-print(arch+p(platform)+p(libc)+r(call_abi)+p(gcc_version)+p(cxx_abi))
+print(arch+p(platform)+p(libc)+r(call_abi)+p(libgfortran_version)+p(cxx_abi))
 
 # Testing suite:
 # triplets="i686-w64-mingw32 x86_64-pc-linux-musl arm-linux-musleabihf x86_64-linux-gnu arm-linux-gnueabihf x86_64-apple-darwin14 x86_64-unknown-freebsd11.1"

contrib/refresh_bb_tarballs.sh

@@ -40,9 +40,9 @@ for triplet in ${TRIPLETS}; do
 
     for proj in ${BB_GCC_EXPANDED_PROJECTS}; do
 		PROJ="$(echo ${proj} | tr [a-z] [A-Z])"
-        for gcc in gcc4 gcc7 gcc8; do
-		    make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${gcc} BB_TRIPLET_CXXABI=${triplet} distclean-${proj}
-		    make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${gcc} BB_TRIPLET_CXXABI=${triplet} install-${proj}
+        for libgfortran in libgfortran3 libgfortran4 libgfortran5; do
+		    make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${libgfortran} BB_TRIPLET_CXXABI=${triplet} distclean-${proj}
+		    make -C "${CONTRIB_DIR}/../deps" USE_BINARYBUILDER_${PROJ}=1 ${PROJ}_BB_TRIPLET=${triplet}-${libgfortran} BB_TRIPLET_CXXABI=${triplet} install-${proj}
         done
     done
 done

deps/tools/bb-install.mk

@@ -6,15 +6,15 @@
 
 # Auto-detect triplet once, create different versions that we use as defaults below for each BB install target
 # This is much more efficient than launching `gcc` and `python` once for each BB install target.
-BB_TRIPLET_GCCABI_CXXABI := $(shell python $(JULIAHOME)/contrib/normalize_triplet.py $(or $(XC_HOST),$(XC_HOST),$(BUILD_MACHINE)) "$(shell $(FC) --version | head -1)" "$(shell echo '\#include <string>' | $(CXX) $(CXXFLAGS) -x c++ -dM -E - | grep _GLIBCXX_USE_CXX11_ABI | awk '{ print $$3 }' )")
-BB_TRIPLET_GCCABI := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE),$(BB_TRIPLET_GCCABI_CXXABI))))
-BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out gcc%,$(subst -,$(SPACE),$(BB_TRIPLET_GCCABI_CXXABI))))
-BB_TRIPLET := $(subst $(SPACE),-,$(filter-out cxx%,$(filter-out gcc%,$(subst -,$(SPACE),$(BB_TRIPLET_GCCABI_CXXABI)))))
+BB_TRIPLET_LIBGFORTRAN_CXXABI := $(shell python $(JULIAHOME)/contrib/normalize_triplet.py $(or $(XC_HOST),$(XC_HOST),$(BUILD_MACHINE)) "$(shell $(FC) --version | head -1)" "$(shell echo '\#include <string>' | $(CXX) $(CXXFLAGS) -x c++ -dM -E - | grep _GLIBCXX_USE_CXX11_ABI | awk '{ print $$3 }' )")
+BB_TRIPLET_LIBGFORTRAN := $(subst $(SPACE),-,$(filter-out cxx%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI))))
+BB_TRIPLET_CXXABI := $(subst $(SPACE),-,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRANABI_CXXABI))))
+BB_TRIPLET := $(subst $(SPACE),-,$(filter-out cxx%,$(filter-out libgfortran%,$(subst -,$(SPACE),$(BB_TRIPLET_LIBGFORTRAN_CXXABI)))))
 
 define bb-install
 TRIPLET_VAR := BB_TRIPLET
 ifeq ($(3),true)
-TRIPLET_VAR := $$(TRIPLET_VAR)_GCCABI
+TRIPLET_VAR := $$(TRIPLET_VAR)_LIBGFORTRAN
 endif
 ifeq ($(4),true)
 TRIPLET_VAR := $$(TRIPLET_VAR)_CXXABI
@@ -60,12 +60,6 @@ check-$(1):
 
 .PHONY: clean-bb-$(1)
 
-# Sanity check to see if we are trying to use a `gcc4` tarball on a system that wants `cxx11` strings:
-ifeq ($$(lastword $$(subst -,$$(SPACE),$$($(2)_BB_TRIPLET))),gcc4)
-ifeq ($$(lastword $$(subst -,$$(SPACE),$$(BB_TRIPLET_CXXABI))),cxx11)
-$$(error Attempting to use gcc4 $(2) tarball, but compiling with cxx11 string ABI; set "CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0" to avoid linker errors)
-endif
-endif
 endef
 
 define bb-uninstaller