diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-08 09:47:55 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-01-08 09:47:55 +0000 |
| commit | 55caca34dd65267d3e29d55702b97907b74b1ec1 (patch) | |
| tree | 24d16339668b1974a11868625c718e98ba882b27 | |
| parent | 0b4f01162bcd71ec2e52df6db34bfb5a871d2170 (diff) | |
| download | gcc-55caca34dd65267d3e29d55702b97907b74b1ec1.tar.gz | |
Restrict -Wa,-nH use to Solaris (PR libstdc++/55594)
PR libstdc++/55594
* acinclude.m4 (GLIBCXX_CHECK_ASSEMBLER_HWCAP): Restrict test to
Solaris targets.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195009 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 24 | ||||
| -rwxr-xr-x | libstdc++-v3/configure | 24 |
3 files changed, 37 insertions, 18 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e043d6bb89e..9d0a6d7574a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2013-01-08 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR libstdc++/55594 + * acinclude.m4 (GLIBCXX_CHECK_ASSEMBLER_HWCAP): Restrict test to + Solaris targets. + * configure: Regenerate. + 2013-01-07 Jonathan Wakely <jwakely.gcc@gmail.com> PR libstdc++/55847 diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 2d4d7f022f9..528ce8320e6 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -178,17 +178,23 @@ dnl AC_DEFUN([GLIBCXX_CHECK_ASSEMBLER_HWCAP], [ test -z "$HWCAP_FLAGS" && HWCAP_FLAGS='' - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wa,-nH" + # Restrict the test to Solaris, other assemblers (e.g. AIX as) have -nH + # with a different meaning. + case ${target_os} in + solaris2*) + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wa,-nH" - AC_MSG_CHECKING([for as that supports -Wa,-nH]) - AC_TRY_COMPILE([], [return 0;], [ac_hwcap_flags=yes],[ac_hwcap_flags=no]) - if test "$ac_hwcap_flags" = "yes"; then - HWCAP_FLAGS="-Wa,-nH $HWCAP_FLAGS" - fi - AC_MSG_RESULT($ac_hwcap_flags) + AC_MSG_CHECKING([for as that supports -Wa,-nH]) + AC_TRY_COMPILE([], [return 0;], [ac_hwcap_flags=yes],[ac_hwcap_flags=no]) + if test "$ac_hwcap_flags" = "yes"; then + HWCAP_FLAGS="-Wa,-nH $HWCAP_FLAGS" + fi + AC_MSG_RESULT($ac_hwcap_flags) - CFLAGS="$ac_save_CFLAGS" + CFLAGS="$ac_save_CFLAGS" + ;; + esac AC_SUBST(HWCAP_FLAGS) ]) diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 9e8360200b4..a4cf5c9f8cf 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -70790,12 +70790,16 @@ esac test -z "$HWCAP_FLAGS" && HWCAP_FLAGS='' - ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -Wa,-nH" + # Restrict the test to Solaris, other assemblers (e.g. AIX as) have -nH + # with a different meaning. + case ${target_os} in + solaris2*) + ac_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Wa,-nH" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for as that supports -Wa,-nH" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for as that supports -Wa,-nH" >&5 $as_echo_n "checking for as that supports -Wa,-nH... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ int @@ -70812,13 +70816,15 @@ else ac_hwcap_flags=no fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "$ac_hwcap_flags" = "yes"; then - HWCAP_FLAGS="-Wa,-nH $HWCAP_FLAGS" - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_hwcap_flags" >&5 + if test "$ac_hwcap_flags" = "yes"; then + HWCAP_FLAGS="-Wa,-nH $HWCAP_FLAGS" + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_hwcap_flags" >&5 $as_echo "$ac_hwcap_flags" >&6; } - CFLAGS="$ac_save_CFLAGS" + CFLAGS="$ac_save_CFLAGS" + ;; + esac |