diff -r 4e1562059404 -r ec1cffe6d30b scripts/config.guess
--- a/scripts/config.guess	Sun Mar 15 20:52:50 2009 +0000
+++ b/scripts/config.guess	Thu May 21 19:00:55 2009 +0000
@@ -1115,8 +1115,11 @@
     pc:*:*:*)
 	# Left here for compatibility:
         # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
+        # the processor, so we play safe by assuming i586.
+	# Note: whatever this is, it MUST be the same as what config.sub
+	# prints for the "djgpp" host, or else GDB configury will decide that
+	# this is a cross-build.
+	echo i586-pc-msdosdjgpp
         exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3