diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2001-03-09 20:53:56 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2001-03-09 20:53:56 +0000 |
| commit | 11642c3a7cf7c6954afa4a174632535a46cf7157 (patch) | |
| tree | 761de789b427cf9d459daddeacf06dc57b99319c /gcc | |
| parent | 2faf6b9622d88c822ab158c5f8c90e82ff7b49a6 (diff) | |
| download | gcc-11642c3a7cf7c6954afa4a174632535a46cf7157.zip gcc-11642c3a7cf7c6954afa4a174632535a46cf7157.tar.gz gcc-11642c3a7cf7c6954afa4a174632535a46cf7157.tar.bz2 | |
configure.in: Prune nonexistent files from build_xm_file, xm_file, and host_xm_file lists.
* configure.in: Prune nonexistent files from build_xm_file,
xm_file, and host_xm_file lists. Warn unless they're
$cpu/xm-$cpu.h.
Don't generate *config.h here.
AC_SUBST all variables needed to generate *config.h.
* configure: Regenerate.
* mkconfig.sh: New helper script, from code removed from
configure.in.
* Makefile.in: Zap all MALLOC variables - no longer used
anywhere, and malloc.c doesn't exist.
Substitute in variables needed to generate *config.h.
Stop lying about the dependencies contained in CONFIG_H and
GCONFIG_H.
(HCONFIG_H, TCONFIG_H, TM_P_H): New variables.
(config.h, hconfig.h, tconfig.h, tm_p.h, cs-config.h,
cs-hconfig.h, cs-tconfig.h, cs-tm_p.h): New rules.
(all .o): Add dependencies on $(HCONFIG_H), $(TCONFIG_H),
$(TM_P_H), etc. as appropriate.
* config.gcc: Zap references to deleted files.
* ggc-none.c: Don't include rtl.h or tm_p.h.
* config/i386/xm-beos.h, config/i386/xm-dgux.h,
config/i386/xm-djgpp.h, config/i386/xm-dos.h,
config/i386/xm-gnu.h, config/i386/xm-i386-interix.h,
config/i386/xm-linux.h, config/i386/xm-linux.h,
config/i386/xm-next.h, config/i386/xm-openbsd.h,
config/i386/xm-sun.h, config/i386/xm-sysv3.h:
Don't include i386/xm-i386.h.
* config/elxsi/xm-elxsi.h, config/i386/xm-bsd386.h,
config/i386/xm-i386.h, config/i860/xm-i860.h,
config/i960/xm-i960.h, config/mcore/xm-mcore.h,
config/mn10300/xm-mn10300.h, config/ns32k/xm-ns32k.h,
config/pj/xm-pj.h, config/sh/xm-sh.h, config/v850/xm-v850.h:
Delete (empty except comments, #includes of other deleted
files, and macros used nowhere).
cp:
* Make-lang.in: Add dependencies on $(TM_P_H) as appropriate.
From-SVN: r40350
Diffstat (limited to 'gcc')
29 files changed, 510 insertions, 543 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2bf4825..1528738 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,43 @@ +2001-03-09 Zack Weinberg <zackw@stanford.edu> + + * configure.in: Prune nonexistent files from build_xm_file, + xm_file, and host_xm_file lists. Warn unless they're + $cpu/xm-$cpu.h. + Don't generate *config.h here. + AC_SUBST all variables needed to generate *config.h. + * configure: Regenerate. + * mkconfig.sh: New helper script, from code removed from + configure.in. + * Makefile.in: Zap all MALLOC variables - no longer used + anywhere, and malloc.c doesn't exist. + Substitute in variables needed to generate *config.h. + Stop lying about the dependencies contained in CONFIG_H and + GCONFIG_H. + (HCONFIG_H, TCONFIG_H, TM_P_H): New variables. + (config.h, hconfig.h, tconfig.h, tm_p.h, cs-config.h, + cs-hconfig.h, cs-tconfig.h, cs-tm_p.h): New rules. + (all .o): Add dependencies on $(HCONFIG_H), $(TCONFIG_H), + $(TM_P_H), etc. as appropriate. + + * config.gcc: Zap references to deleted files. + * ggc-none.c: Don't include rtl.h or tm_p.h. + + * config/i386/xm-beos.h, config/i386/xm-dgux.h, + config/i386/xm-djgpp.h, config/i386/xm-dos.h, + config/i386/xm-gnu.h, config/i386/xm-i386-interix.h, + config/i386/xm-linux.h, config/i386/xm-linux.h, + config/i386/xm-next.h, config/i386/xm-openbsd.h, + config/i386/xm-sun.h, config/i386/xm-sysv3.h: + Don't include i386/xm-i386.h. + + * config/elxsi/xm-elxsi.h, config/i386/xm-bsd386.h, + config/i386/xm-i386.h, config/i860/xm-i860.h, + config/i960/xm-i960.h, config/mcore/xm-mcore.h, + config/mn10300/xm-mn10300.h, config/ns32k/xm-ns32k.h, + config/pj/xm-pj.h, config/sh/xm-sh.h, config/v850/xm-v850.h: + Delete (empty except comments, #includes of other deleted + files, and macros used nowhere). + Fri Mar 9 20:05:27 CET 2001 Jan Hubicka <jh@suse.cz> * i386.h (MAX_WCHAR_TYPE_SIZE): New constant to keep tradcpp @@ -6,17 +46,20 @@ Fri Mar 9 20:05:27 CET 2001 Jan Hubicka <jh@suse.cz> Fri Mar 9 19:52:52 CET 2001 Jan Hubicka <jh@suse.cz> * i386.h (FIRST_PSEUDO_REGISTER): Set to 53. - (FIXED_REGISTERS, CALL_USED_REGISTERS, REG_ALLOC_ONES): Add extended ones. - (CONDITIONAL_REGISTER_USAGE): Set proper values according to TARGET_64BIT. - (FIRST_REX_INT_REG, LAST_REX_INT_REG, FIRST_REX_SSE_REG, LAST_REX_SSE_REG): - define. + + (FIXED_REGISTERS, CALL_USED_REGISTERS, REG_ALLOC_ONES): Add + extended ones. + (CONDITIONAL_REGISTER_USAGE): Set proper values according to + TARGET_64BIT. + (FIRST_REX_INT_REG, LAST_REX_INT_REG, FIRST_REX_SSE_REG, + LAST_REX_SSE_REG): define. (enum reg_class): Add 'LEGACY_REGS' (REG_CLASS_CONTENTS): Likewise; add extended registers. (SSE_REGNO_P): Recognize extended registers. (ANY_QI_REG_P, REX_INT_REGNO_P, REX_INT_REG_P): New. (REG_CLASS_FROM_LETTER): Add 'R' and 'Q'. - (REGNO_OK_FOR_INDEX_P, REGNO_OK_FOR_BASE_P, REG_OK_FOR_BASE_NONSTRICT_P): - Recognize REX registers. + (REGNO_OK_FOR_INDEX_P, REGNO_OK_FOR_BASE_P, + REG_OK_FOR_BASE_NONSTRICT_P): Recognize REX registers. (REG_OK_FOR_STRREG_NONSTRICT_P, REG_OK_FOR_STRREG_STRICT_P, REG_OK_FOR_STRREG_P): Remove. (HI_REGISTER_NAMES): Add extended registers. @@ -79,7 +122,7 @@ Thu Mar 8 23:29:37 2001 John Wehle (john@feith.com) 2001-03-08 Bruce Korb <bkorb@gnu.org> gcc.c(main): ensure SIGCHLD handling is set to SIG_DFL so that - wiat4() can receive the signal. + wait4() can receive the signal. Thu Mar 8 21:09:10 2001 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> @@ -185,7 +228,7 @@ Thu Mar 8 06:32:50 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> * combine.c (combine_simplify_rtx): Likewise. (simplify_if_then_else): Likewise. * cse.c (fold_rtx): Likewise. - * flags.h: Remove flag_fast_math. Add + * flags.h: Remove flag_fast_math. Add flag_unsafe_math_optimizations and flag_trapping_math. * fold-const.c (negate_expr): Check flag_unsafe_math_optimizations, not flag_fast_math. @@ -227,11 +270,11 @@ Thu Mar 8 06:32:50 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> 2001-03-07 Laurynas Biveinis <lauras@softhome.net> - * Makefile.in: Set RANLIB to @RANLIB@. - Remove RANLIB_TEST. + * Makefile.in: Set RANLIB to @RANLIB@. + Remove RANLIB_TEST. 2001-03-07 Laurynas Biveinis <lauras@softhome.net> - + * fixinc/inclhack.def (djgpp_wchar_h): New test. * fixinc/fixincl.x: Regenerated. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 53780db..c5f2d7f 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -262,12 +262,19 @@ tmake_file=@dep_tmake_file@ out_file=$(srcdir)/config/@out_file@ out_object_file=@out_object_file@ md_file=$(srcdir)/config/@md_file@ -tm_file=@tm_file_list@ -build_xm_file=@build_xm_file_list@ -host_xm_file=@host_xm_file_list@ +tm_p_file_list=@tm_p_file_list@ +tm_p_file=@tm_p_file@ +build_xm_file_list=@build_xm_file_list@ +build_xm_file=@build_xm_file@ +build_xm_defines=@build_xm_defines@ +host_xm_file_list=@host_xm_file_list@ +host_xm_file=@host_xm_file@ +host_xm_defines=@host_xm_defines@ +xm_file=@xm_file@ lang_specs_files=@lang_specs_files@ lang_options_files=@lang_options_files@ lang_tree_files=@lang_tree_files@ +target_cpu_default=@target_cpu_default@ GCC_THREAD_FILE=@thread_file@ OBJC_BOEHM_GC=@objc_boehm_gc@ GTHREAD_FLAGS=@gthread_flags@ @@ -499,7 +506,6 @@ HOST_CFLAGS=$(ALL_CFLAGS) -DGENERATOR_FILE HOST_CLIB=$(CLIB) HOST_LDFLAGS=$(LDFLAGS) HOST_CPPFLAGS=$(ALL_CPPFLAGS) -HOST_MALLOC=$(MALLOC) HOST_OBSTACK=$(OBSTACK) HOST_VFPRINTF=$(VFPRINTF) HOST_DOPRINT=$(DOPRINT) @@ -593,31 +599,30 @@ ALL_CFLAGS = $(INTERNAL_CFLAGS) $(X_CFLAGS) $(T_CFLAGS) \ # Likewise. ALL_CPPFLAGS = $(CPPFLAGS) $(X_CPPFLAGS) $(T_CPPFLAGS) -USE_HOST_MALLOC= ` case "${HOST_MALLOC}" in ?*) echo ${HOST_PREFIX}${HOST_MALLOC} ;; esac ` USE_HOST_OBSTACK= ` case "${HOST_OBSTACK}" in ?*) echo ${HOST_PREFIX}${HOST_OBSTACK} ;; esac ` USE_HOST_VFPRINTF= ` case "${HOST_VFPRINTF}" in ?*) echo ${HOST_PREFIX}${HOST_VFPRINTF} ;; esac ` USE_HOST_DOPRINT= ` case "${HOST_DOPRINT}" in ?*) echo ${HOST_PREFIX}${HOST_DOPRINT} ;; esac ` USE_HOST_STRSTR= ` case "${HOST_STRSTR}" in ?*) echo ${HOST_PREFIX}${HOST_STRSTR} ;; esac ` -# Dependency on obstack, malloc or whatever library facilities +# Dependency on obstack or whatever library facilities # are not installed in the system libraries. # We don't use USE_* because backquote expansion doesn't work in deps. -LIBDEPS= $(INTLLIBS) $(OBSTACK) $(MALLOC) $(VFPRINTF) $(DOPRINT) $(STRSTR) +LIBDEPS= $(INTLLIBS) $(OBSTACK) $(VFPRINTF) $(DOPRINT) $(STRSTR) # Likewise, for use in the tools that must run on this machine # even if we are cross-building GCC. -HOST_LIBDEPS= $(HOST_PREFIX)$(HOST_OBSTACK) $(HOST_PREFIX)$(HOST_MALLOC) \ +HOST_LIBDEPS= $(HOST_PREFIX)$(HOST_OBSTACK) \ $(HOST_PREFIX)$(HOST_VFPRINTF) $(HOST_PREFIX)$(HOST_DOPRINT) \ $(HOST_PREFIX)$(HOST_STRSTR) # How to link with both our special library facilities # and the system's installed libraries. -LIBS = $(OBSTACK) $(MALLOC) $(INTLLIBS) @LIBS@ $(VFPRINTF) $(DOPRINT) \ +LIBS = $(OBSTACK) $(INTLLIBS) @LIBS@ $(VFPRINTF) $(DOPRINT) \ $(STRSTR) $(CLIB) ../libiberty/libiberty.a # Likewise, for use in the tools that must run on this machine # even if we are cross-building GCC. -HOST_LIBS = $(USE_HOST_OBSTACK) $(USE_HOST_MALLOC) $(USE_HOST_VFPRINTF) \ +HOST_LIBS = $(USE_HOST_OBSTACK) $(USE_HOST_VFPRINTF) \ $(USE_HOST_DOPRINT) $(USE_HOST_STRSTR) $(HOST_CLIB) HOST_RTL = $(HOST_PREFIX)rtl.o $(HOST_PREFIX)bitmap.o \ @@ -803,15 +808,12 @@ DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \ # GCONFIG_H lists the config files that the generator files depend on, while # CONFIG_H lists the the ones ordinary gcc files depend on, which includes # a file generated by gencodes. -# The files that "belong" in GCONFIG_H are deliberately omitted -# because having them there would not be useful in actual practice. -# All they would do is cause complete recompilation every time -# one of the machine description files is edited. -# That may or may not be what one wants to do. -# If it is, rm *.o is an easy way to do it. -# GCONFIG_H = $(host_xm_file) $(tm_file) -GCONFIG_H = +GCONFIG_H = config.h $(host_xm_file_list) +HCONFIG_H = hconfig.h $(build_xm_file_list) CONFIG_H = $(GCONFIG_H) insn-codes.h +TCONFIG_H = tconfig.h $(xm_file_list) insn-codes.h +TM_P_H = tm_p.h $(tm_p_file_list) insn-codes.h + MACHMODE_H = machmode.h machmode.def RTL_BASE_H = rtl.h rtl.def $(MACHMODE_H) RTL_H = $(RTL_BASE_H) genrtl.h @@ -868,6 +870,29 @@ Makefile: $(srcdir)/Makefile.in config.status $(srcdir)/version.c \ LANGUAGES="$(CONFIG_LANGUAGES)" $(SHELL) config.run rm -f config.run +config.h: cs-config.h ; @true +hconfig.h: cs-hconfig.h ; @true +tconfig.h: cs-tconfig.h ; @true +tm_p.h: cs-tm_p.h ; @true + +cs-config.h: Makefile + HEADERS="$(host_xm_file)" DEFINES="$(host_xm_defines)" \ + TARGET_CPU_DEFAULT="$(target_cpu_default)" \ + $(SHELL) $(srcdir)/mkconfig.sh config.h + +cs-hconfig.h: Makefile + HEADERS="$(build_xm_file)" DEFINES="$(build_xm_defines)" \ + TARGET_CPU_DEFAULT="$(target_cpu_default)" \ + $(SHELL) $(srcdir)/mkconfig.sh hconfig.h + +cs-tconfig.h: Makefile + HEADERS="$(xm_file)" DEFINES="" TARGET_CPU_DEFAULT="" \ + $(SHELL) $(srcdir)/mkconfig.sh tconfig.h + +cs-tm_p.h: Makefile + HEADERS="$(tm_p_file)" DEFINES="" TARGET_CPU_DEFAULT="" \ + $(SHELL) $(srcdir)/mkconfig.sh tm_p.h + $(srcdir)/configure: $(srcdir)/configure.in (cd $(srcdir) && autoconf) @@ -1026,7 +1051,7 @@ libgcc.mk: config.status Makefile mklibgcc $(LIB2ADD) xgcc$(exeext) # All the things that might cause us to want to recompile bits of libgcc. LIBGCC_DEPS = $(GCC_PASSES) $(LANGUAGES) stmp-int-hdrs $(STMP_FIXPROTO) \ - libgcc.mk $(srcdir)/libgcc1.c $(srcdir)/libgcc2.c $(CONFIG_H) \ + libgcc.mk $(srcdir)/libgcc1.c $(srcdir)/libgcc2.c $(TCONFIG_H) \ $(MACHMODE_H) longlong.h frame.h gbl-ctors.h config.status \ stmp-int-hdrs tsystem.h $(FPBIT) $(DPBIT) $(LIB2ADD) $(EXTRA_PARTS) @@ -1043,7 +1068,7 @@ libgcc.a: $(LIBGCC_DEPS) NM_FOR_TARGET="$(NM_FOR_TARGET)" AWK="$(AWK)" \ LIBGCC2_CFLAGS="$(LIBGCC2_CFLAGS)" \ INCLUDES="$(INCLUDES)" MAYBE_USE_COLLECT2="$(MAYBE_USE_COLLECT2)" \ - CONFIG_H="$(CONFIG_H)" MACHMODE_H="$(MACHMODE_H)" \ + CONFIG_H="$(TCONFIG_H)" MACHMODE_H="$(MACHMODE_H)" \ LIB1ASMSRC='$(LIB1ASMSRC)' \ MAKEOVERRIDES= \ -f libgcc.mk all @@ -1087,14 +1112,14 @@ stmp-multilib: $(LIBGCC_DEPS) # Compile two additional files that are linked with every program # linked using GCC on systems using COFF or ELF, for the sake of C++ # constructors. -$(T)crtbegin.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) \ +$(T)crtbegin.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \ frame.h gbl-ctors.h stmp-int-hdrs tsystem.h $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \ -finhibit-size-directive -fno-inline-functions \ -fno-exceptions $(CRTSTUFF_T_CFLAGS) @inhibit_libc@ \ -c $(srcdir)/crtstuff.c -DCRT_BEGIN -o $(T)crtbegin$(objext) -$(T)crtend.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) \ +$(T)crtend.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \ frame.h gbl-ctors.h stmp-int-hdrs tsystem.h $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \ -finhibit-size-directive -fno-inline-functions \ @@ -1102,7 +1127,7 @@ $(T)crtend.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) \ -c $(srcdir)/crtstuff.c -DCRT_END -o $(T)crtend$(objext) # These are versions of crtbegin and crtend for shared libraries. -$(T)crtbeginS.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) \ +$(T)crtbeginS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \ frame.h gbl-ctors.h stmp-int-hdrs tsystem.h $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \ -finhibit-size-directive -fno-inline-functions \ @@ -1110,7 +1135,7 @@ $(T)crtbeginS.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) \ -c $(srcdir)/crtstuff.c -DCRT_BEGIN -DCRTSTUFFS_O \ -o $(T)crtbeginS$(objext) -$(T)crtendS.o: crtstuff.c $(GCC_PASSES) $(CONFIG_H) \ +$(T)crtendS.o: crtstuff.c $(GCC_PASSES) $(TCONFIG_H) auto-host.h \ frame.h gbl-ctors.h stmp-int-hdrs tsystem.h $(GCC_FOR_TARGET) $(GCC_CFLAGS) $(INCLUDES) $(MULTILIB_CFLAGS) -g0 \ -finhibit-size-directive -fno-inline-functions \ @@ -1138,7 +1163,7 @@ s-crt0: $(CRT0_S) $(MCRT0_S) $(GCC_PASSES) $(CONFIG_H) # C language specific files. c-errors.o: c-errors.c $(CONFIG_H) system.h $(TREE_H) $(C_TREE_H) flags.h \ - diagnostic.h + diagnostic.h $(TM_P_H) c-parse.o : $(srcdir)/c-parse.c $(CONFIG_H) $(TREE_H) c-lex.h $(GGC_H) intl.h \ $(C_TREE_H) input.h flags.h system.h toplev.h output.h cpplib.h $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c $(srcdir)/c-parse.c @@ -1155,20 +1180,20 @@ $(srcdir)/c-parse.y: c-parse.in c-decl.o : c-decl.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) $(C_TREE_H) \ $(GGC_H) c-lex.h flags.h function.h output.h $(EXPR_H) \ - toplev.h intl.h + toplev.h intl.h $(TM_P_H) c-typeck.o : c-typeck.c $(CONFIG_H) system.h $(TREE_H) $(C_TREE_H) \ - flags.h intl.h output.h $(EXPR_H) $(RTL_H) toplev.h + flags.h intl.h output.h $(EXPR_H) $(RTL_H) toplev.h $(TM_P_H) c-lang.o : c-lang.c $(CONFIG_H) system.h $(TREE_H) $(C_TREE_H) \ $(GGC_H) c-lex.h toplev.h diagnostic.h output.h function.h \ $(RTL_H) $(EXPR_H) c-lex.o : c-lex.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) c-lex.h $(C_TREE_H) \ c-pragma.h input.h intl.h flags.h toplev.h output.h \ - mbchar.h cpplib.h $(EXPR_H) + mbchar.h cpplib.h $(EXPR_H) $(TM_P_H) c-aux-info.o : c-aux-info.c $(CONFIG_H) system.h $(TREE_H) $(C_TREE_H) \ flags.h toplev.h c-convert.o : c-convert.c $(CONFIG_H) system.h $(TREE_H) flags.h toplev.h c-pragma.o: c-pragma.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) function.h \ - c-pragma.h toplev.h $(GGC_H) + c-pragma.h toplev.h $(GGC_H) $(TM_P_H) mbchar.o: mbchar.c $(CONFIG_H) system.h mbchar.h graph.o: graph.c $(CONFIG_H) system.h toplev.h flags.h output.h $(RTL_H) \ function.h hard-reg-set.h $(BASIC_BLOCK_H) graph.h @@ -1233,7 +1258,7 @@ s-under: $(GCC_PASSES) c-common.o : c-common.c $(CONFIG_H) system.h $(TREE_H) $(OBSTACK_H) \ $(C_COMMON_H) flags.h toplev.h output.h c-pragma.h $(RTL_H) $(GGC_H) \ - $(EXPR_H) + $(EXPR_H) $(TM_P_H) c-format.o : c-format.c $(CONFIG_H) system.h $(TREE_H) \ $(C_COMMON_H) flags.h toplev.h intl.h diagnostic.h @@ -1279,7 +1304,7 @@ gencheck$(build_exeext) : gencheck.o $(HOST_LIBDEPS) $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ gencheck.o $(HOST_LIBS) -gencheck.o : gencheck.c gencheck.h tree.def $(CONFIG_H) hconfig.h system.h \ +gencheck.o : gencheck.c gencheck.h tree.def $(HCONFIG_H) system.h \ $(lang_tree_files) $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) \ $(srcdir)/gencheck.c @@ -1289,18 +1314,18 @@ dumpvers: dumpvers.c version.o: version.c version.h ggc-common.o: ggc-common.c $(CONFIG_H) $(RTL_H) $(TREE_H) \ - flags.h $(GGC_H) varray.h hash.h + flags.h $(GGC_H) varray.h hash.h $(TM_P_H) ggc-simple.o: ggc-simple.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h \ - $(GGC_H) varray.h $(TIMEVAR_H) + $(GGC_H) varray.h $(TIMEVAR_H) $(TM_P_H) ggc-page.o: ggc-page.c $(CONFIG_H) $(RTL_H) $(TREE_H) flags.h toplev.h \ - $(GGC_H) varray.h $(TIMEVAR_H) + $(GGC_H) varray.h $(TIMEVAR_H) $(TM_P_H) stringpool.o: stringpool.c $(CONFIG_H) system.h $(TREE_H) $(OBSTACK_H) \ flags.h toplev.h -ggc-none.o: ggc-none.c $(GCONFIG_H) $(RTL_H) $(GGC_H) +ggc-none.o: ggc-none.c $(GCONFIG_H) $(GGC_H) $(CC) -c $(ALL_CFLAGS) -DGENERATOR_FILE $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) obstack.o: $(srcdir)/../libiberty/obstack.c $(GCONFIG_H) @@ -1317,21 +1342,21 @@ prefix.o: prefix.c $(CONFIG_H) system.h Makefile prefix.h convert.o: convert.c $(CONFIG_H) system.h $(TREE_H) flags.h convert.h toplev.h tree.o : tree.c $(CONFIG_H) system.h $(TREE_H) flags.h function.h toplev.h \ - $(GGC_H) $(HASHTAB_H) output.h + $(GGC_H) $(HASHTAB_H) output.h $(TM_P_H) print-tree.o : print-tree.c $(CONFIG_H) system.h $(TREE_H) $(GGC_H) stor-layout.o : stor-layout.c $(CONFIG_H) system.h $(TREE_H) flags.h \ - function.h $(EXPR_H) $(RTL_H) toplev.h $(GGC_H) + function.h $(EXPR_H) $(RTL_H) toplev.h $(GGC_H) $(TM_P_H) fold-const.o : fold-const.c $(CONFIG_H) system.h $(TREE_H) flags.h toplev.h \ - $(EXPR_H) $(RTL_H) $(GGC_H) + $(EXPR_H) $(RTL_H) $(GGC_H) $(TM_P_H) diagnostic.o : diagnostic.c diagnostic.h \ - $(CONFIG_H) system.h $(TREE_H) $(RTL_H) tm_p.h flags.h \ + $(CONFIG_H) system.h $(TREE_H) $(RTL_H) $(TM_P_H) flags.h \ $(GGC_H) input.h $(INSN_ATTR_H) insn-codes.h insn-config.h toplev.h intl.h toplev.o : toplev.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) function.h \ flags.h input.h $(INSN_ATTR_H) xcoffout.h output.h diagnostic.h \ insn-codes.h insn-config.h intl.h $(RECOG_H) Makefile toplev.h dwarfout.h \ dwarf2out.h sdbout.h dbxout.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) \ graph.h $(LOOP_H) except.h $(REGS_H) $(TIMEVAR_H) $(lang_options_files) \ - ssa.h params.h + ssa.h params.h $(TM_P_H) $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $(MAYBE_USE_COLLECT2) \ -DTARGET_NAME=\"$(target_alias)\" \ -c $(srcdir)/toplev.c @@ -1349,82 +1374,85 @@ errors.o : errors.c $(GCONFIG_H) system.h errors.h varasm.o : varasm.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h \ function.h $(EXPR_H) hard-reg-set.h $(REGS_H) \ - xcoffout.h output.h c-pragma.h toplev.h dbxout.h sdbout.h $(GGC_H) + xcoffout.h output.h c-pragma.h toplev.h dbxout.h sdbout.h $(GGC_H) $(TM_P_H) function.o : function.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ function.h insn-flags.h insn-codes.h $(EXPR_H) $(REGS_H) hard-reg-set.h \ - insn-config.h $(RECOG_H) output.h toplev.h except.h hash.h $(GGC_H) + insn-config.h $(RECOG_H) output.h toplev.h except.h hash.h $(GGC_H) $(TM_P_H) stmt.o : stmt.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h function.h \ insn-flags.h insn-config.h insn-codes.h hard-reg-set.h $(EXPR_H) except.h \ - $(LOOP_H) $(RECOG_H) toplev.h output.h varray.h $(GGC_H) + $(LOOP_H) $(RECOG_H) toplev.h output.h varray.h $(GGC_H) $(TM_P_H) except.o : except.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ function.h insn-flags.h $(EXPR_H) $(REGS_H) hard-reg-set.h \ - insn-config.h $(RECOG_H) output.h except.h toplev.h intl.h $(GGC_H) + insn-config.h $(RECOG_H) output.h except.h toplev.h intl.h $(GGC_H) $(TM_P_H) expr.o : expr.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h function.h \ $(REGS_H) insn-flags.h insn-codes.h $(EXPR_H) insn-config.h $(RECOG_H) \ output.h typeclass.h hard-reg-set.h toplev.h hard-reg-set.h except.h \ - reload.h $(GGC_H) intl.h + reload.h $(GGC_H) intl.h $(TM_P_H) builtins.o : builtins.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ function.h $(REGS_H) insn-flags.h insn-codes.h $(EXPR_H) insn-config.h \ $(RECOG_H) output.h typeclass.h hard-reg-set.h toplev.h hard-reg-set.h \ - except.h + except.h $(TM_P_H) calls.o : calls.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h $(EXPR_H) \ - insn-flags.h $(REGS_H) toplev.h output.h function.h $(TIMEVAR_H) + insn-flags.h $(REGS_H) toplev.h output.h function.h $(TIMEVAR_H) $(TM_P_H) expmed.o : expmed.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ - insn-flags.h insn-config.h insn-codes.h $(EXPR_H) $(RECOG_H) real.h toplev.h + insn-flags.h insn-config.h insn-codes.h $(EXPR_H) $(RECOG_H) real.h \ + toplev.h $(TM_P_H) explow.o : explow.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ hard-reg-set.h insn-config.h $(EXPR_H) $(RECOG_H) insn-flags.h \ - insn-codes.h toplev.h function.h + insn-codes.h toplev.h function.h $(TM_P_H) optabs.o : optabs.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ insn-flags.h insn-config.h insn-codes.h $(EXPR_H) $(RECOG_H) reload.h \ - toplev.h $(GGC_H) real.h + toplev.h $(GGC_H) real.h $(TM_P_H) dbxout.o : dbxout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h $(REGS_H) \ - insn-config.h reload.h gstab.h xcoffout.h output.h dbxout.h toplev.h + insn-config.h reload.h gstab.h xcoffout.h output.h dbxout.h toplev.h \ + $(TM_P_H) sdbout.o : sdbout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) flags.h except.h \ function.h $(EXPR_H) output.h hard-reg-set.h $(REGS_H) real.h \ insn-config.h $(OBSTACK_H) xcoffout.h c-pragma.h \ - sdbout.h toplev.h + sdbout.h toplev.h $(TM_P_H) dwarfout.o : dwarfout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) dwarf.h \ - flags.h insn-config.h reload.h output.h toplev.h dwarfout.h + flags.h insn-config.h reload.h output.h toplev.h dwarfout.h $(TM_P_H) dwarf2out.o : dwarf2out.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) dwarf2.h \ flags.h insn-config.h reload.h output.h \ hard-reg-set.h $(REGS_H) $(EXPR_H) toplev.h dwarf2out.h varray.h \ - $(GGC_H) except.h dwarf2asm.h + $(GGC_H) except.h dwarf2asm.h $(TM_P_H) dwarf2asm.o : dwarf2asm.c $(CONFIG_H) system.h flags.h $(RTL_H) output.h \ - dwarf2asm.h + dwarf2asm.h $(TM_P_H) xcoffout.o : xcoffout.c $(CONFIG_H) system.h $(TREE_H) $(RTL_H) xcoffout.h \ flags.h toplev.h output.h dbxout.h $(GGC_H) emit-rtl.o : emit-rtl.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ function.h $(REGS_H) insn-config.h $(RECOG_H) real.h $(GGC_H) \ $(EXPR_H) $(srcdir)/../include/obstack.h hard-reg-set.h bitmap.h toplev.h \ - $(HASHTAB_H) -real.o : real.c $(CONFIG_H) system.h $(TREE_H) toplev.h + $(HASHTAB_H) $(TM_P_H) +real.o : real.c $(CONFIG_H) system.h $(TREE_H) toplev.h $(TM_P_H) integrate.o : integrate.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ $(INTEGRATE_H) insn-flags.h insn-config.h $(EXPR_H) real.h $(REGS_H) \ intl.h function.h output.h $(RECOG_H) except.h toplev.h $(LOOP_H) \ - params.h + params.h $(TM_P_H) jump.o : jump.c $(CONFIG_H) system.h $(RTL_H) flags.h hard-reg-set.h $(REGS_H) \ insn-config.h insn-flags.h $(RECOG_H) $(EXPR_H) real.h except.h function.h \ - toplev.h $(INSN_ATTR_H) + toplev.h $(INSN_ATTR_H) $(TM_P_H) simplify-rtx.o : simplify-rtx.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) \ hard-reg-set.h flags.h real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h \ - output.h function.h $(GGC_H) $(OBSTACK_H) + output.h function.h $(GGC_H) $(OBSTACK_H) $(TM_P_H) cselib.o : cselib.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) \ hard-reg-set.h flags.h real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h \ - output.h function.h cselib.h $(GGC_H) $(OBSTACK_H) + output.h function.h cselib.h $(GGC_H) $(OBSTACK_H) $(TM_P_H) cse.o : cse.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) hard-reg-set.h flags.h \ real.h insn-config.h $(RECOG_H) $(EXPR_H) toplev.h output.h function.h \ - $(BASIC_BLOCK_H) $(GGC_H) + $(BASIC_BLOCK_H) $(GGC_H) $(TM_P_H) gcse.o : gcse.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) hard-reg-set.h \ flags.h real.h insn-config.h ggc.h $(RECOG_H) $(EXPR_H) $(BASIC_BLOCK_H) \ - function.h output.h toplev.h + function.h output.h toplev.h $(TM_P_H) sibcall.o : sibcall.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) function.h \ hard-reg-set.h flags.h insn-config.h $(RECOG_H) $(BASIC_BLOCK_H) resource.o : resource.c $(CONFIG_H) $(RTL_H) hard-reg-set.h system.h \ $(BASIC_BLOCK_H) $(REGS_H) flags.h output.h resource.h function.h toplev.h \ - $(INSN_ATTR_H) except.h params.h + $(INSN_ATTR_H) except.h params.h $(TM_P_H) lcm.o : lcm.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) hard-reg-set.h flags.h \ - real.h insn-config.h $(INSN_ATTR_H) $(RECOG_H) $(EXPR_H) $(BASIC_BLOCK_H) + real.h insn-config.h $(INSN_ATTR_H) $(RECOG_H) $(EXPR_H) $(BASIC_BLOCK_H) \ + $(TM_P_H) ssa.o : ssa.c $(CONFIG_H) system.h $(REGS_H) varray.h \ hard-reg-set.h flags.h function.h real.h insn-config.h $(RECOG_H) \ $(BASIC_BLOCK_H) output.h ssa.h @@ -1437,89 +1465,90 @@ profile.o : profile.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ gcov-io.h toplev.h $(GGC_H) hard-reg-set.h $(BASIC_BLOCK_H) loop.o : loop.c $(CONFIG_H) system.h $(RTL_H) flags.h $(LOOP_H) insn-config.h \ insn-flags.h $(REGS_H) hard-reg-set.h $(RECOG_H) $(EXPR_H) real.h \ - $(BASIC_BLOCK_H) function.h toplev.h varray.h except.h cselib.h + $(BASIC_BLOCK_H) function.h toplev.h varray.h except.h cselib.h $(TM_P_H) doloop.o : doloop.c $(CONFIG_H) system.h $(RTL_H) flags.h $(LOOP_H) \ - insn-flags.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) + insn-flags.h $(EXPR_H) hard-reg-set.h $(BASIC_BLOCK_H) $(TM_P_H) unroll.o : unroll.c $(CONFIG_H) system.h $(RTL_H) insn-config.h function.h \ $(INTEGRATE_H) $(REGS_H) $(RECOG_H) flags.h $(EXPR_H) $(LOOP_H) toplev.h \ - hard-reg-set.h varray.h $(BASIC_BLOCK_H) + hard-reg-set.h varray.h $(BASIC_BLOCK_H) $(TM_P_H) flow.o : flow.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h insn-config.h \ $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h $(RECOG_H) \ - insn-flags.h function.h except.h $(EXPR_H) ssa.h $(GGC_H) + insn-flags.h function.h except.h $(EXPR_H) ssa.h $(GGC_H) $(TM_P_H) dominance.o : dominance.c $(CONFIG_H) system.h $(RTL_H) hard-reg-set.h \ $(BASIC_BLOCK_H) combine.o : combine.c $(CONFIG_H) system.h $(RTL_H) flags.h function.h \ insn-config.h insn-flags.h insn-codes.h $(INSN_ATTR_H) $(REGS_H) $(EXPR_H) \ - $(BASIC_BLOCK_H) $(RECOG_H) real.h hard-reg-set.h toplev.h + $(BASIC_BLOCK_H) $(RECOG_H) real.h hard-reg-set.h toplev.h $(TM_P_H) regclass.o : regclass.c $(CONFIG_H) system.h $(RTL_H) hard-reg-set.h flags.h \ $(BASIC_BLOCK_H) $(REGS_H) insn-config.h $(RECOG_H) reload.h real.h \ - toplev.h function.h output.h $(GGC_H) + toplev.h function.h output.h $(GGC_H) $(TM_P_H) local-alloc.o : local-alloc.c $(CONFIG_H) system.h $(RTL_H) flags.h \ $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h insn-config.h $(RECOG_H) \ - output.h function.h $(INSN_ATTR_H) toplev.h + output.h function.h $(INSN_ATTR_H) toplev.h $(TM_P_H) bitmap.o : bitmap.c $(GCONFIG_H) system.h $(RTL_H) flags.h $(BASIC_BLOCK_H) \ $(REGS_H) $(CC) -c $(ALL_CFLAGS) -DGENERATOR_FILE $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) global.o : global.c $(CONFIG_H) system.h $(RTL_H) flags.h reload.h function.h \ - $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h insn-config.h output.h toplev.h + $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h insn-config.h output.h toplev.h \ + $(TM_P_H) varray.o : varray.c $(CONFIG_H) system.h varray.h $(RTL_H) $(TREE_H) bitmap.h reload.o : reload.c $(CONFIG_H) system.h $(RTL_H) flags.h output.h $(EXPR_H) \ reload.h $(RECOG_H) hard-reg-set.h insn-config.h insn-codes.h $(REGS_H) \ - function.h real.h toplev.h + function.h real.h toplev.h $(TM_P_H) reload1.o : reload1.c $(CONFIG_H) system.h $(RTL_H) real.h flags.h $(EXPR_H) \ reload.h $(REGS_H) hard-reg-set.h insn-config.h insn-flags.h insn-codes.h \ - $(BASIC_BLOCK_H) $(RECOG_H) output.h function.h toplev.h cselib.h + $(BASIC_BLOCK_H) $(RECOG_H) output.h function.h toplev.h cselib.h $(TM_P_H) caller-save.o : caller-save.c $(CONFIG_H) system.h $(RTL_H) flags.h \ $(REGS_H) hard-reg-set.h insn-config.h $(BASIC_BLOCK_H) function.h \ - $(RECOG_H) reload.h $(EXPR_H) toplev.h + $(RECOG_H) reload.h $(EXPR_H) toplev.h $(TM_P_H) reorg.o : reorg.c $(CONFIG_H) system.h $(RTL_H) conditions.h hard-reg-set.h \ $(BASIC_BLOCK_H) $(REGS_H) insn-config.h $(INSN_ATTR_H) insn-flags.h \ - $(RECOG_H) function.h flags.h output.h $(EXPR_H) toplev.h params.h + $(RECOG_H) function.h flags.h output.h $(EXPR_H) toplev.h params.h $(TM_P_H) alias.o : alias.c $(CONFIG_H) system.h $(RTL_H) flags.h hard-reg-set.h \ $(BASIC_BLOCK_H) $(REGS_H) toplev.h output.h $(EXPR_H) insn-flags.h \ - $(GGC_H) function.h cselib.h $(TREE_H) + $(GGC_H) function.h cselib.h $(TREE_H) $(TM_P_H) regmove.o : regmove.c $(CONFIG_H) system.h $(RTL_H) insn-config.h \ $(RECOG_H) output.h $(REGS_H) hard-reg-set.h flags.h function.h \ - $(EXPR_H) insn-flags.h $(BASIC_BLOCK_H) toplev.h + $(EXPR_H) insn-flags.h $(BASIC_BLOCK_H) toplev.h $(TM_P_H) haifa-sched.o : haifa-sched.c $(CONFIG_H) system.h $(RTL_H) sched-int.h \ $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \ - $(INSN_ATTR_H) insn-flags.h toplev.h $(RECOG_H) except.h + $(INSN_ATTR_H) insn-flags.h toplev.h $(RECOG_H) except.h $(TM_P_H) sched-deps.o : sched-deps.c $(CONFIG_H) system.h $(RTL_H) sched-int.h \ $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \ - $(INSN_ATTR_H) toplev.h $(RECOG_H) except.h + $(INSN_ATTR_H) toplev.h $(RECOG_H) except.h $(TM_P_H) sched-rgn.o : sched-rgn.c $(CONFIG_H) system.h $(RTL_H) sched-int.h \ $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \ - $(INSN_ATTR_H) toplev.h $(RECOG_H) except.h + $(INSN_ATTR_H) toplev.h $(RECOG_H) except.h $(TM_P_H) sched-ebb.o : sched-ebb.c $(CONFIG_H) system.h $(RTL_H) sched-int.h \ $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h flags.h insn-config.h function.h \ - $(INSN_ATTR_H) toplev.h $(RECOG_H) except.h + $(INSN_ATTR_H) toplev.h $(RECOG_H) except.h $(TM_P_H) sched-vis.o : sched-vis.c $(CONFIG_H) system.h $(RTL_H) sched-int.h \ - hard-reg-set.h $(BASIC_BLOCK_H) $(INSN_ATTR_H) $(REGS_H) + hard-reg-set.h $(BASIC_BLOCK_H) $(INSN_ATTR_H) $(REGS_H) $(TM_P_H) final.o : final.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h intl.h \ $(REGS_H) $(RECOG_H) conditions.h insn-config.h $(INSN_ATTR_H) function.h \ real.h output.h hard-reg-set.h insn-flags.h insn-codes.h gstab.h except.h \ xcoffout.h toplev.h reload.h dwarfout.h dwarf2out.h sdbout.h \ - dbxout.h $(BASIC_BLOCK_H) + dbxout.h $(BASIC_BLOCK_H) $(TM_P_H) recog.o : recog.c $(CONFIG_H) system.h $(RTL_H) function.h $(BASIC_BLOCK_H) \ $(REGS_H) $(RECOG_H) hard-reg-set.h flags.h insn-config.h $(INSN_ATTR_H) \ - insn-flags.h insn-codes.h real.h toplev.h output.h reload.h + insn-flags.h insn-codes.h real.h toplev.h output.h reload.h $(TM_P_H) reg-stack.o : reg-stack.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) $(RECOG_H) \ $(REGS_H) hard-reg-set.h flags.h insn-config.h insn-flags.h toplev.h \ - varray.h function.h + varray.h function.h $(TM_P_H) predict.o: predict.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h \ - $(RECOG_H) insn-flags.h function.h except.h $(EXPR_H) + $(RECOG_H) insn-flags.h function.h except.h $(EXPR_H) $(TM_P_H) lists.o: lists.c $(CONFIG_H) system.h toplev.h $(RTL_H) $(GGC_H) bb-reorder.o : bb-reorder.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) flags.h \ insn-config.h $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h toplev.h \ - $(RECOG_H) insn-flags.h function.h except.h $(EXPR_H) + $(RECOG_H) insn-flags.h function.h except.h $(EXPR_H) $(TM_P_H) timevar.o : timevar.c $(CONFIG_H) system.h $(TIMEVAR_H) flags.h intl.h regrename.o : regrename.c $(CONFIG_H) system.h $(RTL_H) insn-config.h \ $(BASIC_BLOCK_H) $(REGS_H) hard-reg-set.h output.h $(RECOG_H) function.h \ - resource.h $(OBSTACK_H) flags.h + resource.h $(OBSTACK_H) flags.h $(TM_P_H) ifcvt.o : ifcvt.c $(CONFIG_H) system.h $(RTL_H) $(REGS_H) \ flags.h insn-config.h function.h $(RECOG_H) $(BASIC_BLOCK_H) $(EXPR_H) \ - output.h + output.h $(TM_P_H) dependence.o : dependence.c $(CONFIG_H) system.h $(RTL_H) $(TREE_H) \ $(C_COMMON_H) flags.h varray.h $(EXPR_H) params.o : params.c $(CONFIG_H) system.h params.h toplev.h @@ -1527,7 +1556,7 @@ params.o : params.c $(CONFIG_H) system.h params.h toplev.h $(out_object_file): $(out_file) $(CONFIG_H) $(TREE_H) $(GGC_H) \ $(RTL_H) $(REGS_H) hard-reg-set.h real.h insn-config.h conditions.h \ insn-flags.h output.h $(INSN_ATTR_H) insn-codes.h system.h toplev.h \ - function.h sched-int.h + function.h sched-int.h $(TM_P_H) $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ $(out_file) $(OUTPUT_OPTION) @@ -1592,7 +1621,7 @@ s-codes : $(md_file) gencodes$(build_exeext) $(srcdir)/move-if-change insn-emit.o : insn-emit.c $(CONFIG_H) $(RTL_H) $(EXPR_H) real.h output.h \ insn-config.h insn-flags.h insn-codes.h system.h reload.h $(RECOG_H) \ - function.h flags.h hard-reg-set.h resource.h + function.h flags.h hard-reg-set.h resource.h $(TM_P_H) $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-emit.c insn-emit.c: s-emit ; @true @@ -1602,7 +1631,8 @@ s-emit : $(md_file) genemit$(build_exeext) $(srcdir)/move-if-change touch s-emit insn-recog.o : insn-recog.c $(CONFIG_H) $(RTL_H) insn-config.h $(RECOG_H) \ - real.h output.h flags.h system.h function.h hard-reg-set.h resource.h + real.h output.h flags.h system.h function.h hard-reg-set.h resource.h \ + $(TM_P_H) $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-recog.c insn-recog.c: s-recog ; @true @@ -1632,7 +1662,7 @@ s-extract : $(md_file) genextract$(build_exeext) $(srcdir)/move-if-change touch s-extract insn-peep.o : insn-peep.c $(CONFIG_H) $(RTL_H) $(REGS_H) output.h real.h \ - system.h insn-config.h $(RECOG_H) except.h function.h + system.h insn-config.h $(RECOG_H) except.h function.h $(TM_P_H) $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-peep.c insn-peep.c: s-peep ; @true @@ -1642,7 +1672,7 @@ s-peep : $(md_file) genpeep$(build_exeext) $(srcdir)/move-if-change touch s-peep insn-attrtab.o : insn-attrtab.c $(CONFIG_H) $(RTL_H) $(REGS_H) real.h \ - output.h $(INSN_ATTR_H) insn-config.h system.h toplev.h $(RECOG_H) + output.h $(INSN_ATTR_H) insn-config.h system.h toplev.h $(RECOG_H) $(TM_P_H) $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-attrtab.c insn-attr.h: s-attr ; @true @@ -1659,7 +1689,8 @@ s-attrtab : $(md_file) genattrtab$(build_exeext) $(srcdir)/move-if-change insn-output.o : insn-output.c $(CONFIG_H) $(RTL_H) $(GGC_H) $(REGS_H) real.h \ conditions.h hard-reg-set.h insn-config.h insn-flags.h $(INSN_ATTR_H) \ - output.h $(RECOG_H) function.h insn-codes.h system.h toplev.h flags.h + output.h $(RECOG_H) function.h insn-codes.h system.h toplev.h flags.h \ + $(TM_P_H) $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) -c insn-output.c insn-output.c: s-output ; @true @@ -1706,7 +1737,7 @@ genconfig$(build_exeext) : genconfig.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ genconfig.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBS) -genconfig.o : genconfig.c $(RTL_H) $(build_xm_file) \ +genconfig.o : genconfig.c $(RTL_H) $(HCONFIG_H) \ system.h errors.h gensupport.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/genconfig.c @@ -1714,7 +1745,7 @@ genflags$(build_exeext) : genflags.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $( $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ genflags.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBS) -genflags.o : genflags.c $(RTL_H) $(OBSTACK_H) $(build_xm_file) \ +genflags.o : genflags.c $(RTL_H) $(OBSTACK_H) $(HCONFIG_H) \ system.h errors.h gensupport.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/genflags.c @@ -1722,7 +1753,7 @@ gencodes$(build_exeext) : gencodes.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $( $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ gencodes.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBS) -gencodes.o : gencodes.c $(RTL_H) $(build_xm_file) \ +gencodes.o : gencodes.c $(RTL_H) $(HCONFIG_H) \ system.h errors.h gensupport.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/gencodes.c @@ -1730,14 +1761,14 @@ genemit$(build_exeext) : genemit.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HO $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ genemit.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBS) -genemit.o : genemit.c $(RTL_H) $(build_xm_file) system.h errors.h gensupport.h +genemit.o : genemit.c $(RTL_H) $(HCONFIG_H) system.h errors.h gensupport.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/genemit.c genopinit$(build_exeext) : genopinit.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBDEPS) $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ genopinit.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBS) -genopinit.o : genopinit.c $(RTL_H) $(build_xm_file) \ +genopinit.o : genopinit.c $(RTL_H) $(HCONFIG_H) \ system.h errors.h gensupport.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/genopinit.c @@ -1745,7 +1776,7 @@ genrecog$(build_exeext) : genrecog.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $( $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ genrecog.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBS) -genrecog.o : genrecog.c $(RTL_H) $(build_xm_file) \ +genrecog.o : genrecog.c $(RTL_H) $(HCONFIG_H) \ system.h errors.h gensupport.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/genrecog.c @@ -1753,7 +1784,7 @@ genextract$(build_exeext) : genextract.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ genextract.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBS) -genextract.o : genextract.c $(RTL_H) $(build_xm_file) \ +genextract.o : genextract.c $(RTL_H) $(HCONFIG_H) \ system.h insn-config.h errors.h gensupport.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/genextract.c @@ -1761,21 +1792,21 @@ genpeep$(build_exeext) : genpeep.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HO $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ genpeep.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBS) -genpeep.o : genpeep.c $(RTL_H) $(build_xm_file) system.h errors.h gensupport.h +genpeep.o : genpeep.c $(RTL_H) $(HCONFIG_H) system.h errors.h gensupport.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/genpeep.c genattr$(build_exeext) : genattr.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBDEPS) $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ genattr.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBS) -genattr.o : genattr.c $(RTL_H) $(build_xm_file) system.h errors.h gensupport.h +genattr.o : genattr.c $(RTL_H) $(HCONFIG_H) system.h errors.h gensupport.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/genattr.c genattrtab$(build_exeext) : genattrtab.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBDEPS) $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ genattrtab.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBS) -genattrtab.o : genattrtab.c $(RTL_H) $(OBSTACK_H) $(build_xm_file) \ +genattrtab.o : genattrtab.c $(RTL_H) $(OBSTACK_H) $(HCONFIG_H) \ system.h errors.h $(GGC_H) gensupport.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/genattrtab.c @@ -1783,7 +1814,7 @@ genoutput$(build_exeext) : genoutput.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ genoutput.o $(HOST_RTL) $(HOST_PRINT) $(HOST_ERRORS) $(HOST_LIBS) -genoutput.o : genoutput.c $(RTL_H) $(build_xm_file) \ +genoutput.o : genoutput.c $(RTL_H) $(HCONFIG_H) \ system.h errors.h gensupport.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/genoutput.c @@ -1791,68 +1822,63 @@ gengenrtl$(build_exeext) : gengenrtl.o $(HOST_LIBDEPS) $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ gengenrtl.o $(HOST_LIBS) -gengenrtl.o : gengenrtl.c $(RTL_BASE_H) system.h real.h +gengenrtl.o : gengenrtl.c $(RTL_BASE_H) $(HCONFIG_H) system.h real.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/gengenrtl.c # # Compile the libraries to be used by gen*. # If we are not cross-building, gen* use the same .o's that cc1 will use, # and HOST_PREFIX_1 is `foobar', just to ensure these rules don't conflict # with the rules for rtl.o, etc. -$(HOST_PREFIX_1)rtl.o: $(srcdir)/rtl.c $(GCONFIG_H) system.h $(RTL_H) \ +$(HOST_PREFIX_1)rtl.o: $(srcdir)/rtl.c $(HCONFIG_H) system.h $(RTL_H) \ bitmap.h $(GGC_H) toplev.h $(HASHTAB_H) rm -f $(HOST_PREFIX)rtl.c sed -e 's/config[.]h/hconfig.h/' $(srcdir)/rtl.c > $(HOST_PREFIX)rtl.c $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)rtl.c -$(HOST_PREFIX_1)print-rtl.o: $(srcdir)/print-rtl.c $(CONFIG_H) \ +$(HOST_PREFIX_1)print-rtl.o: $(srcdir)/print-rtl.c $(HCONFIG_H) \ $(RTL_H) $(BASIC_BLOCK_H) system.h rm -f $(HOST_PREFIX)print-rtl.c sed -e 's/config[.]h/hconfig.h/' $(srcdir)/print-rtl.c > $(HOST_PREFIX)print-rtl.c $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)print-rtl.c -$(HOST_PREFIX_1)bitmap.o: $(srcdir)/bitmap.c $(CONFIG_H) system.h $(RTL_H) \ +$(HOST_PREFIX_1)bitmap.o: $(srcdir)/bitmap.c $(HCONFIG_H) system.h $(RTL_H) \ flags.h bitmap.h rm -f $(HOST_PREFIX)bitmap.c sed -e 's/config[.]h/hconfig.h/' $(srcdir)/bitmap.c > $(HOST_PREFIX)bitmap.c $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)bitmap.c -$(HOST_PREFIX_1)obstack.o: $(srcdir)/../libiberty/obstack.c $(GCONFIG_H) +$(HOST_PREFIX_1)obstack.o: $(srcdir)/../libiberty/obstack.c $(HCONFIG_H) rm -f $(HOST_PREFIX)obstack.c sed -e 's/config[.]h/hconfig.h/' $(srcdir)/../libiberty/obstack.c > $(HOST_PREFIX)obstack.c $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)obstack.c -$(HOST_PREFIX_1)vfprintf.o: $(srcdir)/../libiberty/vfprintf.c +$(HOST_PREFIX_1)vfprintf.o: $(srcdir)/../libiberty/vfprintf.c $(HCONFIG_H) rm -f $(HOST_PREFIX)vfprintf.c sed -e 's/config[.]h/hconfig.h/' $(srcdir)/../libiberty/vfprintf.c > $(HOST_PREFIX)vfprintf.c $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)vfprintf.c -$(HOST_PREFIX_1)doprint.o: doprint.c +$(HOST_PREFIX_1)doprint.o: doprint.c $(HCONFIG_H) rm -f $(HOST_PREFIX)doprint.c sed -e 's/config[.]h/hconfig.h/' $(srcdir)/doprint.c > $(HOST_PREFIX)doprint.c $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)doprint.c -$(HOST_PREFIX_1)strstr.o: $(srcdir)/../libiberty/strstr.c +$(HOST_PREFIX_1)strstr.o: $(srcdir)/../libiberty/strstr.c $(HCONFIG_H) rm -f $(HOST_PREFIX)strstr.c sed -e 's/config[.]h/hconfig.h/' $(srcdir)/../libiberty/strstr.c > $(HOST_PREFIX)strstr.c $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)strstr.c -$(HOST_PREFIX_1)malloc.o: malloc.c - rm -f $(HOST_PREFIX)malloc.c - sed -e 's/config[.]h/hconfig.h/' $(srcdir)/malloc.c > $(HOST_PREFIX)malloc.c - $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)malloc.c - -$(HOST_PREFIX_1)errors.o: errors.c +$(HOST_PREFIX_1)errors.o: errors.c $(HCONFIG_H) rm -f $(HOST_PREFIX)errors.c sed -e 's/config[.]h/hconfig.h/' $(srcdir)/errors.c > $(HOST_PREFIX)errors.c $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)errors.c # This satisfies the dependency that we get if you cross-compile a compiler -# that does not need to compile, malloc or whatever. +# that does not need to compile doprint or whatever. $(HOST_PREFIX_1): touch $(HOST_PREFIX_1) -$(HOST_PREFIX_1)ggc-none.o: ggc-none.c +$(HOST_PREFIX_1)ggc-none.o: ggc-none.c $(HCONFIG_H) rm -f $(HOST_PREFIX)ggc-none.c sed -e 's/config[.]h/hconfig.h/' $(srcdir)/ggc-none.c > $(HOST_PREFIX)ggc-none.c $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(HOST_PREFIX)ggc-none.c @@ -2126,10 +2152,10 @@ gen-protos$(build_exeext): $(GEN_PROTOS_OBJS) ${HOST_CC} $(HOST_CFLAGS) $(HOST_LDFLAGS) -o $@ \ $(GEN_PROTOS_OBJS) ../libiberty/libiberty.a -gen-protos.o: gen-protos.c scan.h $(build_xm_file) system.h +gen-protos.o: gen-protos.c scan.h $(HCONFIG_H) system.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/gen-protos.c -scan.o: scan.c scan.h $(build_xm_file) system.h +scan.o: scan.c scan.h $(HCONFIG_H) system.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/scan.c xsys-protos.h: $(GCC_PASSES) $(srcdir)/sys-protos.h deduced.h gen-protos$(build_exeext) Makefile @@ -2150,10 +2176,10 @@ fix-header: fix-header.o scan-decls.o scan.o xsys-protos.h $(LIBDEPS) \ scan-decls.o scan.o libcpp.a $(LIBS) fix-header.o: fix-header.c $(OBSTACK_H) scan.h \ - xsys-protos.h $(build_xm_file) system.h cpplib.h + xsys-protos.h $(HCONFIG_H) system.h cpplib.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/fix-header.c -scan-decls.o: scan-decls.c scan.h cpplib.h $(build_xm_file) system.h +scan-decls.o: scan-decls.c scan.h cpplib.h $(HCONFIG_H) system.h $(HOST_CC) -c $(HOST_CFLAGS) $(HOST_CPPFLAGS) $(INCLUDES) $(srcdir)/scan-decls.c # stmp-fixproto depends on this, not on fix-header directly. @@ -2267,7 +2293,6 @@ mostlyclean: $(INTL_MOSTLYCLEAN) lang.mostlyclean -rm -rf libgcc # Delete the temporary source copies for cross compilation. -rm -f $(HOST_PREFIX_1)rtl.c - -rm -f $(HOST_PREFIX_1)malloc.c -rm -f $(HOST_PREFIX_1)obstack.c # Delete the temp files made in the course of building libgcc.a. -rm -f xlimits.h libgcc1-test @@ -2301,6 +2326,8 @@ mostlyclean: $(INTL_MOSTLYCLEAN) lang.mostlyclean INTL_CLEAN = intl.clean clean: mostlyclean $(INTL_CLEAN) lang.clean -rm -f libgcc.a libgcc_s$(SHLIB_EXT) + -rm -f config.h tconfig.h hconfig.h tm_p.h + -rm -f cs-* -rm -rf libgcc -rm -f *.dvi -rm -f */*.dvi @@ -2323,7 +2350,7 @@ clean: mostlyclean $(INTL_CLEAN) lang.clean # while building and installing GCC. INTL_DISTCLEAN = intl.distclean distclean: clean $(INTL_DISTCLEAN) lang.distclean - -rm -f tm_p.h config.h auto-host.h auto-build.h tconfig.h hconfig.h + -rm -f auto-host.h auto-build.h -rm -f cstamp-h -rm -f config.status config.run config.cache config.bak -rm -f Make-lang Make-hooks Make-host Make-target diff --git a/gcc/config.gcc b/gcc/config.gcc index d1d0cf0..7229d57 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -3248,7 +3248,6 @@ thumb*-*-*) v850-*-rtems*) cpu_type=v850 tm_file="v850/rtems.h" - xm_file="v850/xm-v850.h" tmake_file="v850/t-v850 t-rtems" if test x$stabs = xyes then @@ -3262,7 +3261,6 @@ v850-*-*) target_cpu_default="TARGET_CPU_generic" cpu_type=v850 tm_file="v850/v850.h" - xm_file="v850/xm-v850.h" tmake_file=v850/t-v850 if test x$stabs = xyes then diff --git a/gcc/config/i386/xm-beos.h b/gcc/config/i386/xm-beos.h index 8877c30..6a5a670 100644 --- a/gcc/config/i386/xm-beos.h +++ b/gcc/config/i386/xm-beos.h @@ -20,8 +20,6 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <i386/xm-i386.h> - /* Include <sys/wait.h> to define the exit status access macros. */ #ifndef inhibit_libc #include <sys/wait.h> diff --git a/gcc/config/i386/xm-bsd386.h b/gcc/config/i386/xm-bsd386.h deleted file mode 100644 index 6b8eee7..0000000 --- a/gcc/config/i386/xm-bsd386.h +++ /dev/null @@ -1,3 +0,0 @@ -/* Configuration for GCC for Intel i386 running BSDI's BSD/386 as host. */ - -#include "i386/xm-i386.h" diff --git a/gcc/config/i386/xm-dgux.h b/gcc/config/i386/xm-dgux.h new file mode 100644 index 0000000..881c5c7 --- /dev/null +++ b/gcc/config/i386/xm-dgux.h @@ -0,0 +1,4 @@ +/* Configuration for GCC for Intel i386 running DG/ux */ + +/* looks just like sysv4 for now */ +#include "xm-svr4.h" diff --git a/gcc/config/i386/xm-djgpp.h b/gcc/config/i386/xm-djgpp.h index 95d55fb..5212468 100644 --- a/gcc/config/i386/xm-djgpp.h +++ b/gcc/config/i386/xm-djgpp.h @@ -20,8 +20,6 @@ Boston, MA 02111-1307, USA. */ #define __MSDOS__ 1 -#include "i386/xm-i386.h" - /* Use semicolons to separate elements of a path. */ #define PATH_SEPARATOR ';' diff --git a/gcc/config/i386/xm-dos.h b/gcc/config/i386/xm-dos.h index 2abdbfc..d28a1ff 100644 --- a/gcc/config/i386/xm-dos.h +++ b/gcc/config/i386/xm-dos.h @@ -18,8 +18,6 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "i386/xm-i386.h" - /* Use semicolons to separate elements of a path. */ #define PATH_SEPARATOR ';' diff --git a/gcc/config/i386/xm-gnu.h b/gcc/config/i386/xm-gnu.h new file mode 100644 index 0000000..6b1797c --- /dev/null +++ b/gcc/config/i386/xm-gnu.h @@ -0,0 +1,2 @@ +/* Configuration for GCC for Intel i386 running GNU as host. */ +#include <xm-gnu.h> diff --git a/gcc/config/i386/xm-i386-interix.h b/gcc/config/i386/xm-i386-interix.h index 8bfd5e2..bd010e4 100644 --- a/gcc/config/i386/xm-i386-interix.h +++ b/gcc/config/i386/xm-i386-interix.h @@ -21,8 +21,6 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <i386/xm-i386.h> - #define HOST_BITS_PER_WIDEST_INT HOST_BITS_PER_LONGLONG #ifdef __GNUC__ # define HOST_WIDEST_INT long long diff --git a/gcc/config/i386/xm-i386.h b/gcc/config/i386/xm-i386.h deleted file mode 100644 index 9f5b5500f..0000000 --- a/gcc/config/i386/xm-i386.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Configuration for GNU C-compiler for Intel 80386. - Copyright (C) 1988, 1993, 2001 Free Software Foundation, Inc. - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#ifndef __i386__ -#define __i386__ 1 -#endif diff --git a/gcc/config/i386/xm-linux.h b/gcc/config/i386/xm-linux.h index 84c9f67..93c5576 100644 --- a/gcc/config/i386/xm-linux.h +++ b/gcc/config/i386/xm-linux.h @@ -19,5 +19,4 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include <i386/xm-i386.h> #include <xm-linux.h> diff --git a/gcc/config/i386/xm-next.h b/gcc/config/i386/xm-next.h index bf90328..e0b53f2 100644 --- a/gcc/config/i386/xm-next.h +++ b/gcc/config/i386/xm-next.h @@ -1,5 +1,3 @@ -#include "i386/xm-i386.h" - /* malloc does better with chunks the size of a page. */ #define OBSTACK_CHUNK_SIZE (getpagesize ()) diff --git a/gcc/config/elxsi/xm-elxsi.h b/gcc/config/i386/xm-openbsd.h index 14bef92..9704479 100644 --- a/gcc/config/elxsi/xm-elxsi.h +++ b/gcc/config/i386/xm-openbsd.h @@ -1,5 +1,5 @@ -/* Configuration for GNU C-compiler for Elxsi. - Copyright (C) 1987, 1993, 2001 Free Software Foundation, Inc. +/* Configuration file for i386 hosts running OpenBSD. + Copyright (C) 1999 Free Software Foundation, Inc. This file is part of GNU CC. @@ -18,3 +18,4 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include <xm-openbsd.h> diff --git a/gcc/config/i960/xm-i960.h b/gcc/config/i386/xm-sun.h index 95645b3..6c0f0a2 100644 --- a/gcc/config/i960/xm-i960.h +++ b/gcc/config/i386/xm-sun.h @@ -1,5 +1,5 @@ -/* Configuration for GNU C-compiler for Intel 960 family - Copyright (C) 1987, 1993, 2001 Free Software Foundation, Inc. +/* Configuration for GNU C-compiler for Intel 80386 running SunOS 4.0. + Copyright (C) 1988, 1997 Free Software Foundation, Inc. This file is part of GNU CC. @@ -18,3 +18,4 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#define USG diff --git a/gcc/config/i386/xm-sysv3.h b/gcc/config/i386/xm-sysv3.h new file mode 100644 index 0000000..9a65544 --- /dev/null +++ b/gcc/config/i386/xm-sysv3.h @@ -0,0 +1,3 @@ +/* Configuration for GCC for Intel i386 running System V Release 3. */ + +#include "xm-svr3.h" diff --git a/gcc/config/i860/xm-i860.h b/gcc/config/i860/xm-i860.h deleted file mode 100644 index 789d541..0000000 --- a/gcc/config/i860/xm-i860.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Configuration for GNU C-compiler for Intel i860. - Copyright (C) 1988, 1993, 2001 Free Software Foundation, Inc. - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - diff --git a/gcc/config/mcore/xm-mcore.h b/gcc/config/mcore/xm-mcore.h deleted file mode 100644 index 88b6139..0000000 --- a/gcc/config/mcore/xm-mcore.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Configuration for GNU C-compiler for the Motorola M*Core. - Copyright (C) 1993, 1999, 2000, 2001 Free Software Foundation, Inc. - - This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ - diff --git a/gcc/config/mn10300/xm-mn10300.h b/gcc/config/mn10300/xm-mn10300.h deleted file mode 100644 index 013fe4b..0000000 --- a/gcc/config/mn10300/xm-mn10300.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Configuration for Matsushita MN10300. - Copyright (C) 1996, 1998, 1999, 2001 Free Software Foundation, Inc. - Contributed by Cygnus Support. - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ diff --git a/gcc/config/ns32k/xm-ns32k.h b/gcc/config/ns32k/xm-ns32k.h deleted file mode 100644 index 9ab49fb..0000000 --- a/gcc/config/ns32k/xm-ns32k.h +++ /dev/null @@ -1,19 +0,0 @@ -/* Configuration for GNU C-compiler for Vax. - Copyright (C) 1987, 1993, 2001 Free Software Foundation, Inc. - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ diff --git a/gcc/config/pj/xm-pj.h b/gcc/config/pj/xm-pj.h deleted file mode 100644 index f39238f..0000000 --- a/gcc/config/pj/xm-pj.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Configuration for GNU C-compiler for picoJava. - Copyright (C) 2000, 2001 Free Software Foundation, Inc. - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - diff --git a/gcc/config/sh/xm-sh.h b/gcc/config/sh/xm-sh.h deleted file mode 100644 index 2d6e4cd..0000000 --- a/gcc/config/sh/xm-sh.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Configuration for GNU C-compiler for Hitachi SH. - Copyright (C) 1993, 1997, 2001 Free Software Foundation, Inc. - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - diff --git a/gcc/config/v850/xm-v850.h b/gcc/config/v850/xm-v850.h deleted file mode 100644 index add710b..0000000 --- a/gcc/config/v850/xm-v850.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Configuration for NEC V850. - Copyright (C) 1996, 1998, 1999, 2001 Free Software Foundation, Inc. - Contributed by Cygnus Support. - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - diff --git a/gcc/configure b/gcc/configure index c35e197..fbd0ed7 100755 --- a/gcc/configure +++ b/gcc/configure @@ -1585,7 +1585,7 @@ esac # Find some useful tools -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk 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 @@ -4010,9 +4010,46 @@ then fi # Say what files are being used for the output code and MD file. -echo "Using \`$srcdir/config/$out_file' to output insns." +echo "Using \`$srcdir/config/$out_file' for machine-specific logic." echo "Using \`$srcdir/config/$md_file' as machine description file." +# If any of the xm_file variables contain nonexistent files, warn +# about them and drop them. But $cpu/xm-$cpu.h is allowed not to +# exist, if we have nothing for it to do. + +bx= +for x in $build_xm_file; do + if test -f $srcdir/config/$x + then bx="$bx $x" + elif echo $x | grep '\(a-z0-9a-z0-9*\)/xm-\1\.h' >/dev/null + then : + else echo "configure: warning: $srcdir/config/$x does not exist." 1>&2 + fi +done +build_xm_file="$bx" + +hx= +for x in $host_xm_file; do + if test -f $srcdir/config/$x + then hx="$hx $x" + elif echo $x | grep '\(a-z0-9a-z0-9*\)/xm-\1\.h' >/dev/null + then : + else echo "configure: warning: $srcdir/config/$x does not exist." 1>&2 + fi +done +host_xm_file="$hx" + +tx= +for x in $xm_file; do + if test -f $srcdir/config/$x + then tx="$tx $x" + elif echo $x | grep '\(a-z0-9a-z0-9*\)/xm-\1\.h' >/dev/null + then : + else echo "configure: warning: $srcdir/config/$x does not exist." 1>&2 + fi +done +xm_file="$tx" + count=a for f in $tm_file; do count=${count}x @@ -4030,7 +4067,9 @@ count=a for f in $host_xm_file; do count=${count}x done -if test $count = ax; then +if test $count = a; then + : +elif test $count = ax; then echo "Using \`$srcdir/config/$host_xm_file' as host machine macro file." else echo "Using the following host machine macro files:" @@ -4044,7 +4083,9 @@ if test "$host_xm_file" != "$build_xm_file"; then for f in $build_xm_file; do count=${count}x done - if test $count = ax; then + if test $count = a; then + : + elif test $count = ax; then echo "Using \`$srcdir/config/$build_xm_file' as build machine macro file." else echo "Using the following build machine macro files:" @@ -4062,15 +4103,11 @@ if test x$thread_file = x; then fi fi -# Set up the header files. -# $links is the list of header files to create. -# $vars is the list of shell variables with file names to include. # auto-host.h is the file containing items generated by autoconf and is # the first file included by config.h. # If host=build, it is correct to have hconfig include auto-host.h # as well. If host!=build, we are in error and need to do more # work to find out the build config parameters. -# FIXME: hconfig.h should be bconfig.h. if test x$host = x$build then build_auto=auto-host.h @@ -4098,68 +4135,11 @@ else build_auto=auto-build.h fi -null_defines= tm_file="${tm_file} defaults.h" host_xm_file="auto-host.h gansidecl.h ${host_xm_file} ${tm_file} hwint.h" build_xm_file="${build_auto} gansidecl.h ${build_xm_file} ${tm_file} hwint.h" xm_file="gansidecl.h ${xm_file} ${tm_file}" -vars="host_xm_file tm_p_file xm_file build_xm_file" -links="config.h tm_p.h tconfig.h hconfig.h" -defines="host_xm_defines null_defines xm_defines build_xm_defines" - -rm -f config.bak -if test -f config.status; then mv -f config.status config.bak; fi - -# Make the links. -while test -n "$vars" -do - set $vars; var=$1; shift; vars=$* - set $links; link=$1; shift; links=$* - set $defines; define=$1; shift; defines=$* - - rm -f $link - # Make sure the file is created, even if it is empty. - echo >$link - - # Define TARGET_CPU_DEFAULT if the system wants one. - # This substitutes for lots of *.h files. - if test "$target_cpu_default" != "" - then - echo "#define TARGET_CPU_DEFAULT ($target_cpu_default)" >>$link - fi - - for file in `eval echo '$'$var`; do - case $file in - auto-host.h | auto-build.h ) - ;; - *) - echo '#ifdef IN_GCC' >>$link - ;; - esac - echo "#include \"$file\"" >>$link - case $file in - auto-host.h | auto-build.h ) - ;; - *) - echo '#endif' >>$link - ;; - esac - done - - for def in `eval echo '$'$define`; do - echo "#ifndef $def" >>$link - echo "#define $def" >>$link - echo "#endif" >>$link - done - - # Include insn-codes.h last, because it includes machmode.h, - # and we want EXTRA_CC_MODES to be taken into account. - echo "#ifndef GENERATOR_FILE" >>$link - echo "#include \"insn-codes.h\"" >>$link - echo "#endif" >>$link -done - # Truncate the target if necessary if test x$host_truncate_target != x; then target=`echo $target | sed -e 's/\(..............\).*/\1/'` @@ -4232,7 +4212,7 @@ fi echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:4236: checking for strerror in -lcposix" >&5 +echo "configure:4216: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4240,7 +4220,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 4244 "configure" +#line 4224 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4251,7 +4231,7 @@ int main() { strerror() ; return 0; } EOF -if { (eval echo configure:4255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4274,12 +4254,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:4278: checking for working const" >&5 +echo "configure:4258: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4283 "configure" +#line 4263 "configure" #include "confdefs.h" int main() { @@ -4328,7 +4308,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:4332: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4312: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -4349,12 +4329,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:4353: checking for off_t" >&5 +echo "configure:4333: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4358 "configure" +#line 4338 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4382,12 +4362,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:4386: checking for size_t" >&5 +echo "configure:4366: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4391 "configure" +#line 4371 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -4420,17 +4400,17 @@ unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4424: checking for $ac_hdr" >&5 +echo "configure:4404: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4429 "configure" +#line 4409 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4460,12 +4440,12 @@ done strdup __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4464: checking for $ac_func" >&5 +echo "configure:4444: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4469 "configure" +#line 4449 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4488,7 +4468,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4517,12 +4497,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4521: checking for $ac_func" >&5 +echo "configure:4501: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4526 "configure" +#line 4506 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4545,7 +4525,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4579,19 +4559,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:4583: checking for LC_MESSAGES" >&5 +echo "configure:4563: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4588 "configure" +#line 4568 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:4595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -4612,7 +4592,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:4616: checking whether NLS is requested" >&5 +echo "configure:4596: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -4632,7 +4612,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:4636: checking whether included gettext is requested" >&5 +echo "configure:4616: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -4651,17 +4631,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:4655: checking for libintl.h" >&5 +echo "configure:4635: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4660 "configure" +#line 4640 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4678,19 +4658,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:4682: checking for gettext in libc" >&5 +echo "configure:4662: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4687 "configure" +#line 4667 "configure" #include "confdefs.h" #include <libintl.h> int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:4694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -4706,7 +4686,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:4710: checking for bindtextdomain in -lintl" >&5 +echo "configure:4690: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4714,7 +4694,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4718 "configure" +#line 4698 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4725,7 +4705,7 @@ int main() { bindtextdomain() ; return 0; } EOF -if { (eval echo configure:4729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4741,12 +4721,12 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:4745: checking for gettext in libintl" >&5 +echo "configure:4725: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6 -echo "configure:4750: checking for gettext in -lintl" >&5 +echo "configure:4730: checking for gettext in -lintl" >&5 ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4754,7 +4734,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4758 "configure" +#line 4738 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4765,7 +4745,7 @@ int main() { gettext() ; return 0; } EOF -if { (eval echo configure:4769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4808,7 +4788,7 @@ EOF # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4812: checking for $ac_word" >&5 +echo "configure:4792: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4842,12 +4822,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4846: checking for $ac_func" >&5 +echo "configure:4826: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4851 "configure" +#line 4831 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4870,7 +4850,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4897,7 +4877,7 @@ done # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4901: checking for $ac_word" >&5 +echo "configure:4881: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4933,7 +4913,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4937: checking for $ac_word" >&5 +echo "configure:4917: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4965,7 +4945,7 @@ else fi cat > conftest.$ac_ext <<EOF -#line 4969 "configure" +#line 4949 "configure" #include "confdefs.h" int main() { @@ -4973,7 +4953,7 @@ extern int _nl_msg_cat_cntr; return _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:4977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -4998,7 +4978,7 @@ fi if test "$CATOBJEXT" = "NONE"; then echo $ac_n "checking whether catgets can be used""... $ac_c" 1>&6 -echo "configure:5002: checking whether catgets can be used" >&5 +echo "configure:4982: checking whether catgets can be used" >&5 # Check whether --with-catgets or --without-catgets was given. if test "${with_catgets+set}" = set; then withval="$with_catgets" @@ -5011,7 +4991,7 @@ fi if test "$nls_cv_use_catgets" = "yes"; then echo $ac_n "checking for main in -li""... $ac_c" 1>&6 -echo "configure:5015: checking for main in -li" >&5 +echo "configure:4995: checking for main in -li" >&5 ac_lib_var=`echo i'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5019,14 +4999,14 @@ else ac_save_LIBS="$LIBS" LIBS="-li $LIBS" cat > conftest.$ac_ext <<EOF -#line 5023 "configure" +#line 5003 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5054,12 +5034,12 @@ else fi echo $ac_n "checking for catgets""... $ac_c" 1>&6 -echo "configure:5058: checking for catgets" >&5 +echo "configure:5038: checking for catgets" >&5 if eval "test \"`echo '$''{'ac_cv_func_catgets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5063 "configure" +#line 5043 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char catgets(); below. */ @@ -5082,7 +5062,7 @@ catgets(); ; return 0; } EOF -if { (eval echo configure:5086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_catgets=yes" else @@ -5104,7 +5084,7 @@ EOF # Extract the first word of "gencat", so it can be a program name with args. set dummy gencat; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5108: checking for $ac_word" >&5 +echo "configure:5088: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GENCAT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5140,7 +5120,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5144: checking for $ac_word" >&5 +echo "configure:5124: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5177,7 +5157,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5181: checking for $ac_word" >&5 +echo "configure:5161: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5215,7 +5195,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5219: checking for $ac_word" >&5 +echo "configure:5199: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5273,7 +5253,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5277: checking for $ac_word" >&5 +echo "configure:5257: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5307,7 +5287,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5311: checking for $ac_word" >&5 +echo "configure:5291: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5346,7 +5326,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5350: checking for $ac_word" >&5 +echo "configure:5330: checking for $ac_word" >&5 if eval "test \"`echo '$''{'gcc_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5445,7 +5425,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:5449: checking for catalogs to be installed" >&5 +echo "configure:5429: checking for catalogs to be installed" >&5 if test "x$LINGUAS" = "x"; then LINGUAS=$ALL_LINGUAS else @@ -5477,17 +5457,17 @@ echo "configure:5449: checking for catalogs to be installed" >&5 if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:5481: checking for linux/version.h" >&5 +echo "configure:5461: checking for linux/version.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5486 "configure" +#line 5466 "configure" #include "confdefs.h" #include <linux/version.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5491: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5562,7 +5542,7 @@ fi echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6 -echo "configure:5566: checking whether windows registry support is requested" >&5 +echo "configure:5546: checking whether windows registry support is requested" >&5 if test x$enable_win32_registry != xno; then cat >> confdefs.h <<\EOF #define ENABLE_WIN32_REGISTRY 1 @@ -5591,7 +5571,7 @@ esac if test x$enable_win32_registry != xno; then echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6 -echo "configure:5595: checking registry key on windows hosts" >&5 +echo "configure:5575: checking registry key on windows hosts" >&5 cat >> confdefs.h <<EOF #define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key" EOF @@ -5665,6 +5645,11 @@ for f in $tm_file; do esac done +tm_p_file_list= +for f in $tm_p_file; do + tm_p_file_list="${tm_p_file_list} \$(srcdir)/config/$f" +done + host_xm_file_list= for f in $host_xm_file; do case $f in @@ -5771,7 +5756,7 @@ fi # Figure out what assembler we will be using. echo $ac_n "checking what assembler to use""... $ac_c" 1>&6 -echo "configure:5775: checking what assembler to use" >&5 +echo "configure:5760: checking what assembler to use" >&5 gcc_cv_as= gcc_cv_gas_major_version= gcc_cv_gas_minor_version= @@ -5856,7 +5841,7 @@ fi # Figure out what nm we will be using. echo $ac_n "checking what nm to use""... $ac_c" 1>&6 -echo "configure:5860: checking what nm to use" >&5 +echo "configure:5845: 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 @@ -5867,7 +5852,7 @@ echo "$ac_t""$gcc_cv_nm" 1>&6 # Figure out what assembler alignment features are present. echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6 -echo "configure:5871: checking assembler alignment features" >&5 +echo "configure:5856: 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. @@ -5915,7 +5900,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:5919: checking assembler subsection support" >&5 +echo "configure:5904: 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 @@ -5955,7 +5940,7 @@ fi echo "$ac_t""$gcc_cv_as_subsections" 1>&6 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6 -echo "configure:5959: checking assembler weak support" >&5 +echo "configure:5944: 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 @@ -5978,7 +5963,7 @@ fi echo "$ac_t""$gcc_cv_as_weak" 1>&6 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6 -echo "configure:5982: checking assembler hidden support" >&5 +echo "configure:5967: 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 @@ -6002,7 +5987,7 @@ fi echo "$ac_t""$gcc_cv_as_hidden" 1>&6 echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6 -echo "configure:6006: checking assembler leb128 support" >&5 +echo "configure:5991: checking assembler leb128 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 @@ -6034,7 +6019,7 @@ echo "$ac_t""$gcc_cv_as_leb128" 1>&6 case "$target" in sparc*-*-*) echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6 -echo "configure:6038: checking assembler .register pseudo-op support" >&5 +echo "configure:6023: 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 @@ -6062,7 +6047,7 @@ EOF fi echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6 -echo "configure:6066: checking assembler supports -relax" >&5 +echo "configure:6051: 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 @@ -6092,7 +6077,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:6096: checking for 64 bit support in assembler ($gcc_cv_as)" >&5 +echo "configure:6081: 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 @@ -6137,7 +6122,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:6141: checking for assembler offsetable %lo() support" >&5 +echo "configure:6126: 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 @@ -6176,7 +6161,7 @@ EOF i[34567]86-*-*) echo $ac_n "checking assembler instructions""... $ac_c" 1>&6 -echo "configure:6180: checking assembler instructions" >&5 +echo "configure:6165: 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 @@ -6205,7 +6190,7 @@ EOF esac echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6 -echo "configure:6209: checking assembler dwarf2 debug_line support" >&5 +echo "configure:6194: 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 @@ -6383,7 +6368,7 @@ EOF echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:6387: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:6372: 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" @@ -6675,6 +6660,14 @@ ${CONFIG_SHELL-/bin/sh} $srcdir/configure.frag $srcdir "$subdirs" "$dep_host_xma + + + + + + + + # Echo that links are built if test x$host = x$target then @@ -6937,6 +6930,8 @@ s%@all_stagestuff@%$all_stagestuff%g s%@build_exeext@%$build_exeext%g s%@build_install_headers_dir@%$build_install_headers_dir%g s%@build_xm_file_list@%$build_xm_file_list%g +s%@build_xm_file@%$build_xm_file%g +s%@build_xm_defines@%$build_xm_defines%g s%@check_languages@%$check_languages%g s%@cc_set_by_configure@%$cc_set_by_configure%g s%@quoted_cc_set_by_configure@%$quoted_cc_set_by_configure%g @@ -6959,6 +6954,8 @@ s%@gcc_version_trigger@%$gcc_version_trigger%g s%@host_exeext@%$host_exeext%g s%@host_extra_gcc_objs@%$host_extra_gcc_objs%g s%@host_xm_file_list@%$host_xm_file_list%g +s%@host_xm_file@%$host_xm_file%g +s%@host_xm_defines@%$host_xm_defines%g s%@install@%$install%g s%@lang_options_files@%$lang_options_files%g s%@lang_specs_files@%$lang_specs_files%g @@ -6973,9 +6970,14 @@ s%@stage_prefix_set_by_configure@%$stage_prefix_set_by_configure%g s%@symbolic_link@%$symbolic_link%g s%@thread_file@%$thread_file%g s%@tm_file_list@%$tm_file_list%g +s%@tm_file@%$tm_file%g +s%@tm_p_file_list@%$tm_p_file_list%g +s%@tm_p_file@%$tm_p_file%g +s%@xm_file@%$xm_file%g s%@will_use_collect2@%$will_use_collect2%g s%@c_target_objs@%$c_target_objs%g s%@cxx_target_objs@%$cxx_target_objs%g +s%@target_cpu_default@%$target_cpu_default%g /@target_overrides@/r $target_overrides s%@target_overrides@%%g /@host_overrides@/r $host_overrides diff --git a/gcc/configure.in b/gcc/configure.in index b6b3c3b..07eb8d6 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -673,9 +673,46 @@ then fi # Say what files are being used for the output code and MD file. -echo "Using \`$srcdir/config/$out_file' to output insns." +echo "Using \`$srcdir/config/$out_file' for machine-specific logic." echo "Using \`$srcdir/config/$md_file' as machine description file." +# If any of the xm_file variables contain nonexistent files, warn +# about them and drop them. But $cpu/xm-$cpu.h is allowed not to +# exist, if we have nothing for it to do. + +bx= +for x in $build_xm_file; do + if test -f $srcdir/config/$x + then bx="$bx $x" + elif echo $x | grep '\([a-z0-9][a-z0-9]*\)/xm-\1\.h' >/dev/null + then : + else AC_MSG_WARN($srcdir/config/$x does not exist.) + fi +done +build_xm_file="$bx" + +hx= +for x in $host_xm_file; do + if test -f $srcdir/config/$x + then hx="$hx $x" + elif echo $x | grep '\([a-z0-9][a-z0-9]*\)/xm-\1\.h' >/dev/null + then : + else AC_MSG_WARN($srcdir/config/$x does not exist.) + fi +done +host_xm_file="$hx" + +tx= +for x in $xm_file; do + if test -f $srcdir/config/$x + then tx="$tx $x" + elif echo $x | grep '\([a-z0-9][a-z0-9]*\)/xm-\1\.h' >/dev/null + then : + else AC_MSG_WARN($srcdir/config/$x does not exist.) + fi +done +xm_file="$tx" + count=a for f in $tm_file; do count=${count}x @@ -693,7 +730,9 @@ count=a for f in $host_xm_file; do count=${count}x done -if test $count = ax; then +if test $count = a; then + : +elif test $count = ax; then echo "Using \`$srcdir/config/$host_xm_file' as host machine macro file." else echo "Using the following host machine macro files:" @@ -707,7 +746,9 @@ if test "$host_xm_file" != "$build_xm_file"; then for f in $build_xm_file; do count=${count}x done - if test $count = ax; then + if test $count = a; then + : + elif test $count = ax; then echo "Using \`$srcdir/config/$build_xm_file' as build machine macro file." else echo "Using the following build machine macro files:" @@ -725,15 +766,11 @@ if test x$thread_file = x; then fi fi -# Set up the header files. -# $links is the list of header files to create. -# $vars is the list of shell variables with file names to include. # auto-host.h is the file containing items generated by autoconf and is # the first file included by config.h. # If host=build, it is correct to have hconfig include auto-host.h # as well. If host!=build, we are in error and need to do more # work to find out the build config parameters. -# FIXME: hconfig.h should be bconfig.h. if test x$host = x$build then build_auto=auto-host.h @@ -761,68 +798,11 @@ else build_auto=auto-build.h fi -null_defines= tm_file="${tm_file} defaults.h" host_xm_file="auto-host.h gansidecl.h ${host_xm_file} ${tm_file} hwint.h" build_xm_file="${build_auto} gansidecl.h ${build_xm_file} ${tm_file} hwint.h" xm_file="gansidecl.h ${xm_file} ${tm_file}" -vars="host_xm_file tm_p_file xm_file build_xm_file" -links="config.h tm_p.h tconfig.h hconfig.h" -defines="host_xm_defines null_defines xm_defines build_xm_defines" - -rm -f config.bak -if test -f config.status; then mv -f config.status config.bak; fi - -# Make the links. -while test -n "$vars" -do - set $vars; var=$1; shift; vars=$* - set $links; link=$1; shift; links=$* - set $defines; define=$1; shift; defines=$* - - rm -f $link - # Make sure the file is created, even if it is empty. - echo >$link - - # Define TARGET_CPU_DEFAULT if the system wants one. - # This substitutes for lots of *.h files. - if test "$target_cpu_default" != "" - then - echo "#define TARGET_CPU_DEFAULT ($target_cpu_default)" >>$link - fi - - for file in `eval echo '$'$var`; do - case $file in - auto-host.h | auto-build.h ) - ;; - *) - echo '#ifdef IN_GCC' >>$link - ;; - esac - echo "#include \"$file\"" >>$link - case $file in - auto-host.h | auto-build.h ) - ;; - *) - echo '#endif' >>$link - ;; - esac - done - - for def in `eval echo '$'$define`; do - echo "#ifndef $def" >>$link - echo "#define $def" >>$link - echo "#endif" >>$link - done - - # Include insn-codes.h last, because it includes machmode.h, - # and we want EXTRA_CC_MODES to be taken into account. - echo "#ifndef GENERATOR_FILE" >>$link - echo "#include \"insn-codes.h\"" >>$link - echo "#endif" >>$link -done - # Truncate the target if necessary if test x$host_truncate_target != x; then target=`echo $target | sed -e 's/\(..............\).*/\1/'` @@ -998,6 +978,11 @@ for f in $tm_file; do esac done +tm_p_file_list= +for f in $tm_p_file; do + tm_p_file_list="${tm_p_file_list} \$(srcdir)/config/$f" +done + host_xm_file_list= for f in $host_xm_file; do case $f in @@ -1885,6 +1870,8 @@ AC_SUBST(all_stagestuff) AC_SUBST(build_exeext) AC_SUBST(build_install_headers_dir) AC_SUBST(build_xm_file_list) +AC_SUBST(build_xm_file) +AC_SUBST(build_xm_defines) AC_SUBST(check_languages) AC_SUBST(cc_set_by_configure) AC_SUBST(quoted_cc_set_by_configure) @@ -1907,6 +1894,8 @@ AC_SUBST(gcc_version_trigger) AC_SUBST(host_exeext) AC_SUBST(host_extra_gcc_objs) AC_SUBST(host_xm_file_list) +AC_SUBST(host_xm_file) +AC_SUBST(host_xm_defines) AC_SUBST(install) AC_SUBST(lang_options_files) AC_SUBST(lang_specs_files) @@ -1921,10 +1910,14 @@ AC_SUBST(stage_prefix_set_by_configure) AC_SUBST(symbolic_link) AC_SUBST(thread_file) AC_SUBST(tm_file_list) +AC_SUBST(tm_file) +AC_SUBST(tm_p_file_list) +AC_SUBST(tm_p_file) +AC_SUBST(xm_file) AC_SUBST(will_use_collect2) AC_SUBST(c_target_objs) AC_SUBST(cxx_target_objs) - +AC_SUBST(target_cpu_default) AC_SUBST_FILE(target_overrides) AC_SUBST_FILE(host_overrides) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 03f3d8d..4b58196 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2001-03-09 Zack Weinberg <zackw@stanford.edu> + + * Make-lang.in: Add dependencies on $(TM_P_H) as appropriate. + 2001-03-08 Stan Shebs <shebs@apple.com> * cp-tree.h (set_identifier_local_value): Remove unused decl. diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index fc114a9..20a6a58 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -261,19 +261,22 @@ CXX_TREE_H = $(TREE_H) cp/cp-tree.h c-common.h cp/cp-tree.def c-common.def \ cp/spew.o: cp/spew.c $(CXX_TREE_H) cp/parse.h flags.h cp/lex.h toplev.h cp/lex.o: cp/lex.c $(CXX_TREE_H) cp/parse.h flags.h cp/lex.h c-pragma.h \ - toplev.h output.h mbchar.h $(GGC_H) input.h diagnostic.h cp/operators.def + toplev.h output.h mbchar.h $(GGC_H) input.h diagnostic.h cp/operators.def \ + $(TM_P_H) cp/decl.o: cp/decl.c $(CXX_TREE_H) flags.h cp/lex.h cp/decl.h stack.h \ - output.h $(EXPR_H) except.h toplev.h hash.h $(GGC_H) $(RTL_H) cp/operators.def + output.h $(EXPR_H) except.h toplev.h hash.h $(GGC_H) $(RTL_H) \ + cp/operators.def $(TM_P_H) cp/decl2.o: cp/decl2.c $(CXX_TREE_H) flags.h cp/lex.h cp/decl.h $(EXPR_H) \ output.h except.h toplev.h dwarf2out.h dwarfout.h $(GGC_H) $(RTL_H) -cp/typeck2.o: cp/typeck2.c $(CXX_TREE_H) flags.h toplev.h output.h +cp/typeck2.o: cp/typeck2.c $(CXX_TREE_H) flags.h toplev.h output.h $(TM_P_H) cp/typeck.o: cp/typeck.c $(CXX_TREE_H) flags.h $(RTL_H) $(EXPR_H) toplev.h cp/class.o: cp/class.c $(CXX_TREE_H) flags.h toplev.h $(RTL_H) cp/call.o: cp/call.c $(CXX_TREE_H) flags.h toplev.h $(RTL_H) $(EXPR_H) $(GGC_H) cp/friend.o: cp/friend.c $(CXX_TREE_H) flags.h $(RTL_H) toplev.h $(EXPR_H) cp/init.o: cp/init.c $(CXX_TREE_H) flags.h $(RTL_H) $(EXPR_H) toplev.h \ $(GGC_H) except.h -cp/method.o: cp/method.c $(CXX_TREE_H) toplev.h $(GGC_H) $(RTL_H) $(EXPR_H) +cp/method.o: cp/method.c $(CXX_TREE_H) toplev.h $(GGC_H) $(RTL_H) $(EXPR_H) \ + $(TM_P_H) cp/cvt.o: cp/cvt.c $(CXX_TREE_H) cp/decl.h flags.h toplev.h convert.h cp/search.o: cp/search.c $(CXX_TREE_H) stack.h flags.h toplev.h $(RTL_H) cp/tree.o: cp/tree.c $(CXX_TREE_H) flags.h toplev.h $(GGC_H) $(RTL_H) \ @@ -282,7 +285,8 @@ cp/ptree.o: cp/ptree.c $(CXX_TREE_H) system.h cp/rtti.o: cp/rtti.c $(CXX_TREE_H) flags.h toplev.h cp/except.o: cp/except.c $(CXX_TREE_H) flags.h $(RTL_H) except.h toplev.h \ cp/cfns.h $(EXPR_H) insn-flags.h cp/decl.h $(OBSTACK_H) -cp/expr.o: cp/expr.c $(CXX_TREE_H) $(RTL_H) flags.h $(EXPR_H) toplev.h except.h +cp/expr.o: cp/expr.c $(CXX_TREE_H) $(RTL_H) flags.h $(EXPR_H) toplev.h \ + except.h $(TM_P_H) cp/xref.o: cp/xref.c $(CXX_TREE_H) input.h toplev.h cp/pt.o: cp/pt.c $(CXX_TREE_H) cp/decl.h cp/parse.h cp/lex.h toplev.h \ $(GGC_H) $(RTL_H) except.h diff --git a/gcc/ggc-none.c b/gcc/ggc-none.c index e75ff4a..01399d2 100644 --- a/gcc/ggc-none.c +++ b/gcc/ggc-none.c @@ -22,14 +22,8 @@ need GC at all. This prevents problems with pulling in all the tree stuff. */ -/* We are used by gengenrtl, before genrtl.h exists. But we don't - need it either. */ -#define NO_GENRTL_H - #include "config.h" #include "system.h" -#include "rtl.h" -#include "tm_p.h" #include "ggc.h" void * diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh new file mode 100644 index 0000000..53151d0 --- /dev/null +++ b/gcc/mkconfig.sh @@ -0,0 +1,67 @@ +#! /bin/sh + +# Generate gcc's config.h, which is not your normal autoconf-generated +# config.h (that's auto-(host|build).h). $1 is the file to generate. +# HEADERS, DEFINES, and possibly TARGET_CPU_DEFAULT are expected to be +# set in the environment. + +if [ -z "$1" ]; then + echo "Usage: HEADERS='list' DEFINES='list' mkconfig.sh FILE" >&2 + exit 1 +fi + +output=$1 +rm -f $output.T +exec > $output.T + +# Define TARGET_CPU_DEFAULT if the system wants one. +# This substitutes for lots of *.h files. +if [ "$TARGET_CPU_DEFAULT" != "" ]; then + echo "#define TARGET_CPU_DEFAULT ($TARGET_CPU_DEFAULT)" +fi + +# The first entry in HEADERS may be auto-host.h or auto-build.h; +# it wants to be included even when not -DIN_GCC. +if [ -n "$HEADERS" ]; then + set $HEADERS; first=$1 + case $first in auto-* ) + echo "#include \"$first\"" + shift + HEADERS=$* + ;; + esac +fi + +if [ -n "$HEADERS" ]; then + echo '#ifdef IN_GCC' + for file in $HEADERS; do + echo "# include \"$file\"" + done + echo '#endif' +fi + +for def in $DEFINES; do + echo "#ifndef $def" + echo "# define $def" + echo "#endif" +done + +# Include insn-codes.h last, because it includes machmode.h, +# and we want EXTRA_CC_MODES to be taken into account. +echo "#ifndef GENERATOR_FILE" +echo "#include \"insn-codes.h\"" +echo "#endif" + +exec >&- + +# Avoid changing the actual file if possible. +if [ -f $output ] && cmp $output.T $output; then + echo $output is unchanged >&2 + rm -f $output.T +else + mv -f $output.T $output +fi + +# Touch a stamp file for Make's benefit. +rm -f cs-$output +echo timestamp > cs-$output |