Blame SOURCES/gcc12-static-libquadmath.patch

c60824
2022-08-17  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
c60824
	    Jakub Jelinek  <jakub@redhat.com>
c60824
c60824
	PR fortran/46539
c60824
gcc/
c60824
	* common.opt (static-libquadmath): New option.
c60824
	* gcc.cc (driver_handle_option): Always accept -static-libquadmath.
c60824
	* config/darwin.h (LINK_SPEC): Handle -static-libquadmath.
c60824
gcc/fortran/
c60824
	* lang.opt (static-libquadmath): New option.
c60824
	* invoke.texi (-static-libquadmath): Document it.
c60824
libgfortran/
c60824
	* acinclude.m4 (LIBQUADSPEC): From $FC -static-libgfortran -###
c60824
	output determine -Bstatic/-Bdynamic, -bstatic/-bdynamic,
c60824
	-aarchive_shared/-adefault linker support or Darwin remapping
c60824
	of -lgfortran to libgfortran.a%s and use that around or instead
c60824
	of -lquadmath in LIBQUADSPEC.
c60824
	* configure: Regenerated.
c60824
c60824
--- gcc/common.opt.jj	2022-04-28 15:56:02.822846833 +0200
c60824
+++ gcc/common.opt	2022-09-29 19:41:37.250880668 +0200
c60824
@@ -3563,6 +3563,10 @@ static-libphobos
c60824
 Driver
c60824
 ; Documented for D, but always accepted by driver.
c60824
 
c60824
+static-libquadmath
c60824
+Driver
c60824
+; Documented for Fortran, but always accepted by driver.
c60824
+
c60824
 static-libstdc++
c60824
 Driver
c60824
 
c60824
--- gcc/gcc.cc.jj	2022-04-28 15:56:04.771819920 +0200
c60824
+++ gcc/gcc.cc	2022-09-29 19:41:37.296880041 +0200
c60824
@@ -4583,12 +4583,14 @@ driver_handle_option (struct gcc_options
c60824
     case OPT_static_libgcc:
c60824
     case OPT_shared_libgcc:
c60824
     case OPT_static_libgfortran:
c60824
+    case OPT_static_libquadmath:
c60824
     case OPT_static_libphobos:
c60824
     case OPT_static_libstdc__:
c60824
       /* These are always valid, since gcc.cc itself understands the
c60824
 	 first two, gfortranspec.cc understands -static-libgfortran,
c60824
-	 d-spec.cc understands -static-libphobos, and g++spec.cc
c60824
-	 understands -static-libstdc++ */
c60824
+	 d-spec.cc understands -static-libphobos, g++spec.cc
c60824
+	 understands -static-libstdc++ and libgfortran.spec handles
c60824
+	 -static-libquadmath.  */
c60824
       validated = true;
c60824
       break;
c60824
 
c60824
--- gcc/config/darwin.h.jj	2022-06-18 21:56:40.666675606 +0200
c60824
+++ gcc/config/darwin.h	2022-09-29 19:41:37.261880518 +0200
c60824
@@ -443,6 +443,7 @@ extern GTY(()) int darwin_ms_struct;
c60824
                      %:replace-outfile(-lobjc libobjc-gnu.a%s); \
c60824
                     :%:replace-outfile(-lobjc -lobjc-gnu )}}\
c60824
    %{static|static-libgcc|static-libgfortran:%:replace-outfile(-lgfortran libgfortran.a%s)}\
c60824
+   %{static|static-libgcc|static-libquadmath:%:replace-outfile(-lquadmath libquadmath.a%s)}\
c60824
    %{static|static-libgcc|static-libphobos:%:replace-outfile(-lgphobos libgphobos.a%s)}\
c60824
    %{static|static-libgcc|static-libstdc++|static-libgfortran:%:replace-outfile(-lgomp libgomp.a%s)}\
c60824
    %{static|static-libgcc|static-libstdc++:%:replace-outfile(-lstdc++ libstdc++.a%s)}\
c60824
--- gcc/fortran/lang.opt.jj	2022-04-28 15:56:04.579822571 +0200
c60824
+++ gcc/fortran/lang.opt	2022-09-29 19:41:37.279880273 +0200
c60824
@@ -863,6 +863,10 @@ static-libgfortran
c60824
 Fortran
c60824
 Statically link the GNU Fortran helper library (libgfortran).
c60824
 
c60824
+static-libquadmath
c60824
+Driver
c60824
+Statically link the GCC Quad-Precision Math Library (libquadmath).
c60824
+
c60824
 std=f2003
c60824
 Fortran
c60824
 Conform to the ISO Fortran 2003 standard.
c60824
--- gcc/fortran/invoke.texi.jj	2022-04-29 15:51:59.080720092 +0200
c60824
+++ gcc/fortran/invoke.texi	2022-09-29 19:41:37.273880354 +0200
c60824
@@ -170,7 +170,7 @@ and warnings}.
c60824
 
c60824
 @item Link Options
c60824
 @xref{Link Options,,Options for influencing the linking step}.
c60824
-@gccoptlist{-static-libgfortran}
c60824
+@gccoptlist{-static-libgfortran  -static-libquadmath}
c60824
 
c60824
 @item Runtime Options
c60824
 @xref{Runtime Options,,Options for influencing runtime behavior}.
c60824
@@ -1425,6 +1425,20 @@ configured, this option has no effect.
c60824
 @end table
c60824
 
c60824
 
c60824
+@table @gcctabopt
c60824
+@item -static-libquadmath
c60824
+@opindex @code{static-libquadmath}
c60824
+On systems that provide @file{libquadmath} as a shared and a static
c60824
+library, this option forces the use of the static version. If no
c60824
+shared version of @file{libquadmath} was built when the compiler was
c60824
+configured, this option has no effect.
c60824
+
c60824
+Please note that the @file{libquadmath} runtime library is licensed under the
c60824
+GNU Lesser General Public License (LGPL), and linking it statically introduces
c60824
+requirements when redistributing the resulting binaries.
c60824
+@end table
c60824
+
c60824
+
c60824
 @node Runtime Options
c60824
 @section Influencing runtime behavior
c60824
 @cindex options, runtime
c60824
--- libgfortran/acinclude.m4.jj	2022-09-29 19:41:37.306879904 +0200
c60824
+++ libgfortran/acinclude.m4	2022-09-29 19:42:42.641988408 +0200
c60824
@@ -338,11 +338,32 @@ AC_DEFUN([LIBGFOR_CHECK_FLOAT128], [
c60824
       ac_[]_AC_LANG_ABBREV[]_werror_flag=$ac_xsave_[]_AC_LANG_ABBREV[]_werror_flag
c60824
     ])
c60824
 
c60824
+    dnl Determine -Bstatic ... -Bdynamic etc. support from gfortran -### stderr.
c60824
+    touch conftest1.$ac_objext conftest2.$ac_objext
c60824
+    LQUADMATH=-lquadmath
c60824
+    $FC -static-libgfortran -### -o conftest \
c60824
+	conftest1.$ac_objext -lgfortran conftest2.$ac_objext 2>&1 >/dev/null \
c60824
+	| grep "conftest1.$ac_objext.*conftest2.$ac_objext" > conftest.cmd
c60824
+    if grep "conftest1.$ac_objext.* -Bstatic -lgfortran -Bdynamic .*conftest2.$ac_objext" \
c60824
+       conftest.cmd >/dev/null 2>&1; then
c60824
+      LQUADMATH="%{static-libquadmath:-Bstatic} -lquadmath %{static-libquadmath:-Bdynamic}"
c60824
+    elif grep "conftest1.$ac_objext.* -bstatic -lgfortran -bdynamic .*conftest2.$ac_objext" \
c60824
+         conftest.cmd >/dev/null 2>&1; then
c60824
+      LQUADMATH="%{static-libquadmath:-bstatic} -lquadmath %{static-libquadmath:-bdynamic}"
c60824
+    elif grep "conftest1.$ac_objext.* -aarchive_shared -lgfortran -adefault .*conftest2.$ac_objext" \
c60824
+         conftest.cmd >/dev/null 2>&1; then
c60824
+      LQUADMATH="%{static-libquadmath:-aarchive_shared} -lquadmath %{static-libquadmath:-adefault}"
c60824
+    elif grep "conftest1.$ac_objext.*libgfortran.a .*conftest2.$ac_objext" \
c60824
+         conftest.cmd >/dev/null 2>&1; then
c60824
+      LQUADMATH="%{static-libquadmath:libquadmath.a%s;:-lquadmath}"
c60824
+    fi
c60824
+    rm -f conftest1.$ac_objext conftest2.$ac_objext conftest conftest.cmd
c60824
+
c60824
     dnl For static libgfortran linkage, depend on libquadmath only if needed.
c60824
     if test "x$libgfor_cv_have_as_needed" = xyes; then
c60824
-      LIBQUADSPEC="%{static-libgfortran:$libgfor_cv_as_needed_option} -lquadmath %{static-libgfortran:$libgfor_cv_no_as_needed_option}"
c60824
+      LIBQUADSPEC="%{static-libgfortran:$libgfor_cv_as_needed_option} $LQUADMATH %{static-libgfortran:$libgfor_cv_no_as_needed_option}"
c60824
     else
c60824
-      LIBQUADSPEC="-lquadmath"
c60824
+      LIBQUADSPEC="$LQUADMATH"
c60824
     fi
c60824
     if test -f ../libquadmath/libquadmath.la; then
c60824
       LIBQUADLIB=../libquadmath/libquadmath.la
c60824
--- libgfortran/configure.jj	2022-09-29 19:41:37.345879372 +0200
c60824
+++ libgfortran/configure	2022-09-29 19:42:59.878753212 +0200
c60824
@@ -27301,10 +27301,30 @@ fi
c60824
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $libgfor_cv_have_as_needed" >&5
c60824
 $as_echo "$libgfor_cv_have_as_needed" >&6; }
c60824
 
c60824
+        touch conftest1.$ac_objext conftest2.$ac_objext
c60824
+    LQUADMATH=-lquadmath
c60824
+    $FC -static-libgfortran -### -o conftest \
c60824
+	conftest1.$ac_objext -lgfortran conftest2.$ac_objext 2>&1 >/dev/null \
c60824
+	| grep "conftest1.$ac_objext.*conftest2.$ac_objext" > conftest.cmd
c60824
+    if grep "conftest1.$ac_objext.* -Bstatic -lgfortran -Bdynamic .*conftest2.$ac_objext" \
c60824
+       conftest.cmd >/dev/null 2>&1; then
c60824
+      LQUADMATH="%{static-libquadmath:-Bstatic} -lquadmath %{static-libquadmath:-Bdynamic}"
c60824
+    elif grep "conftest1.$ac_objext.* -bstatic -lgfortran -bdynamic .*conftest2.$ac_objext" \
c60824
+         conftest.cmd >/dev/null 2>&1; then
c60824
+      LQUADMATH="%{static-libquadmath:-bstatic} -lquadmath %{static-libquadmath:-bdynamic}"
c60824
+    elif grep "conftest1.$ac_objext.* -aarchive_shared -lgfortran -adefault .*conftest2.$ac_objext" \
c60824
+         conftest.cmd >/dev/null 2>&1; then
c60824
+      LQUADMATH="%{static-libquadmath:-aarchive_shared} -lquadmath %{static-libquadmath:-adefault}"
c60824
+    elif grep "conftest1.$ac_objext.*libgfortran.a .*conftest2.$ac_objext" \
c60824
+         conftest.cmd >/dev/null 2>&1; then
c60824
+      LQUADMATH="%{static-libquadmath:libquadmath.a%s;:-lquadmath}"
c60824
+    fi
c60824
+    rm -f conftest1.$ac_objext conftest2.$ac_objext conftest conftest.cmd
c60824
+
c60824
         if test "x$libgfor_cv_have_as_needed" = xyes; then
c60824
-      LIBQUADSPEC="%{static-libgfortran:$libgfor_cv_as_needed_option} -lquadmath %{static-libgfortran:$libgfor_cv_no_as_needed_option}"
c60824
+      LIBQUADSPEC="%{static-libgfortran:$libgfor_cv_as_needed_option} $LQUADMATH %{static-libgfortran:$libgfor_cv_no_as_needed_option}"
c60824
     else
c60824
-      LIBQUADSPEC="-lquadmath"
c60824
+      LIBQUADSPEC="$LQUADMATH"
c60824
     fi
c60824
     if test -f ../libquadmath/libquadmath.la; then
c60824
       LIBQUADLIB=../libquadmath/libquadmath.la