diff --git a/gnu/usr.bin/gcc4/frontend/multilib.h b/gnu/usr.bin/gcc4/arch/alpha/multilib.h
similarity index 55%
rename from gnu/usr.bin/gcc4/frontend/multilib.h
rename to gnu/usr.bin/gcc4/arch/alpha/multilib.h
index 47fab21a8b5c..8ced181ca0d2 100644
--- a/gnu/usr.bin/gcc4/frontend/multilib.h
+++ b/gnu/usr.bin/gcc4/arch/alpha/multilib.h
@@ -1,5 +1,6 @@
-/*	$NetBSD: multilib.h,v 1.1 2006/05/10 22:48:12 mrg Exp $	*/
-/* For the moment we don't do multilib.  Use a static empty multilib spec file. */
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
 
 static const char *const multilib_raw[] = {
 ". ;",
diff --git a/gnu/usr.bin/gcc4/arch/arm/multilib.h b/gnu/usr.bin/gcc4/arch/arm/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/arm/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/armeb/multilib.h b/gnu/usr.bin/gcc4/arch/armeb/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/armeb/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/hppa/multilib.h b/gnu/usr.bin/gcc4/arch/hppa/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/hppa/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/i386/multilib.h b/gnu/usr.bin/gcc4/arch/i386/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/i386/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/m68000/multilib.h b/gnu/usr.bin/gcc4/arch/m68000/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/m68000/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/m68k/multilib.h b/gnu/usr.bin/gcc4/arch/m68k/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/m68k/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/mipseb/multilib.h b/gnu/usr.bin/gcc4/arch/mipseb/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/mipseb/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/mipsel/multilib.h b/gnu/usr.bin/gcc4/arch/mipsel/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/mipsel/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/powerpc/multilib.h b/gnu/usr.bin/gcc4/arch/powerpc/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/powerpc/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/sh3eb/multilib.h b/gnu/usr.bin/gcc4/arch/sh3eb/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/sh3eb/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/sh3el/multilib.h b/gnu/usr.bin/gcc4/arch/sh3el/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/sh3el/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/sparc/multilib.h b/gnu/usr.bin/gcc4/arch/sparc/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/sparc/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/sparc64/multilib.h b/gnu/usr.bin/gcc4/arch/sparc64/multilib.h
new file mode 100644
index 000000000000..ec11f1db61e6
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/sparc64/multilib.h
@@ -0,0 +1,26 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". !m64 !m32;",
+".:. m64 !m32;",
+".:../lib/sparc !m64 m32;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+"m64 m64;",
+"m32 m32;",
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "m64/m32";
+
+#define DISABLE_MULTILIB  1
diff --git a/gnu/usr.bin/gcc4/arch/vax/multilib.h b/gnu/usr.bin/gcc4/arch/vax/multilib.h
new file mode 100644
index 000000000000..8ced181ca0d2
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/vax/multilib.h
@@ -0,0 +1,20 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". ;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "";
diff --git a/gnu/usr.bin/gcc4/arch/x86_64/multilib.h b/gnu/usr.bin/gcc4/arch/x86_64/multilib.h
new file mode 100644
index 000000000000..333ef9621c8b
--- /dev/null
+++ b/gnu/usr.bin/gcc4/arch/x86_64/multilib.h
@@ -0,0 +1,26 @@
+/* This file is automatically generated.  DO NOT EDIT! */
+/* Generated from: 	NetBSD: mknative-gcc,v 1.25 2008/10/11 05:03:44 mrg Exp  */
+/* Generated from: NetBSD: mknative.common,v 1.9 2007/02/05 18:26:01 apb Exp  */
+
+static const char *const multilib_raw[] = {
+". !m64 !m32;",
+".:. m64 !m32;",
+".:../lib/i386 !m64 m32;",
+NULL
+};
+
+static const char *const multilib_matches_raw[] = {
+"m64 m64;",
+"m32 m32;",
+NULL
+};
+
+static const char *multilib_extra = "";
+
+static const char *const multilib_exclusions_raw[] = {
+NULL
+};
+
+static const char *multilib_options = "m64/m32";
+
+#define DISABLE_MULTILIB  1
diff --git a/gnu/usr.bin/gcc4/frontend/Makefile b/gnu/usr.bin/gcc4/frontend/Makefile
index 67eec6b8d009..4fe8a3bd5ac2 100644
--- a/gnu/usr.bin/gcc4/frontend/Makefile
+++ b/gnu/usr.bin/gcc4/frontend/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.3 2008/05/03 14:48:30 lukem Exp $
+#	$NetBSD: Makefile,v 1.4 2008/10/12 10:08:13 mrg Exp $
 
 LIBISPRIVATE=	yes
 
@@ -9,14 +9,14 @@ LIB=		frontend
 
 SRCS=		gcc.c version.c intl.c prefix.c
 
-CPPFLAGS+=	-I${.CURDIR} -I${GCCARCH} -I${BACKENDOBJ} -I. \
+CPPFLAGS+=	-I${GCCARCH} -I${BACKENDOBJ} -I. \
 		${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*} \
 		-DPREFIX=\"/usr\" \
 		-DDEFAULT_TARGET_VERSION=\"${G_version}\" \
 		-DDEFAULT_TARGET_MACHINE=\"${MACHINE_GNU_PLATFORM}\"
 HOST_CPPFLAGS+=	-I${GCCARCH} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*}
 
-DPSRCS+=	multilib.h specs.h
+DPSRCS+=	specs.h
 
 MKPIC:=		no
 MKPICLIB:=	no