summaryrefslogtreecommitdiff
path: root/gcc/mkconfig.sh
diff options
context:
space:
mode:
authorzack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-09 17:11:00 +0000
committerzack <zack@138bc75d-0d04-0410-961f-82ee72b054a4>2001-08-09 17:11:00 +0000
commite23a6527d76e7d7d1e4b1a2d2787681b0202bc9a (patch)
treec707f6fbe6eee894928f18532faad363c22b3b19 /gcc/mkconfig.sh
parent45c2202bc22116481baf8d8fd6cb3af45627a784 (diff)
downloadgcc-e23a6527d76e7d7d1e4b1a2d2787681b0202bc9a.tar.gz
* Makefile.in (HOST_CFLAGS): Take out -DGENERATOR_FILE.
(CONFIG_H, TCONFIG_H, TM_P_H): Update. (GEN, STAGESTUFF): Add new files. (insn-constants.h, s-constants, tm-preds.h, s-preds, genconstants, genpreds, genconstants.o, genpreds.o): New rules. (hashtab.o, safe-ctype.o): Add -DGENERATOR_FILE. * mkconfig.sh: Include tm-preds.h in tm_p.h; insn-constants.h as well as insn-codes.h and insn-flags.h in config.h; and no extra headers in tconfig.h and hconfig.h. * gencodes.c: Eliminate code to generate predicate declarations or #defines for md-file constants. * genconstants.c, genpreds.c: New files. * i386.md: Re-order guard expressions such that TARGET_64BIT comes first, when this permits better optimization. Add TARGET_64BIT to more x86-64 patterns. Add comment explaining why this is desirable. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@44743 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/mkconfig.sh')
-rw-r--r--gcc/mkconfig.sh25
1 files changed, 19 insertions, 6 deletions
diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
index 03c1d9d4ffc..d43bc983d27 100644
--- a/gcc/mkconfig.sh
+++ b/gcc/mkconfig.sh
@@ -49,12 +49,25 @@ for def in $DEFINES; do
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 "#include \"insn-flags.h\""
-echo "#endif"
+# If this is tm_p.h, include tm-preds.h unconditionally.
+# If this is tconfig.h or hconfig.h, include no more files.
+# Otherwise, include insn-constants.h, insn-flags.h, and insn-codes.h,
+# but only if GENERATOR_FILE is not defined. (The last of those is
+# slated to be removed.)
+case $output in
+ *tm_p.h)
+ echo "#include \"tm-preds.h\""
+ ;;
+ *tconfig.h | *hconfig.h)
+ ;;
+ *)
+ echo "#ifndef GENERATOR_FILE"
+ echo "# include \"insn-constants.h\""
+ echo "# include \"insn-codes.h\""
+ echo "# include \"insn-flags.h\""
+ echo "#endif"
+ ;;
+esac
) > $output.T