diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 28 | ||||
| -rw-r--r-- | gcc/Makefile.in | 13 | ||||
| -rw-r--r-- | gcc/config.gcc | 23 | ||||
| -rwxr-xr-x | gcc/configure | 15 | ||||
| -rw-r--r-- | gcc/configure.ac | 9 | ||||
| -rw-r--r-- | gcc/mkconfig.sh | 8 |
6 files changed, 34 insertions, 62 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ec7a912..f1e4860 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,4 +1,32 @@ 2011-11-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + Paolo Bonzini <bonzini@gnu.org> + + * configure.ac (libgcc_tm_file_list, libgcc_tm_include_list): + Remove. + * configure: Regenerate. + * Makefile.in (libgcc_tm_file_list, libgcc_tm_include_list): Remove. + (TM_H): Remove libgcc_tm.h, $(libgcc_tm_file_list). + (libgcc_tm.h, cs-libgcc_tm.h): Remove. + (clean): Remove libgcc_tm.h + * mkconfig.sh: Don't include libgcc_tm.h in tm.h. + * config.gcc (libgcc_tm_file): Remove. + (arm*-*-linux*): Remove libgcc_tm_file for arm*-*-linux-*eabi. + (arm*-*-uclinux*): Remove libgcc_tm_file for arm*-*-uclinux*eabi. + (arm*-*-eabi*, arm*-*-symbianelf*): Remove libgcc_tm_file. + (avr-*-rtems*): Likewise. + (avr-*-*): Likewise. + (frv-*-elf): Likewise. + (frv-*-*linux*): Likewise. + (h8300-*-rtems*): Likewise. + (h8300-*-elf*): Likewise. + (i[34567]86-*-darwin*): Likewise. + (x86_64-*-darwin*): Likewise. + (rx-*-elf*): Likewise. + (tic6x-*-elf): Likewise. + (tic6x-*-uclinux): Likewise. + (i[34567]86-*-linux*, x86_64-*-linux*): Likewise. + +2011-11-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * Makefile.in (LIBGCC2_DEBUG_CFLAGS LIBGCC2_CFLAGS) (LIBGCC2_INCLUDES, TARGET_LIBGCC2_CFLAGS, LIB2FUNCS_EXTRA) diff --git a/gcc/Makefile.in b/gcc/Makefile.in index ca818a8..cf1c8a7 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -490,8 +490,6 @@ md_file=$(srcdir)/config/@md_file@ tm_file_list=@tm_file_list@ tm_include_list=@tm_include_list@ tm_defines=@tm_defines@ -libgcc_tm_file_list=@libgcc_tm_file_list@ -libgcc_tm_include_list=@libgcc_tm_include_list@ tm_p_file_list=@tm_p_file_list@ tm_p_include_list=@tm_p_include_list@ build_xm_file_list=@build_xm_file_list@ @@ -790,8 +788,7 @@ CONFIG_H = config.h $(host_xm_file_list) TCONFIG_H = tconfig.h $(xm_file_list) TM_P_H = tm_p.h $(tm_p_file_list) GTM_H = tm.h $(tm_file_list) insn-constants.h -TM_H = $(GTM_H) libgcc_tm.h $(libgcc_tm_file_list) insn-flags.h \ - $(OPTIONS_H) +TM_H = $(GTM_H) insn-flags.h $(OPTIONS_H) # Variables for version information. BASEVER := $(srcdir)/BASE-VER # 4.x.y @@ -1599,7 +1596,6 @@ config.h: cs-config.h ; @true bconfig.h: cs-bconfig.h ; @true tconfig.h: cs-tconfig.h ; @true tm.h: cs-tm.h ; @true -libgcc_tm.h: cs-libgcc_tm.h ; @true tm_p.h: cs-tm_p.h ; @true cs-config.h: Makefile @@ -1622,11 +1618,6 @@ cs-tm.h: Makefile HEADERS="$(tm_include_list)" DEFINES="$(tm_defines)" \ $(SHELL) $(srcdir)/mkconfig.sh tm.h -cs-libgcc_tm.h: Makefile - TARGET_CPU_DEFAULT="" \ - HEADERS="$(libgcc_tm_include_list)" DEFINES="" \ - $(SHELL) $(srcdir)/mkconfig.sh libgcc_tm.h - cs-tm_p.h: Makefile TARGET_CPU_DEFAULT="" \ HEADERS="$(tm_p_include_list)" DEFINES="" \ @@ -4425,7 +4416,7 @@ clean: mostlyclean lang.clean -rm -f libgcc.a libgcc_eh.a libgcov.a -rm -f libgcc_s* -rm -f libunwind* - -rm -f config.h tconfig.h bconfig.h tm_p.h tm.h libgcc_tm.h + -rm -f config.h tconfig.h bconfig.h tm_p.h tm.h -rm -f options.c options.h optionlist -rm -f cs-* -rm -f doc/*.dvi diff --git a/gcc/config.gcc b/gcc/config.gcc index 8c4e4be..c1a77ff 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -84,12 +84,6 @@ # build-directory files by prefixing them with "./". # All other files should relative to $srcdir/config. # -# libgcc_tm_file A list of target macro files used only for code -# built for the target, not the host. These files -# are relative to $srcdir/../libgcc/config and -# must not have the same names as files in -# $srcdir/config. -# # tm_p_file Location of file with declarations for functions # in $out_file. # @@ -223,7 +217,6 @@ target_has_targetcm=no target_has_targetm_common=yes tm_defines= xm_defines= -libgcc_tm_file= # Set this to force installation and use of collect2. use_collect2= # Set this to override the default target model. @@ -831,7 +824,6 @@ arm*-*-linux*) # ARM GNU/Linux with ELF case ${target} in arm*-*-linux-*eabi) tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h" - libgcc_tm_file="$libgcc_tm_file arm/bpabi-lib.h" tmake_file="$tmake_file arm/t-arm-elf arm/t-linux-eabi" # Define multilib configuration for arm-linux-androideabi. case ${target} in @@ -859,7 +851,6 @@ arm*-*-uclinux*) # ARM ucLinux case ${target} in arm*-*-uclinux*eabi) tm_file="$tm_file arm/bpabi.h arm/uclinux-eabi.h" - libgcc_tm_file="$libgcc_tm_file arm/bpabi-lib.h" # The BPABI long long divmod functions return a 128-bit value in # registers r0-r3. Correctly modeling that requires the use of # TImode. @@ -880,7 +871,6 @@ arm*-*-eabi* | arm*-*-symbianelf* ) need_64bit_hwint=yes default_use_cxa_atexit=yes tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/bpabi.h" - libgcc_tm_file="$libgcc_tm_file arm/bpabi-lib.h" tmake_file="arm/t-arm arm/t-arm-elf" case ${target} in arm*-*-eabi*) @@ -889,7 +879,6 @@ arm*-*-eabi* | arm*-*-symbianelf* ) ;; arm*-*-symbianelf*) tm_file="${tm_file} arm/symbian.h" - libgcc_tm_file="$libgcc_tm_file arm/symbian-lib.h" # We do not include t-bpabi for Symbian OS because the system # provides its own implementation of the BPABI functions. tmake_file="${tmake_file} arm/t-symbian" @@ -913,14 +902,12 @@ arm*-wince-pe*) ;; avr-*-rtems*) tm_file="elfos.h avr/elf.h avr/avr.h dbxelf.h avr/rtems.h rtems.h newlib-stdint.h" - libgcc_tm_file="$libgcc_tm_file avr/avr-lib.h" tmake_file="avr/t-avr t-rtems avr/t-rtems" extra_gcc_objs="driver-avr.o avr-devices.o" extra_objs="avr-devices.o avr-log.o" ;; avr-*-*) tm_file="elfos.h avr/elf.h avr/avr.h dbxelf.h newlib-stdint.h" - libgcc_tm_file="$libgcc_tm_file avr/avr-lib.h" use_gcc_stdint=wrap extra_gcc_objs="driver-avr.o avr-devices.o" extra_objs="avr-devices.o avr-log.o" @@ -983,13 +970,11 @@ fr30-*-elf) ;; frv-*-elf) tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}" - libgcc_tm_file="${libgcc_tm_file} frv/frv-abi.h" tmake_file=frv/t-frv ;; frv-*-*linux*) tm_file="dbxelf.h elfos.h ${tm_file} \ gnu-user.h linux.h glibc-stdint.h frv/linux.h" - libgcc_tm_file="${libgcc_tm_file} frv/frv-abi.h" tmake_file="${tmake_file} frv/t-frv frv/t-linux" ;; moxie-*-elf) @@ -1011,12 +996,10 @@ moxie-*-rtems*) h8300-*-rtems*) tmake_file="h8300/t-h8300 t-rtems h8300/t-rtems" tm_file="h8300/h8300.h dbxelf.h elfos.h h8300/elf.h h8300/rtems.h rtems.h newlib-stdint.h" - libgcc_tm_file="$libgcc_tm_file h8300/h8300-lib.h" ;; h8300-*-elf*) tmake_file="h8300/t-h8300" tm_file="h8300/h8300.h dbxelf.h elfos.h newlib-stdint.h h8300/elf.h" - libgcc_tm_file="$libgcc_tm_file h8300/h8300-lib.h" ;; hppa*64*-*-linux*) target_cpu_default="MASK_PA_11|MASK_PA_20" @@ -1161,13 +1144,11 @@ i[34567]86-*-darwin*) # Baseline choice for a machine that allows m64 support. with_cpu=${with_cpu:-core2} tmake_file="${tmake_file} t-slibgcc" - libgcc_tm_file="$libgcc_tm_file i386/darwin-lib.h" ;; x86_64-*-darwin*) with_cpu=${with_cpu:-core2} tmake_file="${tmake_file} ${cpu_type}/t-darwin64 t-slibgcc" tm_file="${tm_file} ${cpu_type}/darwin64.h" - libgcc_tm_file="$libgcc_tm_file i386/darwin-lib.h" ;; i[34567]86-*-elf*) tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h newlib-stdint.h i386/i386elf.h" @@ -2119,7 +2100,6 @@ rs6000-ibm-aix[6789].* | powerpc-ibm-aix[6789].*) ;; rx-*-elf*) tm_file="dbxelf.h elfos.h newlib-stdint.h ${tm_file}" - libgcc_tm_file="${libgcc_tm_file} rx/rx-abi.h rx/rx-lib.h" tmake_file="${tmake_file} rx/t-rx" ;; s390-*-linux*) @@ -2448,7 +2428,6 @@ spu-*-elf*) tic6x-*-elf) tm_file="elfos.h ${tm_file} c6x/elf-common.h c6x/elf.h" tm_file="${tm_file} dbxelf.h tm-dwarf2.h newlib-stdint.h" - libgcc_tm_file="${libgcc_tm_file} c6x/c6x-abi.h" tmake_file="c6x/t-c6x c6x/t-c6x-elf" use_collect2=no ;; @@ -2456,7 +2435,6 @@ tic6x-*-uclinux) tm_file="elfos.h ${tm_file} gnu-user.h linux.h c6x/elf-common.h c6x/uclinux-elf.h" tm_file="${tm_file} dbxelf.h tm-dwarf2.h glibc-stdint.h" tm_file="${tm_file} ./sysroot-suffix.h" - libgcc_tm_file="${libgcc_tm_file} c6x/c6x-abi.h" tmake_file="t-sysroot-suffix t-slibgcc" tmake_file="${tmake_file} c6x/t-c6x c6x/t-c6x-elf c6x/t-c6x-uclinux" use_collect2=no @@ -2544,7 +2522,6 @@ esac case ${target} in i[34567]86-*-linux* | x86_64-*-linux*) tmake_file="${tmake_file} i386/t-pmm_malloc i386/t-i386" - libgcc_tm_file="${libgcc_tm_file} i386/value-unwind.h" ;; i[34567]86-*-* | x86_64-*-*) tmake_file="${tmake_file} i386/t-gmm_malloc i386/t-i386" diff --git a/gcc/configure b/gcc/configure index 68473c1..cb116d2 100755 --- a/gcc/configure +++ b/gcc/configure @@ -618,8 +618,6 @@ xm_include_list xm_file_list tm_p_include_list tm_p_file_list -libgcc_tm_include_list -libgcc_tm_file_list tm_defines tm_include_list tm_file_list @@ -11789,13 +11787,6 @@ for f in $tm_file; do esac done -libgcc_tm_file_list= -libgcc_tm_include_list= -for f in $libgcc_tm_file; do - libgcc_tm_file_list="${libgcc_tm_file_list} \$(srcdir)/../libgcc/config/$f" - libgcc_tm_include_list="${libgcc_tm_include_list} ../libgcc/config/$f" -done - tm_p_file_list= tm_p_include_list= for f in $tm_p_file; do @@ -18068,7 +18059,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18071 "configure" +#line 18062 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18174,7 +18165,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18177 "configure" +#line 18168 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -27017,8 +27008,6 @@ fi - - # Echo link setup. if test x${build} = x${host} ; then if test x${host} = x${target} ; then diff --git a/gcc/configure.ac b/gcc/configure.ac index 14bd614..6ef0b84 100644 --- a/gcc/configure.ac +++ b/gcc/configure.ac @@ -1715,13 +1715,6 @@ for f in $tm_file; do esac done -libgcc_tm_file_list= -libgcc_tm_include_list= -for f in $libgcc_tm_file; do - libgcc_tm_file_list="${libgcc_tm_file_list} \$(srcdir)/../libgcc/config/$f" - libgcc_tm_include_list="${libgcc_tm_include_list} ../libgcc/config/$f" -done - tm_p_file_list= tm_p_include_list= for f in $tm_p_file; do @@ -4972,8 +4965,6 @@ AC_SUBST(thread_file) AC_SUBST(tm_file_list) AC_SUBST(tm_include_list) AC_SUBST(tm_defines) -AC_SUBST(libgcc_tm_file_list) -AC_SUBST(libgcc_tm_include_list) AC_SUBST(tm_p_file_list) AC_SUBST(tm_p_include_list) AC_SUBST(xm_file_list) diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh index d96af1d..e93d45f 100644 --- a/gcc/mkconfig.sh +++ b/gcc/mkconfig.sh @@ -89,9 +89,8 @@ if [ -n "$HEADERS" ]; then fi # If this is tm.h, now include insn-flags.h only if IN_GCC is defined -# but neither GENERATOR_FILE nor USED_FOR_TARGET is defined. Also -# include libgcc_tm.h if USED_FOR_TARGET is defined. (Much of this is -# temporary.) +# but neither GENERATOR_FILE nor USED_FOR_TARGET is defined. (Much of this +# is temporary.) case $output in tm.h ) @@ -99,9 +98,6 @@ case $output in #if defined IN_GCC && !defined GENERATOR_FILE && !defined USED_FOR_TARGET # include "insn-flags.h" #endif -#ifdef USED_FOR_TARGET -# include "libgcc_tm.h" -#endif EOF ;; esac |