[commit] Use cpu/xc16x.*, not cgen/cpu/xc16x.*.

[commit] Use cpu/xc16x.*, not cgen/cpu/xc16x.*.

[Doug Evans]

Hi.

This patch removes the copy of xc16x.{cpu,opc} in cgen/cpu
and uses the copy in cpu.

Tested by regenerating opcodes/xc16x*, no changes.

2009-11-14  Doug Evans  <dje@sebabeach.org>

	opcodes/
	* Makefile.am (stamp-xc16x): Use ../cpu/xc16x.cpu instead of
	../cgen/cpu.
	* Makefile.in: Regenerate.

	cgen/
	* cpu/xc16x.cpu: Delete, use copy in ../cpu.
	* cpu/xc16x.opc: Ditto.

Index: Makefile.am
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.am,v
retrieving revision 1.155
diff -u -p -r1.155 Makefile.am
--- Makefile.am	27 Oct 2009 01:49:26 -0000	1.155
+++ Makefile.am	14 Nov 2009 19:51:20 -0000
@@ -439,9 +439,11 @@ stamp-openrisc: $(CGENDEPS) $(CPUDIR)/op
 
 $(srcdir)/xc16x-desc.h $(srcdir)/xc16x-desc.c $(srcdir)/xc16x-opc.h $(srcdir)/xc16x-opc.c $(srcdir)/xc16x-ibld.c $(srcdir)/xc16x-asm.c $(srcdir)/xc16x-dis.c: $(XC16X_DEPS)
 	@true
-stamp-xc16x: $(CGENDEPS) $(CPUDIR)/xc16x.cpu $(CPUDIR)/xc16x.opc
+stamp-xc16x: $(CGENDEPS) $(srcdir)/../cpu/xc16x.cpu $(srcdir)/../cpu/xc16x.opc
 	$(MAKE) run-cgen arch=xc16x prefix=xc16x options= \
-		archfile=$(CPUDIR)/xc16x.cpu opcfile=$(CPUDIR)/xc16x.opc extrafiles=
+		archfile=$(srcdir)/../cpu/xc16x.cpu \
+		opcfile=$(srcdir)/../cpu/xc16x.opc \
+		extrafiles=
 
 $(srcdir)/xstormy16-desc.h $(srcdir)/xstormy16-desc.c $(srcdir)/xstormy16-opc.h $(srcdir)/xstormy16-opc.c $(srcdir)/xstormy16-ibld.c $(srcdir)/xstormy16-asm.c $(srcdir)/xstormy16-dis.c: $(XSTORMY16_DEPS)
 	@true
Index: Makefile.in
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.in,v
retrieving revision 1.174
diff -u -p -r1.174 Makefile.in
--- Makefile.in	27 Oct 2009 01:49:26 -0000	1.174
+++ Makefile.in	14 Nov 2009 19:51:20 -0000
@@ -1288,9 +1288,11 @@ stamp-openrisc: $(CGENDEPS) $(CPUDIR)/op
 
 $(srcdir)/xc16x-desc.h $(srcdir)/xc16x-desc.c $(srcdir)/xc16x-opc.h $(srcdir)/xc16x-opc.c $(srcdir)/xc16x-ibld.c $(srcdir)/xc16x-asm.c $(srcdir)/xc16x-dis.c: $(XC16X_DEPS)
 	@true
-stamp-xc16x: $(CGENDEPS) $(CPUDIR)/xc16x.cpu $(CPUDIR)/xc16x.opc
+stamp-xc16x: $(CGENDEPS) $(srcdir)/../cpu/xc16x.cpu $(srcdir)/../cpu/xc16x.opc
 	$(MAKE) run-cgen arch=xc16x prefix=xc16x options= \
-		archfile=$(CPUDIR)/xc16x.cpu opcfile=$(CPUDIR)/xc16x.opc extrafiles=
+		archfile=$(srcdir)/../cpu/xc16x.cpu \
+		opcfile=$(srcdir)/../cpu/xc16x.opc \
+		extrafiles=
 
 $(srcdir)/xstormy16-desc.h $(srcdir)/xstormy16-desc.c $(srcdir)/xstormy16-opc.h $(srcdir)/xstormy16-opc.c $(srcdir)/xstormy16-ibld.c $(srcdir)/xstormy16-asm.c $(srcdir)/xstormy16-dis.c: $(XSTORMY16_DEPS)
 	@true