Fix gcc_cv_as_cfi_directive test for Solaris as

	* configure.ac (gcc_cv_as_cfi_directive): Support Solaris/x86
	assembler 64-bit option.
	* configure: Regenerate.

From-SVN: r209739

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8db713b8b5e004cb41a714a650664dab9fd59912..2afb950bdd98736069e886b0088a17ba07be60c4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-24  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * configure.ac (gcc_cv_as_cfi_directive): Support Solaris/x86
+       assembler 64-bit option.
+       * configure: Regenerate.
+
 2014-04-24  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        * config/aarch64/aarch64.h (TARGET_CPU_CPP_BUILTINS): Check

diff --git a/gcc/configure b/gcc/configure
index fe6f31e77f90b6c6bb885c2ffefc9e926f9c6a30..813ccce2257e9bd2cde862c4056fc8af55886b63 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -22636,9 +22636,14 @@ else
        else
          case "$target" in
            i?86-*-solaris2.1[0-9]* | x86_64-*-solaris2.1[0-9]*)
-             # On Solaris/x86, make sure that GCC and gas agree on using
+             # On Solaris/x86, make sure that GCC and assembler agree on using
              # read-only .eh_frame sections for 64-bit.
-             if $gcc_cv_as --64 -o conftest.o conftest.s > /dev/null 2>&1 && \
+             if test x$gas = xyes; then
+                as_ix86_64_opt="--64"
+             else
+                as_ix86_64_opt="-xarch=amd64"
+             fi
+             if $gcc_cv_as $as_ix86_64_opt -o conftest.o conftest.s > /dev/null 2>&1 && \
                $gcc_cv_objdump -h conftest.o 2>/dev/null | \
                        sed -e /.eh_frame/!d -e N | \
                        grep READONLY > /dev/null; then

diff --git a/gcc/configure.ac b/gcc/configure.ac
index d78955774c4395d8a08830e5fab0859a6b7a919f..1235501bd49dc913e9fe493569c71b991aefabd5 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -2544,9 +2544,14 @@ gcc_GAS_CHECK_FEATURE([cfi directives], gcc_cv_as_cfi_directive,
        else
          case "$target" in
            i?86-*-solaris2.1[[0-9]]* | x86_64-*-solaris2.1[[0-9]]*)
-             # On Solaris/x86, make sure that GCC and gas agree on using
+             # On Solaris/x86, make sure that GCC and assembler agree on using
              # read-only .eh_frame sections for 64-bit.
-             if $gcc_cv_as --64 -o conftest.o conftest.s > /dev/null 2>&1 && \
+             if test x$gas = xyes; then
+                as_ix86_64_opt="--64"
+             else
+                as_ix86_64_opt="-xarch=amd64"
+             fi
+             if $gcc_cv_as $as_ix86_64_opt -o conftest.o conftest.s > /dev/null 2>&1 && \
                $gcc_cv_objdump -h conftest.o 2>/dev/null | \
                        sed -e /.eh_frame/!d -e N | \
                        grep READONLY > /dev/null; then