diff -urN src.orig/config.guess src/config.guess
--- src.orig/config.guess	2007-07-30 19:17:26.000000000 +0300
+++ src/config.guess	2007-07-30 19:19:06.000000000 +0300
@@ -222,6 +222,9 @@
     Power*Macintosh:Darwin:*:*)
 	echo powerpc-apple-darwin${UNAME_RELEASE}
 	exit 0 ;;
+    i386:Darwin:*:*)
+	echo i386-apple-darwin${UNAME_RELEASE}
+	exit 0 ;;
     powerpc:machten:*:*)
 	echo powerpc-apple-machten${UNAME_RELEASE}
 	exit 0 ;;
diff -urN src.orig/gcc/configure src/gcc/configure
--- src.orig/gcc/configure	2007-07-30 19:16:58.000000000 +0300
+++ src/gcc/configure	2007-07-30 19:19:06.000000000 +0300
@@ -4330,8 +4330,11 @@
 		use_collect2=yes
 		;;
 	powerpc-apple-darwin*)
-       xmake_file=rs6000/x-darwin
-       ;;
+		xmake_file=rs6000/x-darwin
+		;;
+	i386-apple-darwin*)
+		xmake_file=i386/x-darwin
+		;;
 	powerpc-*-beos*)
 		cpu_type=rs6000
 		tm_file=rs6000/beos.h
diff -urN src.orig/gcc/configure.in src/gcc/configure.in
--- src.orig/gcc/configure.in	2007-07-30 19:16:58.000000000 +0300
+++ src/gcc/configure.in	2007-07-30 19:19:06.000000000 +0300
@@ -2328,8 +2328,11 @@
 		use_collect2=yes
 		;;
 	powerpc-apple-darwin*)
-       xmake_file=rs6000/x-darwin
-       ;;
+		xmake_file=rs6000/x-darwin
+		;;
+	i386-apple-darwin*)
+		xmake_file=i386/x-darwin
+		;;
 	powerpc-*-beos*)
 		cpu_type=rs6000
 		tm_file=rs6000/beos.h
diff -urN src.orig/gdb/config/i386/macos.mh src/gdb/config/i386/macos.mh
--- src.orig/gdb/config/i386/macos.mh	1970-01-01 02:00:00.000000000 +0200
+++ src/gdb/config/i386/macos.mh	2007-07-30 19:22:39.000000000 +0300
@@ -0,0 +1,3 @@
+
+NATDEPFILES= mac-nat.o
+NAT_FILE= nm-macos.h
diff -urN src.orig/gdb/config/i386/nm-macos.h src/gdb/config/i386/nm-macos.h
--- src.orig/gdb/config/i386/nm-macos.h	1970-01-01 02:00:00.000000000 +0200
+++ src/gdb/config/i386/nm-macos.h	2007-07-30 19:23:18.000000000 +0300
@@ -0,0 +1,20 @@
+/* i386 native-dependent macros for GDB, the GNU debugger.
+   Copyright (C) 1995 Free Software Foundation, Inc.
+
+This file is part of GDB.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+
+/* Nothing needed, at least so far.  */
diff -urN src.orig/gdb/configure.host src/gdb/configure.host
--- src.orig/gdb/configure.host	2007-07-30 19:17:14.000000000 +0300
+++ src/gdb/configure.host	2007-07-30 19:19:06.000000000 +0300
@@ -29,6 +29,7 @@
 case "${host}" in
 
 powerpc-apple-darwin*)		gdb_host=macos ;;
+i386-apple-darwin*)		gdb_host=macos ;;
 
 a29k-*-*)		gdb_host=ultra3 ;;