summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/ChangeLog11
-rw-r--r--gcc/config.in2
-rwxr-xr-xgcc/configure87
-rw-r--r--gcc/configure.in7
-rw-r--r--gcc/dwarf2out.c6
-rw-r--r--gcc/varasm.c10
6 files changed, 64 insertions, 59 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3fe86068a8a..77705c4d176 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,16 @@
2003-09-23 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+ * configure.in (HAVE_GAS_SHF_MERGE): Always define to test result.
+ Update description.
+ * configure: Regenerate.
+ * config.in: Likewise.
+ * dwarf2out.c (DEBUG_STR_SECTION_FLAGS): Test for
+ HAVE_GAS_SHF_MERGE value.
+ * varasm.c (mergeable_string_section): Likewise.
+ (mergeable_constant_section): Likewise.
+
+2003-09-23 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
* except.h (MUST_USE_SJLJ_EXCEPTIONS): Test for DWARF2_UNWIND_INFO
value.
diff --git a/gcc/config.in b/gcc/config.in
index 54c4baeb3d0..a552669aefa 100644
--- a/gcc/config.in
+++ b/gcc/config.in
@@ -453,7 +453,7 @@
/* Define if your assembler mis-optimizes .eh_frame data. */
#undef USE_AS_TRADITIONAL_FORMAT
-/* Define if your assembler supports marking sections with SHF_MERGE flag. */
+/* Define 0/1 if your assembler supports marking sections with SHF_MERGE flag. */
#undef HAVE_GAS_SHF_MERGE
/* Define if your assembler supports thread-local storage. */
diff --git a/gcc/configure b/gcc/configure
index b96bb611303..414970d9cf2 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -6484,12 +6484,11 @@ fi
fi
echo "$ac_t""$gcc_cv_as_shf_merge" 1>&6
-if test $gcc_cv_as_shf_merge = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_GAS_SHF_MERGE 1
+
+cat >> confdefs.h <<EOF
+#define HAVE_GAS_SHF_MERGE `if test $gcc_cv_as_shf_merge = yes; then echo 1; else echo 0; fi`
EOF
-fi
# Thread-local storage - the check is heavily parametrized.
conftest_s=
@@ -6698,7 +6697,7 @@ if test -z "$tls_first_major"; then
: # If we don't have a check, assume no support.
else
echo $ac_n "checking assembler for thread-local storage support""... $ac_c" 1>&6
-echo "configure:6702: checking assembler for thread-local storage support" >&5
+echo "configure:6701: checking assembler for thread-local storage support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_tls'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6709,7 +6708,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo "$conftest_s" > conftest.s
- if { ac_try='$gcc_cv_as $tls_as_opt --fatal-warnings -o conftest.o conftest.s >&5'; { (eval echo configure:6713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as $tls_as_opt --fatal-warnings -o conftest.o conftest.s >&5'; { (eval echo configure:6712: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_tls=yes
else
@@ -6735,7 +6734,7 @@ case "$target" in
# All TARGET_ABI_OSF targets.
alpha*-*-osf* | alpha*-*-linux* | alpha*-*-*bsd*)
echo $ac_n "checking assembler for explicit relocation support""... $ac_c" 1>&6
-echo "configure:6739: checking assembler for explicit relocation support" >&5
+echo "configure:6738: checking assembler for explicit relocation support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_alpha_explicit_relocs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6758,7 +6757,7 @@ fi
ldah $1, d($29) !gprelhigh
lda $1, d($1) !gprellow
lda $29, 0($29) !gpdisp!3' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6761: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_alpha_explicit_relocs=yes
else
@@ -6780,14 +6779,14 @@ fi
sparc*-*-*)
echo $ac_n "checking assembler for .register""... $ac_c" 1>&6
-echo "configure:6784: checking assembler for .register" >&5
+echo "configure:6783: checking assembler for .register" >&5
if eval "test \"`echo '$''{'gcc_cv_as_sparc_register_op'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
gcc_cv_as_sparc_register_op=no
if test x$gcc_cv_as != x; then
echo '.register %g2, #scratch' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6791: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_sparc_register_op=yes
else
@@ -6807,14 +6806,14 @@ EOF
fi
echo $ac_n "checking assembler for -relax option""... $ac_c" 1>&6
-echo "configure:6811: checking assembler for -relax option" >&5
+echo "configure:6810: checking assembler for -relax option" >&5
if eval "test \"`echo '$''{'gcc_cv_as_sparc_relax'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
gcc_cv_as_sparc_relax=no
if test x$gcc_cv_as != x; then
echo '.text' > conftest.s
- if { ac_try='$gcc_cv_as -relax -o conftest.o conftest.s >&5'; { (eval echo configure:6818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -relax -o conftest.o conftest.s >&5'; { (eval echo configure:6817: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_sparc_relax=yes
else
@@ -6834,7 +6833,7 @@ EOF
fi
echo $ac_n "checking assembler for unaligned pcrel relocs""... $ac_c" 1>&6
-echo "configure:6838: checking assembler for unaligned pcrel relocs" >&5
+echo "configure:6837: checking assembler for unaligned pcrel relocs" >&5
if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6847,7 +6846,7 @@ foo:
.align 4
.byte 0
.uaword %r_disp32(foo)' > conftest.s
- if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6850: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
if test x$gcc_cv_ld != x \
&& $gcc_cv_ld -o conftest conftest.o -G > /dev/null 2>&1; then
@@ -6870,7 +6869,7 @@ EOF
echo $ac_n "checking assembler for unaligned pcrel relocs against hidden symbols""... $ac_c" 1>&6
-echo "configure:6874: checking assembler for unaligned pcrel relocs against hidden symbols" >&5
+echo "configure:6873: checking assembler for unaligned pcrel relocs against hidden symbols" >&5
if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel_hidden'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6885,7 +6884,7 @@ else
.hidden foo
foo:
.skip 4' > conftest.s
- if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -K PIC -o conftest.o conftest.s >&5'; { (eval echo configure:6888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
if test x$gcc_cv_ld != x && test x$gcc_cv_objdump != x \
&& $gcc_cv_ld -o conftest conftest.o -G > /dev/null 2>&1 \
@@ -6918,7 +6917,7 @@ fi
fi # unaligned pcrel relocs
echo $ac_n "checking assembler for offsetable %lo()""... $ac_c" 1>&6
-echo "configure:6922: checking assembler for offsetable %lo()" >&5
+echo "configure:6921: checking assembler for offsetable %lo()" >&5
if eval "test \"`echo '$''{'gcc_cv_as_sparc_offsetable_lo10'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6927,7 +6926,7 @@ else
echo '.text
or %g1, %lo(ab) + 12, %g1
or %g1, %lo(ab + 12), %g1' > conftest.s
- if { ac_try='$gcc_cv_as -xarch=v9 -o conftest.o conftest.s >&5'; { (eval echo configure:6931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -xarch=v9 -o conftest.o conftest.s >&5'; { (eval echo configure:6930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
if test x$gcc_cv_objdump != x \
&& %gcc_cv_objdump -s -j .text conftest.o 2> /dev/null \
@@ -6953,7 +6952,7 @@ fi
i[34567]86-*-* | x86_64-*-*)
echo $ac_n "checking assembler for filds and fists mnemonics""... $ac_c" 1>&6
-echo "configure:6957: checking assembler for filds and fists mnemonics" >&5
+echo "configure:6956: checking assembler for filds and fists mnemonics" >&5
if eval "test \"`echo '$''{'gcc_cv_as_ix86_filds_fists'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -6964,7 +6963,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo 'filds mem; fists mem' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6967: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_ix86_filds_fists=yes
else
@@ -6984,14 +6983,14 @@ EOF
fi
echo $ac_n "checking assembler for cmov syntax""... $ac_c" 1>&6
-echo "configure:6988: checking assembler for cmov syntax" >&5
+echo "configure:6987: checking assembler for cmov syntax" >&5
if eval "test \"`echo '$''{'gcc_cv_as_ix86_cmov_sun_syntax'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
gcc_cv_as_ix86_cmov_sun_syntax=no
if test x$gcc_cv_as != x; then
echo 'cmovl.l %edx, %eax' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6995: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:6994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_ix86_cmov_sun_syntax=yes
else
@@ -7013,7 +7012,7 @@ fi
# This one is used unconditionally by i386.[ch]; it is to be defined
# to 1 if the feature is present, 0 otherwise.
echo $ac_n "checking assembler for GOTOFF in data""... $ac_c" 1>&6
-echo "configure:7017: checking assembler for GOTOFF in data" >&5
+echo "configure:7016: checking assembler for GOTOFF in data" >&5
if eval "test \"`echo '$''{'gcc_cv_as_ix86_gotoff_in_data'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7028,7 +7027,7 @@ fi
nop
.data
.long .L0@GOTOFF' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7032: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_ix86_gotoff_in_data=yes
else
@@ -7049,7 +7048,7 @@ EOF
ia64*-*-*)
echo $ac_n "checking assembler for ltoffx and ldxmov relocs""... $ac_c" 1>&6
-echo "configure:7053: checking assembler for ltoffx and ldxmov relocs" >&5
+echo "configure:7052: checking assembler for ltoffx and ldxmov relocs" >&5
if eval "test \"`echo '$''{'gcc_cv_as_ia64_ltoffx_ldxmov_relocs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7063,7 +7062,7 @@ fi
addl r15 = @ltoffx(x#), gp
;;
ld8.mov r16 = [r15], x#' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_ia64_ltoffx_ldxmov_relocs=yes
else
@@ -7093,7 +7092,7 @@ fi
mfcr 3,128"
echo $ac_n "checking assembler for mfcr field support""... $ac_c" 1>&6
-echo "configure:7097: checking assembler for mfcr field support" >&5
+echo "configure:7096: checking assembler for mfcr field support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_powerpc_mfcrf'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7104,7 +7103,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo "$conftest_s" > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7108: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7107: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_powerpc_mfcrf=yes
else
@@ -7126,7 +7125,7 @@ fi
mips*-*-*)
echo $ac_n "checking assembler for explicit relocation support""... $ac_c" 1>&6
-echo "configure:7130: checking assembler for explicit relocation support" >&5
+echo "configure:7129: checking assembler for explicit relocation support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_mips_explicit_relocs'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7137,7 +7136,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo ' lw $4,%gp_rel(foo)($4)' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7140: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_mips_explicit_relocs=yes
else
@@ -7183,7 +7182,7 @@ if test x"$insn" != x; then
.loc 1 3 0
$insn"
echo $ac_n "checking assembler for dwarf2 debug_line support""... $ac_c" 1>&6
-echo "configure:7187: checking assembler for dwarf2 debug_line support" >&5
+echo "configure:7186: checking assembler for dwarf2 debug_line support" >&5
if eval "test \"`echo '$''{'gcc_cv_as_dwarf2_debug_line'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7195,7 +7194,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo "$conftest_s" > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
# ??? This fails with non-gnu grep. Maybe use objdump?
if grep debug_line conftest.o > /dev/null 2>&1; then
@@ -7217,7 +7216,7 @@ echo "$ac_t""$gcc_cv_as_dwarf2_debug_line" 1>&6
# by DW_AT_decl_file. Approximate this test by testing if
# the assembler bitches if the same index is assigned twice.
echo $ac_n "checking assembler for buggy dwarf2 .file directive""... $ac_c" 1>&6
-echo "configure:7221: checking assembler for buggy dwarf2 .file directive" >&5
+echo "configure:7220: checking assembler for buggy dwarf2 .file directive" >&5
if eval "test \"`echo '$''{'gcc_cv_as_dwarf2_file_buggy'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7225,7 +7224,7 @@ else
if test x$gcc_cv_as != x; then
echo ' .file 1 "foo.s"
.file 1 "bar.s"' > conftest.s
- if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as -o conftest.o conftest.s >&5'; { (eval echo configure:7228: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_dwarf2_file_buggy=yes
else
@@ -7248,7 +7247,7 @@ EOF
fi
echo $ac_n "checking assembler for --gdwarf2 option""... $ac_c" 1>&6
-echo "configure:7252: checking assembler for --gdwarf2 option" >&5
+echo "configure:7251: checking assembler for --gdwarf2 option" >&5
if eval "test \"`echo '$''{'gcc_cv_as_gdwarf2_flag'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7260,7 +7259,7 @@ else
fi
elif test x$gcc_cv_as != x; then
echo "$insn" > conftest.s
- if { ac_try='$gcc_cv_as --gdwarf2 -o conftest.o conftest.s >&5'; { (eval echo configure:7264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as --gdwarf2 -o conftest.o conftest.s >&5'; { (eval echo configure:7263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
gcc_cv_as_gdwarf2_flag=yes
else
@@ -7280,7 +7279,7 @@ EOF
fi
echo $ac_n "checking assembler for --gstabs option""... $ac_c" 1>&6
-echo "configure:7284: checking assembler for --gstabs option" >&5
+echo "configure:7283: checking assembler for --gstabs option" >&5
if eval "test \"`echo '$''{'gcc_cv_as_gstabs_flag'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -7292,12 +7291,12 @@ else
fi
elif test x$gcc_cv_as != x; then
echo "$insn" > conftest.s
- if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s >&5'; { (eval echo configure:7296: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s >&5'; { (eval echo configure:7295: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then
# The native Solaris 9/Intel assembler doesn't understand --gstabs
# and warns about it, but still exits successfully. So check for
# this.
- if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s 2>&1 | grep -i warning > /dev/null'; { (eval echo configure:7301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
+ if { ac_try='$gcc_cv_as --gstabs -o conftest.o conftest.s 2>&1 | grep -i warning > /dev/null'; { (eval echo configure:7300: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }
then :
else gcc_cv_as_gstabs_flag=yes
fi
@@ -7319,7 +7318,7 @@ fi
fi
echo $ac_n "checking linker read-only and read-write section mixing""... $ac_c" 1>&6
-echo "configure:7323: checking linker read-only and read-write section mixing" >&5
+echo "configure:7322: checking linker read-only and read-write section mixing" >&5
gcc_cv_ld_ro_rw_mix=unknown
if test $in_tree_ld = yes ; then
if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 10 -o "$gcc_cv_gld_major_version" -gt 2 \
@@ -7358,7 +7357,7 @@ fi
echo "$ac_t""$gcc_cv_ld_ro_rw_mix" 1>&6
echo $ac_n "checking linker PT_GNU_EH_FRAME support""... $ac_c" 1>&6
-echo "configure:7362: checking linker PT_GNU_EH_FRAME support" >&5
+echo "configure:7361: checking linker PT_GNU_EH_FRAME support" >&5
gcc_cv_ld_eh_frame_hdr=no
if test $in_tree_ld = yes ; then
if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 12 -o "$gcc_cv_gld_major_version" -gt 2 \
@@ -7380,7 +7379,7 @@ fi
echo "$ac_t""$gcc_cv_ld_eh_frame_hdr" 1>&6
echo $ac_n "checking linker position independent executable support""... $ac_c" 1>&6
-echo "configure:7384: checking linker position independent executable support" >&5
+echo "configure:7383: checking linker position independent executable support" >&5
gcc_cv_ld_pie=no
if test $in_tree_ld = yes ; then
if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 15 -o "$gcc_cv_gld_major_version" -gt 2 \
@@ -7405,7 +7404,7 @@ echo "$ac_t""$gcc_cv_ld_pie" 1>&6
case "$target" in
mips*-*-*)
echo $ac_n "checking whether libgloss uses STARTUP directives consistently""... $ac_c" 1>&6
-echo "configure:7409: checking whether libgloss uses STARTUP directives consistently" >&5
+echo "configure:7408: checking whether libgloss uses STARTUP directives consistently" >&5
gcc_cv_mips_libgloss_startup=no
gcc_cv_libgloss_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/libgloss
if test "x$exec_prefix" = xNONE; then
@@ -7607,7 +7606,7 @@ fi
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:7611: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:7610: 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 916f3384da4..ab5ecdc2f4d 100644
--- a/gcc/configure.in
+++ b/gcc/configure.in
@@ -1977,9 +1977,10 @@ fi
gcc_GAS_CHECK_FEATURE(section merging support, gcc_cv_as_shf_merge,
[elf,2,12,0], [--fatal-warnings],
- [.section .rodata.str, "aMS", @progbits, 1],,
- [AC_DEFINE(HAVE_GAS_SHF_MERGE, 1,
-[Define if your assembler supports marking sections with SHF_MERGE flag.])])
+ [.section .rodata.str, "aMS", @progbits, 1])
+AC_DEFINE_UNQUOTED(HAVE_GAS_SHF_MERGE,
+ [`if test $gcc_cv_as_shf_merge = yes; then echo 1; else echo 0; fi`],
+[Define 0/1 if your assembler supports marking sections with SHF_MERGE flag.])
# Thread-local storage - the check is heavily parametrized.
conftest_s=
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 5fa730e1b55..8362a698f16 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -3812,14 +3812,10 @@ static int maybe_emit_file (int);
#endif
/* Section flags for .debug_str section. */
-#ifdef HAVE_GAS_SHF_MERGE
#define DEBUG_STR_SECTION_FLAGS \
- (flag_merge_constants \
+ (HAVE_GAS_SHF_MERGE && flag_merge_constants \
? SECTION_DEBUG | SECTION_MERGE | SECTION_STRINGS | 1 \
: SECTION_DEBUG)
-#else
-#define DEBUG_STR_SECTION_FLAGS SECTION_DEBUG
-#endif
/* Labels we insert at beginning sections we can reference instead of
the section names themselves. */
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 059ba5027aa..aea04148da2 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -561,8 +561,7 @@ mergeable_string_section (tree decl ATTRIBUTE_UNUSED,
unsigned HOST_WIDE_INT align ATTRIBUTE_UNUSED,
unsigned int flags ATTRIBUTE_UNUSED)
{
-#ifdef HAVE_GAS_SHF_MERGE
- if (flag_merge_constants
+ if (HAVE_GAS_SHF_MERGE && flag_merge_constants
&& TREE_CODE (decl) == STRING_CST
&& TREE_CODE (TREE_TYPE (decl)) == ARRAY_TYPE
&& align <= 256
@@ -624,7 +623,7 @@ mergeable_string_section (tree decl ATTRIBUTE_UNUSED,
}
}
}
-#endif
+
readonly_data_section ();
}
@@ -635,10 +634,9 @@ mergeable_constant_section (enum machine_mode mode ATTRIBUTE_UNUSED,
unsigned HOST_WIDE_INT align ATTRIBUTE_UNUSED,
unsigned int flags ATTRIBUTE_UNUSED)
{
-#ifdef HAVE_GAS_SHF_MERGE
unsigned int modesize = GET_MODE_BITSIZE (mode);
- if (flag_merge_constants
+ if (HAVE_GAS_SHF_MERGE && flag_merge_constants
&& mode != VOIDmode
&& mode != BLKmode
&& modesize <= align
@@ -653,7 +651,7 @@ mergeable_constant_section (enum machine_mode mode ATTRIBUTE_UNUSED,
named_section_flags (name, flags);
return;
}
-#endif
+
readonly_data_section ();
}
View Lorry Controller Status