From e34fd4dc1c10ff16eebd39318d90ad6f68e15ae7 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Thu, 1 Jun 2017 13:50:03 +0000 Subject: [PATCH] Fix cross compilation to Solaris (GLIBCXX_CROSSCONFIG): Handle *-solaris* like *-linux* etc. Remove *-solaris* section. * configure: Regenerate. From-SVN: r248791 --- libstdc++-v3/ChangeLog | 6 ++ libstdc++-v3/configure | 166 +----------------------------------- libstdc++-v3/crossconfig.m4 | 18 +--- 3 files changed, 8 insertions(+), 182 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 86bb674b39d..dbbba5a17cb 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2017-06-01 Rainer Orth + + (GLIBCXX_CROSSCONFIG): Handle *-solaris* like *-linux* etc. + Remove *-solaris* section. + * configure: Regenerate. + 2017-05-31 Jonathan Wakely PR libstdc++/80893 diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 282b4617db8..596869f4245 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -53748,7 +53748,7 @@ $as_echo "#define HAVE_TLS 1" >>confdefs.h ;; esac ;; - *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-cygwin*) + *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-cygwin* | *-solaris*) # All these tests are for C++; save the language and the compiler flags. # The CXXFLAGS thing is suspicious, but based on similar bits previously @@ -72388,170 +72388,6 @@ done CXXFLAGS="$ac_save_CXXFLAGS" - ;; - *-solaris*) - - # If we're not using GNU ld, then there's no point in even trying these - # tests. Check for that first. We should have already tested for gld - # by now (in libtool), but require it now just to be safe... - test -z "$SECTION_LDFLAGS" && SECTION_LDFLAGS='' - test -z "$OPT_LDFLAGS" && OPT_LDFLAGS='' - - - - # The name set by libtool depends on the version of libtool. Shame on us - # for depending on an impl detail, but c'est la vie. Older versions used - # ac_cv_prog_gnu_ld, but now it's lt_cv_prog_gnu_ld, and is copied back on - # top of with_gnu_ld (which is also set by --with-gnu-ld, so that actually - # makes sense). We'll test with_gnu_ld everywhere else, so if that isn't - # set (hence we're using an older libtool), then set it. - if test x${with_gnu_ld+set} != xset; then - if test x${ac_cv_prog_gnu_ld+set} != xset; then - # We got through "ac_require(ac_prog_ld)" and still not set? Huh? - with_gnu_ld=no - else - with_gnu_ld=$ac_cv_prog_gnu_ld - fi - fi - - # Start by getting the version number. I think the libtool test already - # does some of this, but throws away the result. - glibcxx_ld_is_gold=no - if test x"$with_gnu_ld" = x"yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld version" >&5 -$as_echo_n "checking for ld version... " >&6; } - - if $LD --version 2>/dev/null | grep 'GNU gold' >/dev/null 2>&1; then - glibcxx_ld_is_gold=yes - fi - ldver=`$LD --version 2>/dev/null | - sed -e 's/GNU gold /GNU ld /;s/GNU ld version /GNU ld /;s/GNU ld ([^)]*) /GNU ld /;s/GNU ld \([0-9.][0-9.]*\).*/\1/; q'` - - glibcxx_gnu_ld_version=`echo $ldver | \ - $AWK -F. '{ if (NF<3) $3=0; print ($1*100+$2)*100+$3 }'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $glibcxx_gnu_ld_version" >&5 -$as_echo "$glibcxx_gnu_ld_version" >&6; } - fi - - # Set --gc-sections. - glibcxx_have_gc_sections=no - if test "$glibcxx_ld_is_gold" = "yes"; then - if $LD --help 2>/dev/null | grep gc-sections >/dev/null 2>&1; then - glibcxx_have_gc_sections=yes - fi - else - glibcxx_gcsections_min_ld=21602 - if test x"$with_gnu_ld" = x"yes" && - test $glibcxx_gnu_ld_version -gt $glibcxx_gcsections_min_ld ; then - glibcxx_have_gc_sections=yes - fi - fi - if test "$glibcxx_have_gc_sections" = "yes"; then - # Sufficiently young GNU ld it is! Joy and bunny rabbits! - # NB: This flag only works reliably after 2.16.1. Configure tests - # for this are difficult, so hard wire a value that should work. - - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS='-Wl,--gc-sections' - - # Check for -Wl,--gc-sections - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,--gc-sections" >&5 -$as_echo_n "checking for ld that supports -Wl,--gc-sections... " >&6; } - if test x$gcc_no_link = xyes; then - as_fn_error "Link tests are not allowed after GCC_NO_EXECUTABLES." "$LINENO" 5 -fi -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - int one(void) { return 1; } - int two(void) { return 2; } - -int -main () -{ - two(); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_gcsections=yes -else - ac_gcsections=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test "$ac_gcsections" = "yes"; then - rm -f conftest.c - touch conftest.c - if $CC -c conftest.c; then - if $LD --gc-sections -o conftest conftest.o 2>&1 | \ - grep "Warning: gc-sections option ignored" > /dev/null; then - ac_gcsections=no - fi - fi - rm -f conftest.c conftest.o conftest - fi - if test "$ac_gcsections" = "yes"; then - SECTION_LDFLAGS="-Wl,--gc-sections $SECTION_LDFLAGS" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_gcsections" >&5 -$as_echo "$ac_gcsections" >&6; } - - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - else - # this is the suspicious part - CFLAGS='' - fi - fi - - # Set -z,relro. - # Note this is only for shared objects. - ac_ld_relro=no - if test x"$with_gnu_ld" = x"yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ld that supports -Wl,-z,relro" >&5 -$as_echo_n "checking for ld that supports -Wl,-z,relro... " >&6; } - cxx_z_relo=`$LD -v --help 2>/dev/null | grep "z relro"` - if test -n "$cxx_z_relo"; then - OPT_LDFLAGS="-Wl,-z,relro" - ac_ld_relro=yes - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ld_relro" >&5 -$as_echo "$ac_ld_relro" >&6; } - fi - - # Set linker optimization flags. - if test x"$with_gnu_ld" = x"yes"; then - OPT_LDFLAGS="-Wl,-O1 $OPT_LDFLAGS" - fi - - - - - $as_echo "#define HAVE_MBSTATE_T 1" >>confdefs.h - - $as_echo "#define HAVE_FINITE 1" >>confdefs.h - - $as_echo "#define HAVE_FPCLASS 1" >>confdefs.h - - # All of the dependencies for wide character support are here, so - # turn it on. - $as_echo "#define _GLIBCXX_USE_WCHAR_T 1" >>confdefs.h - - # These two C99 functions are present only in Solaris >= 10 - $as_echo "#define HAVE_STRTOF 1" >>confdefs.h - - $as_echo "#define HAVE_STRTOLD 1" >>confdefs.h - - $as_echo "#define HAVE_ISNAN 1" >>confdefs.h - - $as_echo "#define HAVE_ISNANF 1" >>confdefs.h - - $as_echo "#define HAVE_MODFF 1" >>confdefs.h - - $as_echo "#define HAVE_HYPOT 1" >>confdefs.h - ;; *-tpf) SECTION_FLAGS='-ffunction-sections -fdata-sections' diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4 index 77c9828fe91..a8b1da9a607 100644 --- a/libstdc++-v3/crossconfig.m4 +++ b/libstdc++-v3/crossconfig.m4 @@ -182,7 +182,7 @@ case "${host}" in ;; esac ;; - *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-cygwin*) + *-linux* | *-uclinux* | *-gnu* | *-kfreebsd*-gnu | *-cygwin* | *-solaris*) GLIBCXX_CHECK_COMPILER_FEATURES GLIBCXX_CHECK_LINKER_FEATURES GLIBCXX_CHECK_MATH_SUPPORT @@ -239,22 +239,6 @@ case "${host}" in GLIBCXX_CHECK_MATH_SUPPORT GLIBCXX_CHECK_STDLIB_SUPPORT ;; - *-solaris*) - GLIBCXX_CHECK_LINKER_FEATURES - AC_DEFINE(HAVE_MBSTATE_T) - AC_DEFINE(HAVE_FINITE) - AC_DEFINE(HAVE_FPCLASS) - # All of the dependencies for wide character support are here, so - # turn it on. - AC_DEFINE(_GLIBCXX_USE_WCHAR_T) - # These two C99 functions are present only in Solaris >= 10 - AC_DEFINE(HAVE_STRTOF) - AC_DEFINE(HAVE_STRTOLD) - AC_DEFINE(HAVE_ISNAN) - AC_DEFINE(HAVE_ISNANF) - AC_DEFINE(HAVE_MODFF) - AC_DEFINE(HAVE_HYPOT) - ;; *-tpf) SECTION_FLAGS='-ffunction-sections -fdata-sections' SECTION_LDFLAGS='-Wl,--gc-sections $SECTION_LDFLAGS' -- 2.30.2