Skip to content

R
riscv-gcc-1
Commit 49677530 by H.J. Lu
Options

Apply missing changes 

From-SVN: r237737
parent c0597759
Showing with 14 additions and 14 deletions
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
......
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment