diff options
| author | H.J. Lu <hongjiu.lu@intel.com> | 2016-06-23 16:46:46 +0000 |
|---|---|---|
| committer | H.J. Lu <hongjiu.lu@intel.com> | 2016-06-23 16:46:46 +0000 |
| commit | 6af10651178d9335d6a000c95af4056eb725ebb9 (patch) | |
| tree | b8ae93c6f2294ecb02d656cc17d88935d2857517 | |
| parent | 653aeecd8482e0b97b1e1341d58d78701d64fc9e (diff) | |
Apply missing changes
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@237737 138bc75d-0d04-0410-961f-82ee72b054a4
| -rwxr-xr-x | gcc/configure | 14 | ||||
| -rw-r--r-- | gcc/configure.ac | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/gcc/configure b/gcc/configure index 800ab269e24..94ba9bd0fd1 100755 --- a/gcc/configure +++ b/gcc/configure @@ -25899,13 +25899,13 @@ _ACEOF # Enforce 32-bit output with gas and gld. if test x$gas = xyes; then - as_ix86_gas_opt="--32" + as_ix86_gas_32_opt="--32" fi if echo "$ld_ver" | grep GNU > /dev/null; then if $gcc_cv_ld -V 2>/dev/null | grep elf_i386_sol2 > /dev/null; then - ld_ix86_gld_opt="-melf_i386_sol2" + ld_ix86_gld_32_opt="-melf_i386_sol2" else - ld_ix86_gld_opt="-melf_i386" + ld_ix86_gld_32_opt="-melf_i386" fi fi conftest_s=' @@ -25927,7 +25927,7 @@ else gcc_cv_as_ix86_tlsldm=no if test x$gcc_cv_as != x; then $as_echo "$conftest_s" > conftest.s - if { ac_try='$gcc_cv_as $gcc_cv_as_flags $as_ix86_gas_opt -o conftest.o conftest.s >&5' + if { ac_try='$gcc_cv_as $gcc_cv_as_flags $as_ix86_gas_32_opt -o conftest.o conftest.s >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25935,7 +25935,7 @@ else test $ac_status = 0; }; } then if test x$gcc_cv_ld != x && test x$gcc_cv_objdump != x \ - && $gcc_cv_ld $ld_ix86_gld_opt -o conftest conftest.o $ld_tls_libs -lc > /dev/null 2>&1; then + && $gcc_cv_ld $ld_ix86_gld_32_opt -o conftest conftest.o $ld_tls_libs -lc > /dev/null 2>&1; then if $gcc_cv_objdump -d conftest 2>/dev/null | grep nop > /dev/null \ || dis conftest 2>/dev/null | grep nop > /dev/null; then gcc_cv_as_ix86_tlsldm=yes @@ -25975,7 +25975,7 @@ else gcc_cv_as_ix86_got32x=no if test x$gcc_cv_as != x; then $as_echo "$conftest_s" > conftest.s - if { ac_try='$gcc_cv_as $gcc_cv_as_flags $as_ix86_gas_opt -o conftest.o conftest.s >&5' + if { ac_try='$gcc_cv_as $gcc_cv_as_flags $as_ix86_gas_32_opt -o conftest.o conftest.s >&5' { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5 (eval $ac_try) 2>&5 ac_status=$? @@ -25986,7 +25986,7 @@ else && test x$gcc_cv_readelf != x \ && $gcc_cv_readelf --relocs --wide conftest.o 2>&1 \ | grep R_386_GOT32X > /dev/null 2>&1 \ - && $gcc_cv_ld $ld_ix86_gld_opt -o conftest conftest.o > /dev/null 2>&1; then + && $gcc_cv_ld $ld_ix86_gld_32_opt -o conftest conftest.o > /dev/null 2>&1; then if $gcc_cv_objdump -dw conftest 2>&1 \ | grep 0xffffff > /dev/null 2>&1; then gcc_cv_as_ix86_got32x=no diff --git a/gcc/configure.ac b/gcc/configure.ac index db3c6036916..b0f38d1e430 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -4164,13 +4164,13 @@ tls_ld: # Enforce 32-bit output with gas and gld. if test x$gas = xyes; then - as_ix86_gas_opt="--32" + as_ix86_gas_32_opt="--32" fi if echo "$ld_ver" | grep GNU > /dev/null; then if $gcc_cv_ld -V 2>/dev/null | grep elf_i386_sol2 > /dev/null; then - ld_ix86_gld_opt="-melf_i386_sol2" + ld_ix86_gld_32_opt="-melf_i386_sol2" else - ld_ix86_gld_opt="-melf_i386" + ld_ix86_gld_32_opt="-melf_i386" fi fi conftest_s=' @@ -4186,10 +4186,10 @@ _start: value:' gcc_GAS_CHECK_FEATURE([R_386_TLS_LDM reloc], gcc_cv_as_ix86_tlsldm,, - [$as_ix86_gas_opt], + [$as_ix86_gas_32_opt], [$conftest_s], [if test x$gcc_cv_ld != x && test x$gcc_cv_objdump != x \ - && $gcc_cv_ld $ld_ix86_gld_opt -o conftest conftest.o $ld_tls_libs -lc > /dev/null 2>&1; then + && $gcc_cv_ld $ld_ix86_gld_32_opt -o conftest conftest.o $ld_tls_libs -lc > /dev/null 2>&1; then if $gcc_cv_objdump -d conftest 2>/dev/null | grep nop > /dev/null \ || dis conftest 2>/dev/null | grep nop > /dev/null; then gcc_cv_as_ix86_tlsldm=yes @@ -4211,13 +4211,13 @@ _start: jmp *_start@GOT' gcc_GAS_CHECK_FEATURE([R_386_GOT32X reloc], gcc_cv_as_ix86_got32x,, - [$as_ix86_gas_opt], + [$as_ix86_gas_32_opt], [$conftest_s], [if test x$gcc_cv_ld != x && test x$gcc_cv_objdump != x \ && test x$gcc_cv_readelf != x \ && $gcc_cv_readelf --relocs --wide conftest.o 2>&1 \ | grep R_386_GOT32X > /dev/null 2>&1 \ - && $gcc_cv_ld $ld_ix86_gld_opt -o conftest conftest.o > /dev/null 2>&1; then + && $gcc_cv_ld $ld_ix86_gld_32_opt -o conftest conftest.o > /dev/null 2>&1; then if $gcc_cv_objdump -dw conftest 2>&1 \ | grep 0xffffff > /dev/null 2>&1; then gcc_cv_as_ix86_got32x=no |