* 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.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@25835 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 10 insertions, 9 deletions

diff --git a/gcc/config/i386/go32-rtems.h b/gcc/config/i386/djgpp-rtems.h
index 9ae1998db51..b355cc5796a 100644
--- a/gcc/config/i386/go32-rtems.h
+++ b/gcc/config/i386/djgpp-rtems.h
@@ -1,7 +1,7 @@
 /* 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 */
 
diff --git a/gcc/config/i386/go32.h b/gcc/config/i386/djgpp.h
index cad716ea764..12807bbb720 100644
--- a/gcc/config/i386/go32.h
+++ b/gcc/config/i386/djgpp.h
@@ -1,4 +1,4 @@
-/* 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.
diff --git a/gcc/config/i386/t-go32 b/gcc/config/i386/t-djgpp
index 6160b7ec945..6160b7ec945 100644
--- a/gcc/config/i386/t-go32
+++ b/gcc/config/i386/t-djgpp
diff --git a/gcc/config/i386/x-go32 b/gcc/config/i386/x-djgpp
index 89f31ff5008..89f31ff5008 100644
--- a/gcc/config/i386/x-go32
+++ b/gcc/config/i386/x-djgpp
diff --git a/gcc/config/i386/xm-go32.h b/gcc/config/i386/xm-djgpp.h
index a66889c45a9..d5fac90fa18 100644
--- a/gcc/config/i386/xm-go32.h
+++ b/gcc/config/i386/xm-djgpp.h
@@ -1,4 +1,4 @@
-/* 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.