diff -up m68hc05-gnu/Makefile.in.werror m68hc05-gnu/Makefile.in
--- m68hc05-gnu/Makefile.in.werror	2008-08-01 12:13:12.000000000 +0200
+++ m68hc05-gnu/Makefile.in	2008-08-02 11:17:32.000000000 +0200
@@ -259,7 +259,7 @@ YACC = @YACC@
 FLEX = @FLEX@
 LEX = @LEX@
 M4 = @M4@
-MAKEINFO = @MAKEINFO@
+MAKEINFO = makeinfo
 EXPECT = @EXPECT@
 RUNTEST = @RUNTEST@
 
@@ -331,9 +331,11 @@ COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_
 # CFLAGS will be just -g.  We want to ensure that TARGET libraries
 # (which we know are built with gcc) are built with optimizations so
 # prepend -O2 when setting CFLAGS_FOR_TARGET.
-CFLAGS_FOR_TARGET = -O2 $(CFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
+CFLAGS_TMP = `echo $(CFLAGS) | sed -e 's/-m32//; s/-march=i386//; s/-mtune=generic//;'`
+CFLAGS_FOR_TARGET = -O2 $(CFLAGS_TMP) $(SYSROOT_CFLAGS_FOR_TARGET)
 SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET)
+CXXFAGS_TMP = `echo $(CXXFLAGS) | sed -e 's/-m32//; s/-march=i386//; s/-mtune=generic//;'`
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS_TMP) $(SYSROOT_CFLAGS_FOR_TARGET)
 LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
 LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
 LDFLAGS_FOR_TARGET = 
@@ -5656,7 +5658,7 @@ configure-binutils: 
 	srcdiroption="--srcdir=$${topdir}/binutils"; \
 	libsrcdir="$$s/binutils"; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
+	  $(HOST_CONFIGARGS) --disable-werror $${srcdiroption}  \
 	  || exit 1
 @endif binutils
 
@@ -11103,7 +11105,7 @@ configure-gas: 
 	srcdiroption="--srcdir=$${topdir}/gas"; \
 	libsrcdir="$$s/gas"; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
+	  $(HOST_CONFIGARGS) --disable-werror $${srcdiroption}  \
 	  || exit 1
 @endif gas
 
@@ -13638,7 +13640,7 @@ configure-gprof: 
 	srcdiroption="--srcdir=$${topdir}/gprof"; \
 	libsrcdir="$$s/gprof"; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
+	  $(HOST_CONFIGARGS) --disable-werror $${srcdiroption}  \
 	  || exit 1
 @endif gprof
 
@@ -28962,7 +28964,7 @@ configure-gdb: 
 	srcdiroption="--srcdir=$${topdir}/gdb"; \
 	libsrcdir="$$s/gdb"; \
 	$(SHELL) $${libsrcdir}/configure \
-	  $(HOST_CONFIGARGS) $${srcdiroption}  \
+	  $(HOST_CONFIGARGS) --disable-werror $${srcdiroption}  \
 	  || exit 1
 @endif gdb