Move the creation of the insn-*.c files from cc_tools to cc_int.

This gets rid of a cross build problem we have because we build
everything in cc_tools during the `make build-tools' (or `make depend')
stage.

2 files changed, 13 insertions, 7 deletions

diff --git a/gnu/usr.bin/cc/cc_int/Makefile b/gnu/usr.bin/cc/cc_int/Makefile
index aa15d23..d91be41 100644
--- a/gnu/usr.bin/cc/cc_int/Makefile
+++ b/gnu/usr.bin/cc/cc_int/Makefile
@@ -13,8 +13,7 @@ SRCS=	c-aux-info.c c-common.c c-convert.c c-iterate.c \
 	caller-save.c calls.c combine.c convert.c cse.c \
 	dbxout.c dwarfout.c emit-rtl.c explow.c expmed.c expr.c \
 	final.c flow.c fold-const.c function.c getpwd.c global.c graph.c \
-	hash.c insn-attrtab.c insn-emit.c insn-extract.c insn-opinit.c \
-	insn-output.c insn-peep.c insn-recog.c \
+	hash.c \
 	integrate.c jump.c lcm.c local-alloc.c loop.c optabs.c \
 	print-rtl.c print-tree.c real.c recog.c reg-stack.c regclass.c \
 	reload.c reload1.c reorg.c rtl.c rtlanal.c \
@@ -29,6 +28,15 @@ SRCS+=	haifa-sched.c
 SRCS+=	sched.c
 .endif
 
+# insn-* gunk -- headers are built in cc_tools, as they are used by the
+# "build-tools"
+.for F in attrtab emit extract opinit output peep recog
+SRCS+=	insn-$F.c
+CLEANFILES+= insn-$F.c
+insn-$F.c: ${.OBJDIR}/../cc_tools/gen$F ${MD_FILE}
+	${.OBJDIR}/../cc_tools/gen$F ${MD_FILE} > insn-$F.c
+.endfor
+
 #	shared between the drivers
 SRCS+=	multilib.h choose-temp.c obstack.c prefix.c pexecute.c version.c
 
diff --git a/gnu/usr.bin/cc/cc_tools/Makefile b/gnu/usr.bin/cc/cc_tools/Makefile
index 9d84e9a..a23879f 100644
--- a/gnu/usr.bin/cc/cc_tools/Makefile
+++ b/gnu/usr.bin/cc/cc_tools/Makefile
@@ -26,11 +26,9 @@ insn-$F.h: gen$F ${MD_FILE}
 GENSRCS+=	insn-$F.h
 .endfor
 
-.for F in attrtab emit extract opinit output peep recog
-insn-$F.c: gen$F ${MD_FILE}
-	./gen$F ${MD_FILE} > insn-$F.c
-GENSRCS+=	insn-$F.c
-.endfor
+GENSRCS+=	gen-time-stamp
+gen-time-stamp: genattrtab genemit genextract genopinit genoutput genpeep genrecog
+	touch ${.TARGET}
 
 .for F in attr codes config emit extract flags opinit output peep recog
 build-tools: gen$F