Revert last commit, build problems.

1 files changed, 1 insertions, 38 deletions

diff --git a/sim/m32r/Makefile.in b/sim/m32r/Makefile.in
index 2a22fb8..18d9d3f 100644
--- a/sim/m32r/Makefile.in
+++ b/sim/m32r/Makefile.in
@@ -22,7 +22,6 @@
 
 M32R_OBJS = m32r.o cpu.o decode.o sem.o model.o mloop.o
 M32RX_OBJS = m32rx.o cpux.o decodex.o modelx.o mloopx.o
-M32R2_OBJS = m32r2.o cpu2.o decode2.o model2.o mloop2.o
 
 CONFIG_DEVICES = dv-sockser.o
 CONFIG_DEVICES =
@@ -39,7 +38,6 @@ SIM_OBJS = \
 	sim-if.o arch.o \
 	$(M32R_OBJS) \
 	$(M32RX_OBJS) \
-	$(M32R2_OBJS) \
 	traps.o devices.o \
 	$(CONFIG_DEVICES)
 
@@ -115,35 +113,10 @@ decodex.o: decodex.c $(M32RXF_INCLUDE_DEPS)
 semx.o: semx.c $(M32RXF_INCLUDE_DEPS)
 modelx.o: modelx.c $(M32RXF_INCLUDE_DEPS)
 
-# M32R2 objs
-                                                                                
-M32R2F_INCLUDE_DEPS = \
-	$(CGEN_MAIN_CPU_DEPS) \
-	cpu2.h decode2.h eng2.h
-                                                                                
-m32r2.o: m32r2.c $(M32R2F_INCLUDE_DEPS)
-                                                                                
-# FIXME: Use of `mono' is wip.
-mloop2.c eng2.h: stamp-2mloop
-stamp-2mloop: $(srcdir)/../common/genmloop.sh mloop2.in Makefile
-	$(SHELL) $(srccom)/genmloop.sh \
-		-mono -no-fast -pbb -parallel-write -switch sem2-switch.c \
-		-cpu m32r2f -infile $(srcdir)/mloop2.in
-	$(SHELL) $(srcroot)/move-if-change eng.hin eng2.h
-	$(SHELL) $(srcroot)/move-if-change mloop.cin mloop2.c
-	touch stamp-2mloop
-mloop2.o: mloop2.c sem2-switch.c $(M32R2F_INCLUDE_DEPS)
-
-cpu2.o: cpu2.c $(M32R2F_INCLUDE_DEPS)
-decode2.o: decode2.c $(M32R2F_INCLUDE_DEPS)
-sem2.o: sem2.c $(M32R2F_INCLUDE_DEPS)
-model2.o: model2.c $(M32R2F_INCLUDE_DEPS)
-
 m32r-clean:
 	rm -f mloop.c eng.h stamp-mloop
 	rm -f mloopx.c engx.h stamp-xmloop
-	rm -f mloop2.c eng2.h stamp-2mloop
-	rm -f stamp-arch stamp-cpu stamp-xcpu stamp-2cpu
+	rm -f stamp-arch stamp-cpu stamp-xcpu
 	rm -f tmp-*
 
 # cgen support, enable with --enable-cgen-maint
@@ -175,13 +148,3 @@ stamp-xcpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/
 	  EXTRAFILES="$(CGEN_CPU_SEMSW)"
 	touch stamp-xcpu
 cpux.h semx-switch.c modelx.c decodex.c decodex.h: $(CGEN_MAINT) stamp-xcpu
-
-stamp-2cpu: $(CGEN_READ_SCM) $(CGEN_CPU_SCM) $(CGEN_DECODE_SCM) $(CGEN_CPU_DIR)/m32r.cpu
-	$(MAKE) cgen-cpu-decode $(CGEN_FLAGS_TO_PASS) \
-	  cpu=m32r2f mach=m32r2 SUFFIX=2 \
-	  archfile=$(CGEN_CPU_DIR)/m32r.cpu \
-	  FLAGS="with-scache with-profile=fn" \
-	  EXTRAFILES="$(CGEN_CPU_SEMSW)"
-	touch stamp-2cpu
-cpu2.h sem2-switch.c model2.c decode2.c decode2.h: $(CGEN_MAINT) stamp-2cpu
-