From dc06db201983bfe0126fb1ad0646713969be0445 Mon Sep 17 00:00:00 2001 From: "J\"orn Rennecke" Date: Tue, 3 Jun 2003 19:01:22 +0000 Subject: [PATCH] configure.in (inhibit_libc): Don't define when configuring with --with-newlib --with-headers. * configure.in (inhibit_libc): Don't define when configuring with --with-newlib --with-headers. * configure: Regenerate. * t-sh: Remove LIB2FUNCS_EXTRA and embed-bb.c rules. From-SVN: r67396 --- gcc/ChangeLog | 8 ++++++ gcc/config/sh/t-sh | 9 ------ gcc/configure | 70 ++++++++++++++++++++++++---------------------- gcc/configure.in | 8 ++++-- 4 files changed, 49 insertions(+), 46 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6181a01ab49..4afe2f71e45 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2003-05-23 J"orn Rennecke + + * configure.in (inhibit_libc): Don't define when configuring + with --with-newlib --with-headers. + * configure: Regenerate. + + * t-sh: Remove LIB2FUNCS_EXTRA and embed-bb.c rules. + 2003-06-03 Rainer Orth * configure.in (gcc_cv_as_hidden): Disable .hidden completely on diff --git a/gcc/config/sh/t-sh b/gcc/config/sh/t-sh index ee4db6639f9..15aaba1ece6 100644 --- a/gcc/config/sh/t-sh +++ b/gcc/config/sh/t-sh @@ -3,15 +3,6 @@ LIB1ASMFUNCS = _ashiftrt _ashiftrt_n _ashiftlt _lshiftrt _movstr \ _movstr_i4 _mulsi3 _sdivsi3 _sdivsi3_i4 _udivsi3 _udivsi3_i4 _set_fpscr \ $(LIB1ASMFUNCS_CACHE) -LIB2FUNCS_EXTRA=embed-bb.c - -embed-bb.c: $(srcdir)/libgcc2.c - echo '#ifdef inhibit_libc' > $@ - echo '#define L_bb' >> $@ - echo '#undef inhibit_libc' >> $@ - cat $< >> $@ - echo '#endif' >> $@ - # We want fine grained libraries, so use the new code to build the # floating point emulation libraries. FPBIT = fp-bit.c diff --git a/gcc/configure b/gcc/configure index 71f2da13557..56dc0d6c546 100755 --- a/gcc/configure +++ b/gcc/configure @@ -2434,7 +2434,7 @@ fi # Find some useful tools -for ac_prog in mawk gawk nawk awk +for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 @@ -7391,12 +7391,14 @@ fi # have its own set of headers then define # inhibit_libc -# If this is using newlib, then define inhibit_libc in LIBGCC2_CFLAGS. +# If this is using newlib, without having the headers available now, +# then define inhibit_libc in LIBGCC2_CFLAGS. # This prevents libgcc2 from containing any code which requires libc # support. inhibit_libc= -if { test x$host != x$target && test "x$with_headers" = x && - test "x$with_sysroot" = x ; } || test x$with_newlib = xyes ; then +if { { test x$host != x$target && test "x$with_sysroot" = x ; } || + test x$with_newlib = xyes ; } && + test "x$with_headers" = x ; then inhibit_libc=-Dinhibit_libc fi @@ -7459,7 +7461,7 @@ esac # build->target assembler and hope that it will have the same features # as the host->target assembler we'll be using. echo $ac_n "checking what assembler to use""... $ac_c" 1>&6 -echo "configure:7463: checking what assembler to use" >&5 +echo "configure:7465: checking what assembler to use" >&5 in_tree_gas=no gcc_cv_as= gcc_cv_gas_major_version= @@ -7570,7 +7572,7 @@ esac # build->target linker and hope that it will have the same features # as the host->target linker we'll be using. echo $ac_n "checking what linker to use""... $ac_c" 1>&6 -echo "configure:7574: checking what linker to use" >&5 +echo "configure:7576: checking what linker to use" >&5 in_tree_ld=no gcc_cv_ld= gcc_cv_gld_major_version= @@ -7673,7 +7675,7 @@ esac # Figure out what nm we will be using. gcc_cv_binutils_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/binutils echo $ac_n "checking what nm to use""... $ac_c" 1>&6 -echo "configure:7677: checking what nm to use" >&5 +echo "configure:7679: checking what nm to use" >&5 in_tree_nm=no if test -x nm$host_exeext; then gcc_cv_nm=./nm$host_exeext @@ -7696,7 +7698,7 @@ esac # Figure out what objdump we will be using. echo $ac_n "checking what objdump to use""... $ac_c" 1>&6 -echo "configure:7700: checking what objdump to use" >&5 +echo "configure:7702: checking what objdump to use" >&5 in_tree_objdump=no if test -x objdump$host_exeext; then gcc_cv_objdump=./objdump$host_exeext @@ -7721,7 +7723,7 @@ esac # Figure out what assembler alignment features are present. echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6 -echo "configure:7725: checking assembler alignment features" >&5 +echo "configure:7727: checking assembler alignment features" >&5 gcc_cv_as_alignment_features=none if test $in_tree_gas = yes; then # Gas version 2.6 and later support for .balign and .p2align. @@ -7782,7 +7784,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:7786: checking assembler subsection support" >&5 +echo "configure:7788: checking assembler subsection support" >&5 gcc_cv_as_subsections=no if test $in_tree_gas = yes ; then if test $gcc_cv_gas_major_version -eq 2 \ @@ -7831,7 +7833,7 @@ fi echo "$ac_t""$gcc_cv_as_subsections" 1>&6 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6 -echo "configure:7835: checking assembler weak support" >&5 +echo "configure:7837: checking assembler weak support" >&5 gcc_cv_as_weak=no if test $in_tree_gas = yes ; then if test $gcc_cv_gas_major_version -eq 2 \ @@ -7861,7 +7863,7 @@ fi echo "$ac_t""$gcc_cv_as_weak" 1>&6 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6 -echo "configure:7865: checking assembler hidden support" >&5 +echo "configure:7867: checking assembler hidden support" >&5 gcc_cv_as_hidden=no if test $in_tree_gas = yes ; then if test $gcc_cv_gas_major_version -eq 2 \ @@ -7942,7 +7944,7 @@ libgcc_visibility=$gcc_cv_as_hidden echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6 -echo "configure:7946: checking assembler leb128 support" >&5 +echo "configure:7948: checking assembler leb128 support" >&5 gcc_cv_as_leb128=no if test $in_tree_gas = yes ; then if test $gcc_cv_gas_major_version -eq 2 \ @@ -7996,7 +7998,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:8000: checking assembler eh_frame optimization" >&5 +echo "configure:8002: checking assembler eh_frame optimization" >&5 gcc_cv_as_eh_frame=no if test $in_tree_gas = yes ; then if test $gcc_cv_gas_major_version -eq 2 \ @@ -8086,7 +8088,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:8090: checking assembler section merging support" >&5 +echo "configure:8092: checking assembler section merging support" >&5 gcc_cv_as_shf_merge=no if test $in_tree_gas = yes ; then if test $gcc_cv_gas_major_version -eq 2 \ @@ -8118,7 +8120,7 @@ fi echo "$ac_t""$gcc_cv_as_shf_merge" 1>&6 echo $ac_n "checking assembler thread-local storage support""... $ac_c" 1>&6 -echo "configure:8122: checking assembler thread-local storage support" >&5 +echo "configure:8124: checking assembler thread-local storage support" >&5 gcc_cv_as_tls=no conftest_s= tls_first_major= @@ -8323,7 +8325,7 @@ case "$target" in # All TARGET_ABI_OSF targets. alpha*-*-osf* | alpha*-*-linux* | alpha*-*-*bsd*) echo $ac_n "checking assembler supports explicit relocations""... $ac_c" 1>&6 -echo "configure:8327: checking assembler supports explicit relocations" >&5 +echo "configure:8329: checking assembler supports explicit relocations" >&5 if eval "test \"`echo '$''{'gcc_cv_as_explicit_relocs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8376,7 +8378,7 @@ EOF ;; sparc*-*-*) echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6 -echo "configure:8380: checking assembler .register pseudo-op support" >&5 +echo "configure:8382: 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 @@ -8404,7 +8406,7 @@ EOF fi echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6 -echo "configure:8408: checking assembler supports -relax" >&5 +echo "configure:8410: 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 @@ -8432,7 +8434,7 @@ EOF fi echo $ac_n "checking assembler and linker support unaligned pc related relocs""... $ac_c" 1>&6 -echo "configure:8436: checking assembler and linker support unaligned pc related relocs" >&5 +echo "configure:8438: checking assembler and linker support unaligned pc related relocs" >&5 if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8459,7 +8461,7 @@ EOF fi echo $ac_n "checking assembler and linker support unaligned pc related relocs against hidden symbols""... $ac_c" 1>&6 -echo "configure:8463: checking assembler and linker support unaligned pc related relocs against hidden symbols" >&5 +echo "configure:8465: checking assembler and linker support unaligned pc related 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 @@ -8499,7 +8501,7 @@ EOF fi echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6 -echo "configure:8503: checking for assembler offsetable %lo() support" >&5 +echo "configure:8505: 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 @@ -8538,7 +8540,7 @@ EOF i[34567]86-*-* | x86_64-*-*) echo $ac_n "checking assembler instructions""... $ac_c" 1>&6 -echo "configure:8542: checking assembler instructions" >&5 +echo "configure:8544: checking assembler instructions" >&5 gcc_cv_as_instructions= if test $in_tree_gas = yes ; then if test $gcc_cv_gas_major_version -eq 2 \ @@ -8572,7 +8574,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:8576: checking assembler GOTOFF in data directives" >&5 +echo "configure:8578: checking assembler GOTOFF in data directives" >&5 gcc_cv_as_gotoff_in_data=no if test $in_tree_gas = yes ; then if test $gcc_cv_gas_major_version -eq 2 \ @@ -8606,7 +8608,7 @@ EOF ia64*-*-*) echo $ac_n "checking assembler supports ltoffx and ldxmov""... $ac_c" 1>&6 -echo "configure:8610: checking assembler supports ltoffx and ldxmov" >&5 +echo "configure:8612: checking assembler supports ltoffx and ldxmov" >&5 if eval "test \"`echo '$''{'gcc_cv_as_ltoffx_ldxmov_relocs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -8651,7 +8653,7 @@ EOF esac echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6 -echo "configure:8655: checking assembler dwarf2 debug_line support" >&5 +echo "configure:8657: 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 @@ -8713,7 +8715,7 @@ fi echo "$ac_t""$gcc_cv_as_dwarf2_debug_line" 1>&6 echo $ac_n "checking assembler --gdwarf2 support""... $ac_c" 1>&6 -echo "configure:8717: checking assembler --gdwarf2 support" >&5 +echo "configure:8719: checking assembler --gdwarf2 support" >&5 gcc_cv_as_gdwarf2_flag=no if test $in_tree_gas = yes ; then if test $gcc_cv_gas_major_version -eq 2 \ @@ -8747,7 +8749,7 @@ fi echo "$ac_t""$gcc_cv_as_gdwarf2_flag" 1>&6 echo $ac_n "checking assembler --gstabs support""... $ac_c" 1>&6 -echo "configure:8751: checking assembler --gstabs support" >&5 +echo "configure:8753: checking assembler --gstabs support" >&5 gcc_cv_as_gstabs_flag=no if test $in_tree_gas = yes ; then if test $gcc_cv_gas_major_version -eq 2 \ @@ -8780,7 +8782,7 @@ fi echo "$ac_t""$gcc_cv_as_gstabs_flag" 1>&6 echo $ac_n "checking linker read-only and read-write section mixing""... $ac_c" 1>&6 -echo "configure:8784: checking linker read-only and read-write section mixing" >&5 +echo "configure:8786: 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 && grep 'EMUL = elf' ../ld/Makefile > /dev/null; then @@ -8818,7 +8820,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:8822: checking linker PT_GNU_EH_FRAME support" >&5 +echo "configure:8824: 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 && grep 'EMUL = elf' ../ld/Makefile > /dev/null; then @@ -8839,7 +8841,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:8843: checking linker position independent executable support" >&5 +echo "configure:8845: 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 && grep 'EMUL = elf' ../ld/Makefile > /dev/null; then @@ -8863,7 +8865,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:8867: checking whether libgloss uses STARTUP directives consistently" >&5 +echo "configure:8869: 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 @@ -8891,7 +8893,7 @@ EOF echo "$ac_t""$gcc_cv_mips_libgloss_startup" 1>&6 echo $ac_n "checking whether the assembler has explicit relocation support""... $ac_c" 1>&6 -echo "configure:8895: checking whether the assembler has explicit relocation support" >&5 +echo "configure:8897: checking whether the assembler has explicit relocation support" >&5 if test x$gcc_cv_mips_explicit_relocs = x; then gcc_cv_mips_explicit_relocs=no if test x$gcc_cv_as != x; then @@ -9086,7 +9088,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:9090: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:9092: 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 4f430bfb90a..473bfe2802b 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -1415,12 +1415,14 @@ fi # have its own set of headers then define # inhibit_libc -# If this is using newlib, then define inhibit_libc in LIBGCC2_CFLAGS. +# If this is using newlib, without having the headers available now, +# then define inhibit_libc in LIBGCC2_CFLAGS. # This prevents libgcc2 from containing any code which requires libc # support. inhibit_libc= -if { test x$host != x$target && test "x$with_headers" = x && - test "x$with_sysroot" = x ; } || test x$with_newlib = xyes ; then +if { { test x$host != x$target && test "x$with_sysroot" = x ; } || + test x$with_newlib = xyes ; } && + test "x$with_headers" = x ; then inhibit_libc=-Dinhibit_libc fi AC_SUBST(inhibit_libc)