--- binutils-2.20.51.0.1/opcodes/Makefile.am.dist	2009-09-16 11:34:50.806672280 +0100
+++ binutils-2.20.51.0.1/opcodes/Makefile.am	2009-09-16 11:35:47.726809560 +0100
@@ -457,41 +457,41 @@
 MAINTAINERCLEANFILES = $(srcdir)/i386-tbl.h $(srcdir)/i386-init.h \
 	$(srcdir)/ia64-asmtab.c s390-opc.tab $(srcdir)/z8k-opc.h
 
-i386-gen$(EXEEXT_FOR_BUILD): i386-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
-	$(LINK_FOR_BUILD) i386-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
+#i386-gen$(EXEEXT_FOR_BUILD): i386-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
+#	$(LINK_FOR_BUILD) i386-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
 
-i386-gen.o: i386-gen.c i386-opc.h $(srcdir)/../include/opcode/i386.h \
-	$(INCDIR)/ansidecl.h $(INCDIR)/getopt.h $(INCDIR)/hashtab.h \
-	$(INCDIR)/libiberty.h $(INCDIR)/opcode/i386.h $(INCDIR)/safe-ctype.h \
-	config.h i386-opc.h sysdep.h
-	$(COMPILE_FOR_BUILD) -c $(srcdir)/i386-gen.c
-
-$(srcdir)/i386-tbl.h: $(srcdir)/i386-init.h 
-	@echo $@
-
-$(srcdir)/i386-init.h: @MAINT@ i386-gen$(EXEEXT_FOR_BUILD) i386-opc.tbl i386-reg.tbl
-	./i386-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir)
-
-i386-opc.lo: $(srcdir)/i386-tbl.h
-
-ia64-gen$(EXEEXT_FOR_BUILD): ia64-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
-	$(LINK_FOR_BUILD) ia64-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
-
-ia64-gen.o: ia64-gen.c $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/getopt.h \
-	$(INCDIR)/libiberty.h $(INCDIR)/opcode/ia64.h $(INCDIR)/safe-ctype.h \
-	$(INCDIR)/symcat.h config.h ia64-opc-a.c ia64-opc-b.c \
-	ia64-opc-d.c ia64-opc-f.c ia64-opc-i.c ia64-opc-m.c \
-	ia64-opc-x.c ia64-opc.h sysdep.h
-	$(COMPILE_FOR_BUILD) -c $(srcdir)/ia64-gen.c
+#i386-gen.o: i386-gen.c i386-opc.h $(srcdir)/../include/opcode/i386.h \
+#	$(INCDIR)/ansidecl.h $(INCDIR)/getopt.h $(INCDIR)/hashtab.h \
+#	$(INCDIR)/libiberty.h $(INCDIR)/opcode/i386.h $(INCDIR)/safe-ctype.h \
+#	config.h i386-opc.h sysdep.h
+#	$(COMPILE_FOR_BUILD) -c $(srcdir)/i386-gen.c
+
+#$(srcdir)/i386-tbl.h: $(srcdir)/i386-init.h 
+#	@echo $@
+
+#$(srcdir)/i386-init.h: @MAINT@ i386-gen$(EXEEXT_FOR_BUILD) i386-opc.tbl i386-reg.tbl
+#	./i386-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir)
+
+#i386-opc.lo: $(srcdir)/i386-tbl.h
+
+#ia64-gen$(EXEEXT_FOR_BUILD): ia64-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
+#	$(LINK_FOR_BUILD) ia64-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
+
+#ia64-gen.o: ia64-gen.c $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/getopt.h \
+#	$(INCDIR)/libiberty.h $(INCDIR)/opcode/ia64.h $(INCDIR)/safe-ctype.h \
+#	$(INCDIR)/symcat.h config.h ia64-opc-a.c ia64-opc-b.c \
+#	ia64-opc-d.c ia64-opc-f.c ia64-opc-i.c ia64-opc-m.c \
+#	ia64-opc-x.c ia64-opc.h sysdep.h
+#	$(COMPILE_FOR_BUILD) -c $(srcdir)/ia64-gen.c
 
 # Use a helper variable for the dependencies to avoid 'make' issues
 # with continuations in comments, as @MAINT@ can be expanded to '#'.
-ia64_asmtab_deps = ia64-gen$(EXEEXT_FOR_BUILD) ia64-ic.tbl \
-	ia64-raw.tbl ia64-waw.tbl ia64-war.tbl
-$(srcdir)/ia64-asmtab.c: @MAINT@ $(ia64_asmtab_deps)
-	./ia64-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir) > $@
+#ia64_asmtab_deps = ia64-gen$(EXEEXT_FOR_BUILD) ia64-ic.tbl \
+#	ia64-raw.tbl ia64-waw.tbl ia64-war.tbl
+#$(srcdir)/ia64-asmtab.c: @MAINT@ $(ia64_asmtab_deps)
+#	./ia64-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir) > $@
 
-ia64-opc.lo: $(srcdir)/ia64-asmtab.c
+#ia64-opc.lo: $(srcdir)/ia64-asmtab.c
 
 s390-mkopc$(EXEEXT_FOR_BUILD): s390-mkopc.c
 	$(COMPILE_FOR_BUILD) -o s390-mkopc $(srcdir)/s390-mkopc.c
@@ -501,16 +501,16 @@
 
 s390-opc.lo: s390-opc.tab
 
-z8kgen$(EXEEXT_FOR_BUILD): z8kgen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
-	$(LINK_FOR_BUILD) z8kgen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
+#z8kgen$(EXEEXT_FOR_BUILD): z8kgen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
+#	$(LINK_FOR_BUILD) z8kgen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
 
-z8kgen.o: z8kgen.c
-	$(COMPILE_FOR_BUILD) -c $(srcdir)/z8kgen.c
+#z8kgen.o: z8kgen.c
+#	$(COMPILE_FOR_BUILD) -c $(srcdir)/z8kgen.c
 
-$(srcdir)/z8k-opc.h: @MAINT@ z8kgen$(EXEEXT_FOR_BUILD)
-	./z8kgen$(EXEEXT_FOR_BUILD) -a > $@
+#$(srcdir)/z8k-opc.h: @MAINT@ z8kgen$(EXEEXT_FOR_BUILD)
+#	./z8kgen$(EXEEXT_FOR_BUILD) -a > $@
 
-z8k-dis.lo: $(srcdir)/z8k-opc.h
+#z8k-dis.lo: $(srcdir)/z8k-opc.h
 
 sh-dis.lo: sh-dis.c
 if am__fastdepCC
--- binutils-2.20.51.0.1/opcodes/Makefile.in.dist	2009-09-16 11:34:56.339564760 +0100
+++ binutils-2.20.51.0.1/opcodes/Makefile.in	2009-09-16 11:36:17.237912440 +0100
@@ -1297,36 +1297,36 @@
 	$(MAKE) run-cgen arch=xc16x prefix=xc16x options= \
 		archfile=$(CPUDIR)/xc16x.cpu opcfile=$(CPUDIR)/xc16x.opc extrafiles=
 
-i386-gen$(EXEEXT_FOR_BUILD): i386-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
-	$(LINK_FOR_BUILD) i386-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
+#i386-gen$(EXEEXT_FOR_BUILD): i386-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
+#	$(LINK_FOR_BUILD) i386-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
 
-i386-gen.o: i386-gen.c i386-opc.h $(srcdir)/../include/opcode/i386.h \
+#i386-gen.o: i386-gen.c i386-opc.h $(srcdir)/../include/opcode/i386.h \
 	$(INCDIR)/ansidecl.h $(INCDIR)/getopt.h $(INCDIR)/hashtab.h \
 	$(INCDIR)/libiberty.h $(INCDIR)/opcode/i386.h $(INCDIR)/safe-ctype.h \
 	config.h i386-opc.h sysdep.h
-	$(COMPILE_FOR_BUILD) -c $(srcdir)/i386-gen.c
+#	$(COMPILE_FOR_BUILD) -c $(srcdir)/i386-gen.c
 
-$(srcdir)/i386-tbl.h: $(srcdir)/i386-init.h 
-	@echo $@
+#$(srcdir)/i386-tbl.h: $(srcdir)/i386-init.h 
+#	@echo $@
 
-$(srcdir)/i386-init.h: @MAINT@ i386-gen$(EXEEXT_FOR_BUILD) i386-opc.tbl i386-reg.tbl
-	./i386-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir)
+#$(srcdir)/i386-init.h: @MAINT@ i386-gen$(EXEEXT_FOR_BUILD) i386-opc.tbl i386-reg.tbl
+#	./i386-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir)
 
-i386-opc.lo: $(srcdir)/i386-tbl.h
+#i386-opc.lo: $(srcdir)/i386-tbl.h
 
-ia64-gen$(EXEEXT_FOR_BUILD): ia64-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
-	$(LINK_FOR_BUILD) ia64-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
+#ia64-gen$(EXEEXT_FOR_BUILD): ia64-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
+#	$(LINK_FOR_BUILD) ia64-gen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
 
-ia64-gen.o: ia64-gen.c $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/getopt.h \
+#ia64-gen.o: ia64-gen.c $(BFD_H) $(INCDIR)/ansidecl.h $(INCDIR)/getopt.h \
 	$(INCDIR)/libiberty.h $(INCDIR)/opcode/ia64.h $(INCDIR)/safe-ctype.h \
 	$(INCDIR)/symcat.h config.h ia64-opc-a.c ia64-opc-b.c \
 	ia64-opc-d.c ia64-opc-f.c ia64-opc-i.c ia64-opc-m.c \
 	ia64-opc-x.c ia64-opc.h sysdep.h
-	$(COMPILE_FOR_BUILD) -c $(srcdir)/ia64-gen.c
-$(srcdir)/ia64-asmtab.c: @MAINT@ $(ia64_asmtab_deps)
-	./ia64-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir) > $@
+#	$(COMPILE_FOR_BUILD) -c $(srcdir)/ia64-gen.c
+#$(srcdir)/ia64-asmtab.c: @MAINT@ $(ia64_asmtab_deps)
+#	./ia64-gen$(EXEEXT_FOR_BUILD) --srcdir $(srcdir) > $@
 
-ia64-opc.lo: $(srcdir)/ia64-asmtab.c
+#ia64-opc.lo: $(srcdir)/ia64-asmtab.c
 
 s390-mkopc$(EXEEXT_FOR_BUILD): s390-mkopc.c
 	$(COMPILE_FOR_BUILD) -o s390-mkopc $(srcdir)/s390-mkopc.c
@@ -1336,16 +1336,16 @@
 
 s390-opc.lo: s390-opc.tab
 
-z8kgen$(EXEEXT_FOR_BUILD): z8kgen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
-	$(LINK_FOR_BUILD) z8kgen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
+#z8kgen$(EXEEXT_FOR_BUILD): z8kgen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
+#	$(LINK_FOR_BUILD) z8kgen.o $(BUILD_LIBIBERTY) $(BUILD_LIBINTL)
 
-z8kgen.o: z8kgen.c
-	$(COMPILE_FOR_BUILD) -c $(srcdir)/z8kgen.c
+#z8kgen.o: z8kgen.c
+#	$(COMPILE_FOR_BUILD) -c $(srcdir)/z8kgen.c
 
-$(srcdir)/z8k-opc.h: @MAINT@ z8kgen$(EXEEXT_FOR_BUILD)
-	./z8kgen$(EXEEXT_FOR_BUILD) -a > $@
+#$(srcdir)/z8k-opc.h: @MAINT@ z8kgen$(EXEEXT_FOR_BUILD)
+#	./z8kgen$(EXEEXT_FOR_BUILD) -a > $@
 
-z8k-dis.lo: $(srcdir)/z8k-opc.h
+#z8k-dis.lo: $(srcdir)/z8k-opc.h
 
 sh-dis.lo: sh-dis.c
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ @archdefs@ $(srcdir)/sh-dis.c