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