From 3cae57803c205eafdb88a46c080060d5f061a838 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Thu, 15 Nov 2001 12:11:52 +0000 Subject: [PATCH] configure.in: Check for target objdump and use that in eh_frame optimization test. * configure.in: Check for target objdump and use that in eh_frame optimization test. * configure: Regenerated. From-SVN: r47051 --- gcc/ChangeLog | 6 ++++++ gcc/configure | 50 ++++++++++++++++++++++++++++++------------------ gcc/configure.in | 15 +++++++++++++-- 3 files changed, 50 insertions(+), 21 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 167bd63590e..dca1dce309a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2001-11-15 Andreas Schwab + + * configure.in: Check for target objdump and use that in eh_frame + optimization test. + * configure: Regenerated. + 2001-11-15 Jakub Jelinek * jump.c (squeeze_notes): Return true if no real insns were found. diff --git a/gcc/configure b/gcc/configure index 156010c7595..44ecb9f8d34 100755 --- a/gcc/configure +++ b/gcc/configure @@ -6954,9 +6954,10 @@ if test -f ../gas/Makefile; then rm -f as; $symbolic_link ../gas/as-new$host_exeext as$host_exeext 2>/dev/null fi -# If we have nm in the build tree, make a link to it. +# If we have nm and objdump in the build tree, make a link to them. if test -f ../binutils/Makefile; then rm -f nm; $symbolic_link ../binutils/nm-new$host_exeext nm$host_exeext 2>/dev/null + rm -f objdump; $symbolic_link ../binutils/objdump$host_exeext objdump$host_exeext 2>/dev/null fi # If we have ld in the build tree, make a link to it. @@ -6966,7 +6967,7 @@ fi # Figure out what assembler we will be using. echo $ac_n "checking what assembler to use""... $ac_c" 1>&6 -echo "configure:6970: checking what assembler to use" >&5 +echo "configure:6971: checking what assembler to use" >&5 gcc_cv_as= gcc_cv_gas_major_version= gcc_cv_gas_minor_version= @@ -7052,7 +7053,7 @@ fi # Figure out what nm we will be using. echo $ac_n "checking what nm to use""... $ac_c" 1>&6 -echo "configure:7056: checking what nm to use" >&5 +echo "configure:7057: checking what nm to use" >&5 if test -x nm$host_exeext; then gcc_cv_nm=./nm$host_exeext elif test x$host = x$target; then @@ -7061,9 +7062,20 @@ elif test x$host = x$target; then fi echo "$ac_t""$gcc_cv_nm" 1>&6 +# Figure out what objdump we will be using. +echo $ac_n "checking what objdump to use""... $ac_c" 1>&6 +echo "configure:7068: checking what objdump to use" >&5 +if test -x objdump$host_exeext; then + gcc_cv_objdump=./objdump$host_exeext +elif test x$host = x$target; then + # Native build. + gcc_cv_objdump=objdump$host_exeext +fi +echo "$ac_t""$gcc_cv_objdump" 1>&6 + # Figure out what assembler alignment features are present. echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6 -echo "configure:7067: checking assembler alignment features" >&5 +echo "configure:7079: checking assembler alignment features" >&5 gcc_cv_as_alignment_features=none if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then # Gas version 2.6 and later support for .balign and .p2align. @@ -7111,7 +7123,7 @@ fi echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6 -echo "configure:7115: checking assembler subsection support" >&5 +echo "configure:7127: checking assembler subsection support" >&5 gcc_cv_as_subsections=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7151,7 +7163,7 @@ fi echo "$ac_t""$gcc_cv_as_subsections" 1>&6 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6 -echo "configure:7155: checking assembler weak support" >&5 +echo "configure:7167: checking assembler weak support" >&5 gcc_cv_as_weak=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then @@ -7174,7 +7186,7 @@ fi echo "$ac_t""$gcc_cv_as_weak" 1>&6 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6 -echo "configure:7178: checking assembler hidden support" >&5 +echo "configure:7190: checking assembler hidden support" >&5 gcc_cv_as_hidden=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 10 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7198,7 +7210,7 @@ fi echo "$ac_t""$gcc_cv_as_hidden" 1>&6 echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6 -echo "configure:7202: checking assembler leb128 support" >&5 +echo "configure:7214: checking assembler leb128 support" >&5 gcc_cv_as_leb128=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 11 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7243,7 +7255,7 @@ fi echo "$ac_t""$gcc_cv_as_leb128" 1>&6 echo $ac_n "checking assembler eh_frame optimization""... $ac_c" 1>&6 -echo "configure:7247: checking assembler eh_frame optimization" >&5 +echo "configure:7259: checking assembler eh_frame optimization" >&5 gcc_cv_as_eh_frame=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7303,7 +7315,7 @@ EOF # If the assembler didn't choke, and we can objdump, # and we got the correct data, then succeed. if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1 \ - && objdump -s -j .eh_frame conftest.o 2>/dev/null \ + && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \ | tail -3 > conftest.got \ && { cmp conftest.lit conftest.got > /dev/null 2>&1 \ || cmp conftest.big conftest.got > /dev/null 2>&1; } @@ -7324,7 +7336,7 @@ fi echo "$ac_t""$gcc_cv_as_eh_frame" 1>&6 echo $ac_n "checking assembler section merging support""... $ac_c" 1>&6 -echo "configure:7328: checking assembler section merging support" >&5 +echo "configure:7340: checking assembler section merging support" >&5 gcc_cv_as_shf_merge=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7349,7 +7361,7 @@ echo "$ac_t""$gcc_cv_as_shf_merge" 1>&6 case "$target" in sparc*-*-*) echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6 -echo "configure:7353: checking assembler .register pseudo-op support" >&5 +echo "configure:7365: checking assembler .register pseudo-op support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7377,7 +7389,7 @@ EOF fi echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6 -echo "configure:7381: checking assembler supports -relax" >&5 +echo "configure:7393: checking assembler supports -relax" >&5 if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7407,7 +7419,7 @@ EOF case "$tm_file" in *64*) echo $ac_n "checking for 64 bit support in assembler ($gcc_cv_as)""... $ac_c" 1>&6 -echo "configure:7411: checking for 64 bit support in assembler ($gcc_cv_as)" >&5 +echo "configure:7423: checking for 64 bit support in assembler ($gcc_cv_as)" >&5 if eval "test \"`echo '$''{'gcc_cv_as_flags64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7452,7 +7464,7 @@ EOF if test "x$gcc_cv_as_flags64" != xno; then echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6 -echo "configure:7456: checking for assembler offsetable %lo() support" >&5 +echo "configure:7468: checking for assembler offsetable %lo() support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7492,7 +7504,7 @@ EOF i[34567]86-*-* | x86_64-*-*) echo $ac_n "checking assembler instructions""... $ac_c" 1>&6 -echo "configure:7496: checking assembler instructions" >&5 +echo "configure:7508: checking assembler instructions" >&5 gcc_cv_as_instructions= if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then @@ -7519,7 +7531,7 @@ EOF echo "$ac_t""$gcc_cv_as_instructions" 1>&6 echo $ac_n "checking assembler GOTOFF in data directives""... $ac_c" 1>&6 -echo "configure:7523: checking assembler GOTOFF in data directives" >&5 +echo "configure:7535: checking assembler GOTOFF in data directives" >&5 gcc_cv_as_gotoff_in_data=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x then @@ -7549,7 +7561,7 @@ EOF esac echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6 -echo "configure:7553: checking assembler dwarf2 debug_line support" >&5 +echo "configure:7565: checking assembler dwarf2 debug_line support" >&5 gcc_cv_as_dwarf2_debug_line=no # ??? Not all targets support dwarf2 debug_line, even within a version # of gas. Moreover, we need to emit a valid instruction to trigger any @@ -7747,7 +7759,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:7751: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:7763: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" diff --git a/gcc/configure.in b/gcc/configure.in index 56edfd7fe6a..633050f4f23 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -1133,9 +1133,10 @@ if test -f ../gas/Makefile; then rm -f as; $symbolic_link ../gas/as-new$host_exeext as$host_exeext 2>/dev/null fi -# If we have nm in the build tree, make a link to it. +# If we have nm and objdump in the build tree, make a link to them. if test -f ../binutils/Makefile; then rm -f nm; $symbolic_link ../binutils/nm-new$host_exeext nm$host_exeext 2>/dev/null + rm -f objdump; $symbolic_link ../binutils/objdump$host_exeext objdump$host_exeext 2>/dev/null fi # If we have ld in the build tree, make a link to it. @@ -1242,6 +1243,16 @@ elif test x$host = x$target; then fi AC_MSG_RESULT($gcc_cv_nm) +# Figure out what objdump we will be using. +AC_MSG_CHECKING(what objdump to use) +if test -x objdump$host_exeext; then + gcc_cv_objdump=./objdump$host_exeext +elif test x$host = x$target; then + # Native build. + gcc_cv_objdump=objdump$host_exeext +fi +AC_MSG_RESULT($gcc_cv_objdump) + # Figure out what assembler alignment features are present. AC_MSG_CHECKING(assembler alignment features) gcc_cv_as_alignment_features=none @@ -1460,7 +1471,7 @@ EOF # If the assembler didn't choke, and we can objdump, # and we got the correct data, then succeed. if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1 \ - && objdump -s -j .eh_frame conftest.o 2>/dev/null \ + && $gcc_cv_objdump -s -j .eh_frame conftest.o 2>/dev/null \ | tail -3 > conftest.got \ && { cmp conftest.lit conftest.got > /dev/null 2>&1 \ || cmp conftest.big conftest.got > /dev/null 2>&1; } -- 2.30.2