redo patch, ensure libquadmath is not used in static link

Author: mattip

patches-windows/openblas-make-libs.patch

@@ -1,27 +1,15 @@
 diff --git a/exports/Makefile b/exports/Makefile
-index d8173534..4e2e0d7b 100644
+index 668a4866e..956b51bf4 100644
 --- a/exports/Makefile
 +++ b/exports/Makefile
-@@ -123,11 +123,21 @@ dll  : ../$(LIBDLLNAME)
- # in their import table.  By instead using a stable name it is possible to
- # upgrade between library versions, without needing to re-link an application.
- # For more details see: https://github.com/xianyi/OpenBLAS/issues/127.
-+ifeq ($(DEBUG), 1)
+@@ -126,8 +126,9 @@ dll  : ../$(LIBDLLNAME)
  ../$(LIBDLLNAME) : ../$(LIBNAME) $(LIBPREFIX).def dllinit.$(SUFFIX)
- 	$(RANLIB) ../$(LIBNAME)
- 	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBPREFIX).def dllinit.$(SUFFIX) \
--	-shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(IMPLIBNAME) \
-+	-shared -o ../$(LIBDLLNAME) -Wl,--defsym,quadmath_snprintf=snprintf \
- 	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB) $(EXTRALIB)
-+	dlltool -D $(LIBDLLNAME) -d $(LIBPREFIX).def -l ../$(LIBDLLNAME).a
-+else
-+../$(LIBDLLNAME) : ../$(LIBNAME) $(LIBPREFIX).def dllinit.$(SUFFIX)
-+	$(RANLIB) ../$(LIBNAME)
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(LIBPREFIX).def dllinit.$(SUFFIX) \
-+	-shared -o ../$(LIBDLLNAME) -Wl,--defsym,quadmath_snprintf=snprintf -Wl,-gc-sections -Wl,-s \
-+	-Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB) $(EXTRALIB)
-+	dlltool -D $(LIBDLLNAME) -d $(LIBPREFIX).def -l ../$(LIBDLLNAME).a
-+endif
- 
+        $(RANLIB) ../$(LIBNAME)
+        $(CC) $(CFLAGS) $(LDFLAGS) $(LIBPREFIX).def dllinit.$(SUFFIX) \
+-       -shared -o ../$(LIBDLLNAME) -Wl,--out-implib,../$(IMPLIBNAME) \
++       -shared -o ../$(LIBDLLNAME) -Wl,-gc-sections -Wl,-s -Wl,-Map,output.map \
+        -Wl,--whole-archive ../$(LIBNAME) -Wl,--no-whole-archive $(FEXTRALIB) $(EXTRALIB)
++       dlltool -D $(LIBDLLNAME) -d $(LIBPREFIX).def -l ../$(LIBDLLNAME).a
+
  $(LIBPREFIX).def : $(GENSYM)
- 	./$(GENSYM) win2k    $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > $(@F)
+        ./$(GENSYM) win2k    $(ARCH) dummy $(EXPRECISION) $(NO_CBLAS) $(NO_LAPACK) $(NO_LAPACKE) $(NEED2UNDERSCORES) $(ONLY_CBLAS) "$(SYMBOLPREFIX)" "$(SYMBOLSUFFIX)" $(BUILD_LAPACK_DEPRECATED) $(BUILD_BFLOAT16) $(BUILD_SINGLE) $(BUILD_DOUBLE) $(BUILD_COMPLEX) $(BUILD_COMPLEX16) > $(@F)

tools/build_openblas.sh

@@ -49,12 +49,12 @@ git submodule update --init --recursive
 
 
 # Get / clean code
-git fetch origin
-if [ -n "$OPENBLAS_COMMIT" ]; then
-    git checkout $OPENBLAS_COMMIT
-fi
-git clean -fxd
-git reset --hard
+# git fetch origin
+# if [ -n "$OPENBLAS_COMMIT" ]; then
+#     git checkout $OPENBLAS_COMMIT
+# fi
+# git clean -fxd
+# git reset --hard
 rm -rf $openblas_root/$build_bits
 
 # Set architecture flags
@@ -76,7 +76,7 @@ fflags="$fextra $cflags -frecursive -ffpe-summary=invalid,zero"
 
 # Set suffixed-ILP64 flags
 if [ "$if_bits" == "64" ]; then
-    SYMBOLSUFFIX="64_"
+    LIBNAMESUFFIX="64_"
     interface_flags="INTERFACE64=1 SYMBOLSUFFIX=64_ LIBNAMESUFFIX=64_"
     # We override FCOMMON_OPT, so we need to set default integer manually
     fflags="$fflags -fdefault-integer-8"
@@ -92,9 +92,9 @@ GCC_TAG="gcc_$(gcc -dumpversion | tr .- _)"
 OPENBLAS_VERSION=$(git describe --tags --abbrev=8)
 # Patch OpenBLAS to exclude stray GFortran symbol.
 # Replacement snprintf symbol only present for UCRTC 64-bit build.
-if [ "$BUILD_BITS" == 64 ]; then
-    patch -p1 < ../patches-windows/openblas-make-libs.patch
-fi
+# if [ "$BUILD_BITS" == 64 ]; then
+#    patch -p1 < ../patches-windows/openblas-make-libs.patch
+# fi
 # Build OpenBLAS
 # Variable used in creating output libraries
 make BINARY=$build_bits DYNAMIC_ARCH=1 USE_THREAD=1 USE_OPENMP=0 \
@@ -132,6 +132,26 @@ objcopy --redefine-syms exports/objcopy.def "${static_libname}" "${static_libnam
 cp -f "${static_libname}.renamed" "$openblas_root/$build_bits/lib/${static_libname}"
 cp -f "${static_libname}.renamed" "$openblas_root/$build_bits/lib/${DLL_BASENAME}.a"
 
+# Make sure quadmath library is not statically linked in to the DLL by checking
+# the output.map generated by the linker when using `-Wl,-gc-sections -Wl,-s`
+# the map will have libname(o-filename) for each function pulled out of the
+# library
+# The file itself appears in the map
+grep -A 3 "libquadmath.a(" output.map
+case $? in
+  0)
+  echo "link uses libquadmath.a when it should not"
+  exit -1
+  ;;
+  2)
+  echo "could not find 'output.map' to verify linking avoids libquadmath.a"
+  exit -1
+  ;;
+  1)
+  echo "verified no 'libquadmath' used when linking"
+  ;;
+esac
+
 cd $openblas_root
 # Copy library link file for custom name
 pushd $build_bits/lib
@@ -154,16 +174,8 @@ else
     sed -e "s/^Cflags.*/\0 -DBLAS_SYMBOL_PREFIX=scipy_/" -i pkgconfig/scipy-openblas.pc
 fi
 popd
-# Build template site.cfg for using this build
-cat > ${build_bits}/site.cfg.template << EOF
-[openblas${SYMBOLSUFFIX}]
-libraries = $DLL_BASENAME
-library_dirs = {openblas_root}\\${build_bits}\\lib
-include_dirs = {openblas_root}\\${build_bits}\\include
-EOF
-
 ls $openblas_root/$build_bits/lib
 
-zip_name="openblas${SYMBOLSUFFIX}-${OPENBLAS_VERSION}-${plat_tag}-${GCC_TAG}.zip"
+zip_name="openblas${LIBNAMESUFFIX}-${OPENBLAS_VERSION}-${plat_tag}-${GCC_TAG}.zip"
 zip -r $zip_name $build_bits
 cp $zip_name ${builds_dir}