go32.h: Delete.

        * config/i386/go32.h: Delete.
        * config/i386/djgpp.h: New. Renamed from go32.h.
        Added -DDJGPP=2 to CPP_PREDEFINES.
        * config/i386/go32-rtems.h: Delete.
        * config/i386/djgpp-rtems.h: New. Renamed from go32-rtems.h.
        Added -DDJGPP=2 to CPP_PREDEFINES.
        * config/i386/xm-go32.h: Delete.
        * config/i386/xm-djgpp.h: New. Renamed from xm-go32.h.
        * config/i386/x-go32: Delete.
        * config/i386/x-djgpp: New. Renamed from x-go32.
        * config/i386/t-go32: Delete.
        * config/i386/t-djgpp: New. Renamed from t-go32.
        * configure.in(pc-msdosdjgpp): Set xm_file to i386/xm-djgpp.h.
        Set tm_file to i386/djgpp.h. Set tmake_file to i386/t-djgpp.
        Set xmake_file to i386/x-djgpp.
        * configure: Rebuilt.

From-SVN: r25835

gcc/ChangeLog

@@ -12,6 +12,23 @@ Wed Mar 17 23:00:18 1999  Robert Lipe <robertlipe@usa.net>
 
 Wed Mar 17 22:46:13 1999  Mark Elbrecht  <snowball3@usa.net.
 
+	* config/i386/go32.h: Delete.
+	* config/i386/djgpp.h: New. Renamed from go32.h.
+  	Added -DDJGPP=2 to CPP_PREDEFINES.
+	* config/i386/go32-rtems.h: Delete.
+	* config/i386/djgpp-rtems.h: New. Renamed from go32-rtems.h.
+  	Added -DDJGPP=2 to CPP_PREDEFINES.
+	* config/i386/xm-go32.h: Delete.
+	* config/i386/xm-djgpp.h: New. Renamed from xm-go32.h.
+	* config/i386/x-go32: Delete.
+	* config/i386/x-djgpp: New. Renamed from x-go32.
+	* config/i386/t-go32: Delete.
+	* config/i386/t-djgpp: New. Renamed from t-go32.
+	* configure.in(pc-msdosdjgpp): Set xm_file to i386/xm-djgpp.h.
+  	Set tm_file to i386/djgpp.h. Set tmake_file to i386/t-djgpp.
+  	Set xmake_file to i386/x-djgpp.
+	* configure: Rebuilt.
+
 	* gcc.c (process_command): Dump link_command_spec too.
 
 Wed Mar 17 20:38:08 1999  Jerry Quinn <jquinn@nortelnetworks.com>

gcc/config/i386/go32-rtems.h → gcc/config/i386/djgpp-rtems.h

 /* Configuration for an i386 running RTEMS on top of MS-DOS with
-   djgpp/go32 v1.x.
+   DJGPP v2.x.
 
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996,1999 Free Software Foundation, Inc.
    Contributed by Joel Sherrill (joel@OARcorp.com).
  
 This file is part of GNU CC.
@@ -21,20 +21,21 @@ along with GNU CC; see the file COPYING.  If not, write to
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-#include "i386/go32.h"
+#include "i386/djgpp.h"
 
 /* Specify predefined symbols in preprocessor.  */
 
 #ifdef CPP_PREDEFINES
 #undef CPP_PREDEFINES
 #endif
-#define CPP_PREDEFINES "-Dunix -Di386 -DGO32 -DMSDOS -Drtems -D__rtems__ \
-  -Asystem(unix) -Asystem(msdos) -Acpu(i386) -Amachine(i386) -Asystem(rtems)"
+#define CPP_PREDEFINES "-Dunix -Di386 -DGO32 -DDJGPP=2 -DMSDOS \
+  -Asystem(unix) -Asystem(msdos) -Acpu(i386) -Amachine(i386) \
+  -Asystem(rtems)"
 
 /* Generate calls to memcpy, memcmp and memset.  */
 #ifndef TARGET_MEM_FUNCTIONS
 #define TARGET_MEM_FUNCTIONS
 #endif
 
-/* end of i386/go32-rtems.h */
+/* end of i386/djgpp-rtems.h */
 

gcc/config/i386/go32.h → gcc/config/i386/djgpp.h

-/* Configuration for an i386 running MS-DOS with djgpp/go32.  */
+/* Configuration for an i386 running MS-DOS with DJGPP.  */
    Copyright (C) 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU CC.
@@ -44,7 +44,7 @@ Boston, MA 02111-1307, USA.  */
 #ifdef CPP_PREDEFINES
 #undef CPP_PREDEFINES
 #endif
-#define CPP_PREDEFINES "-Dunix -Di386 -DGO32 -DMSDOS \
+#define CPP_PREDEFINES "-Dunix -Di386 -DGO32 -DDJGPP=2 -DMSDOS \
   -Asystem(unix) -Asystem(msdos) -Acpu(i386) -Amachine(i386)"
 
 /* We need to override link_command_spec in gcc.c so support -Tdjgpp.djl.

gcc/config/i386/xm-go32.h → gcc/config/i386/xm-djgpp.h

-/* Configuration for GNU C-compiler for Intel 80386 running GO32.
+/* Configuration for GNU C-compiler for Intel 80386 running DJGPP.
    Copyright (C) 1988, 1996, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of GNU CC.

gcc/configure.in

@@ -1199,22 +1199,20 @@ changequote([,])dnl
 changequote(,)dnl
 	i[34567]86-go32-msdos | i[34567]86-*-go32*)
 changequote([,])dnl
-		xm_file=i386/xm-go32.h
-		tm_file=i386/go32.h
-		tmake_file=i386/t-go32
+		echo "GO32/DJGPP V1.X is no longer supported. Use *-pc-msdosdjgpp for DJGPP V2.X instead."
+		exit (1)
 		;;
 changequote(,)dnl
 	i[34567]86-pc-msdosdjgpp*)
 changequote([,])dnl
-		xm_file=i386/xm-go32.h
-		tm_file=i386/go32.h
-		tmake_file=i386/t-go32
-                xmake_file=i386/x-go32
+		xm_file=i386/xm-djgpp.h
+		tm_file=i386/djgpp.h
+		tmake_file=i386/t-djgpp
+		xmake_file=i386/x-djgpp
 		gnu_ld=yes
 		gas=yes
 		exeext=.exe
-		case $host in
-		*pc-msdosdjgpp*)
+		case $host in *pc-msdosdjgpp*)
 			target_alias=djgpp
 			;;
 		esac