5 files changed, 32 insertions, 15 deletions
diff --git a/gdb/config/i386/go32.mh b/gdb/config/i386/go32.mh
index 311ee1c272b..d4fa352adc5 100644
--- a/gdb/config/i386/go32.mh
+++ b/gdb/config/i386/go32.mh
@@ -1,8 +1,19 @@
-MH_CFLAGS=-D__GO32__ -D__MSDOS__
-XDEPFILES= go32-xdep.o
+# Host: Intel x86 running DJGPP
+# we don't need mmalloc on DJGPP
+MH_CFLAGS= -DNO_MMALLOC
+MMALLOC=
+MMALLOC_CFLAGS=
+
 XM_FILE= xm-go32.h
-HOST_IPC=-DDOS_IPC
+XDEPFILES=
+
+NAT_FILE= nm-go32.h
+NATDEPFILES= go32-nat.o
+
+TERMCAP= 
+HOST_IPC=
 SER_HARDWIRE= ser-go32.o
-CC=i386-go32-gcc -O2 -fno-omit-frame-pointer
+CC= gcc
+XM_CLIBS= -ldbg
 
 
diff --git a/gdb/config/i386/nm-i386sco5.h b/gdb/config/i386/nm-i386sco5.h
index 10e749ba1ff..155336cb13c 100644
--- a/gdb/config/i386/nm-i386sco5.h
+++ b/gdb/config/i386/nm-i386sco5.h
@@ -19,7 +19,7 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* Basically, its a lot like the older versions ... */
 #include "i386/nm-i386sco.h"
diff --git a/gdb/config/i386/tm-fbsd.h b/gdb/config/i386/tm-fbsd.h
index 9933e10a60f..419993db2fe 100644
--- a/gdb/config/i386/tm-fbsd.h
+++ b/gdb/config/i386/tm-fbsd.h
@@ -15,7 +15,7 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "i386/tm-i386bsd.h"
 
diff --git a/gdb/config/i386/tm-i386.h b/gdb/config/i386/tm-i386.h
index e2039e5fbfa..aeff2e1f263 100644
--- a/gdb/config/i386/tm-i386.h
+++ b/gdb/config/i386/tm-i386.h
@@ -15,7 +15,7 @@ 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., 675 Mass Ave, Cambridge, MA 02139, USA.  */
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #ifndef TM_I386_H
 #define TM_I386_H 1
diff --git a/gdb/config/i386/xm-go32.h b/gdb/config/i386/xm-go32.h
index 07978332207..562d457924a 100644
--- a/gdb/config/i386/xm-go32.h
+++ b/gdb/config/i386/xm-go32.h
@@ -1,5 +1,5 @@
-/* Definitions for hosting on GO32, for GDB.
-   Copyright 1991, 1992 Free Software Foundation, Inc.
+/* Host-dependent definitions for Intel x86 running DJGPP.
+   Copyright 1993-1996 Free Software Foundation, Inc.
 
 This file is part of GDB.
 
@@ -18,14 +18,20 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN
+
 #include "fopen-bin.h"
 
-/* Define this lseek(n) != nth byte of file */
-#define LSEEK_NOT_LINEAR
+#define GDBINIT_FILENAME "gdb.ini"
 
-#define CANT_FORK
+#define SLASH_P(X) ((X)=='\\' || (X) == '/')
 
-#undef QUIT
-#define QUIT  { pollquit(); }
+#define ROOTED_P(X) ((SLASH_P((X)[0]))|| ((X)[1] ==':'))
 
-#define GDBINIT_FILENAME "gdb.ini"
+#define SLASH_CHAR '/'
+#define SLASH_STRING "/"
+
+#define CRLF_SOURCE_FILES
+
+#define DIRNAME_SEPARATOR ';'
+
+#define HOST_I386