* mkconfig.sh (DEFINES): Handle entries with '='.

	* config.gcc: Don't use i370/xm-mvs.h or ns32k/xm-pc532-min.h.
	Set xm_defines to MACRO=value instead.

	* i370/xm-mvs.h: Delete.

	* ns32k/xm-pc532-min.h: Likewise.

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bd87ea7..975e93b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2001-03-25  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+       * mkconfig.sh (DEFINES): Handle entries with '='.
+
+       * config.gcc: Don't use i370/xm-mvs.h or ns32k/xm-pc532-min.h.
+       Set xm_defines to MACRO=value instead.
+
+       * i370/xm-mvs.h: Delete.
+       
+       * ns32k/xm-pc532-min.h: Likewise.
+
 Sun Mar 25 15:01:40 CEST 2001  Jan Hubicka  <jh@suse.cz>
 
        * i386.md (ashldi3, ashrdi3, lshrdi3): Change predicates to

diff --git a/gcc/config.gcc b/gcc/config.gcc
index d9ce27b..8a37cb7 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -920,15 +920,13 @@ hppa*-*-mpeix*)
        use_collect2=yes 
        ;; 
 i370-*-opened*)                         # IBM 360/370/390 Architecture
-       xm_defines=USG
-       xm_file=i370/xm-mvs.h    # close enough
+       xm_defines='USG FATAL_EXIT_CODE=12'
        tm_file=i370/oe.h
        xmake_file=i370/x-oe
        tmake_file=i370/t-oe
        ;;
 i370-*-mvs*)
-       xm_defines=USG
-       xm_file=i370/xm-mvs.h
+       xm_defines='USG FATAL_EXIT_CODE=12'
        tm_file=i370/mvs.h
        tmake_file=i370/t-mvs
        ;;
@@ -2648,8 +2646,7 @@ ns32k-pc532-mach*)
        ;;
 ns32k-pc532-minix*)
        tm_file=ns32k/pc532-min.h
-       xm_file="ns32k/xm-pc532-min.h ${xm-file}"
-       xm_defines=USG
+       xm_defines='USG HZ=60'
        use_collect2=yes
        ;;
 ns32k-*-netbsd*)

diff --git a/gcc/config/i370/xm-mvs.h b/gcc/config/i370/xm-mvs.h
deleted file mode 100644 (file)
index 24f4aed..0000000
--- a/gcc/config/i370/xm-mvs.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Configuration for GNU C-compiler for System/370.
-   Copyright (C) 1989, 1993, 1997, 2001 Free Software Foundation, Inc.
-   Contributed by Jan Stein (jan@cd.chalmers.se).
-   Modified for OS/390 LanguageEnvironment C by Dave Pitts (dpitts@cozx.com)
-
-This file is part of GNU CC.
-
-GNU CC 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, or (at your option)
-any later version.
-
-GNU CC 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 GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* Arguments to use with `exit'.  */
-#define FATAL_EXIT_CODE                12

diff --git a/gcc/config/ns32k/xm-pc532-min.h b/gcc/config/ns32k/xm-pc532-min.h
deleted file mode 100644 (file)
index 0537018..0000000
--- a/gcc/config/ns32k/xm-pc532-min.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef HZ
-#define HZ 60
-#endif

diff --git a/gcc/mkconfig.sh b/gcc/mkconfig.sh
index 5250708..03c1d9d 100644 (file)
--- a/gcc/mkconfig.sh
+++ b/gcc/mkconfig.sh
@@ -44,8 +44,8 @@ if [ -n "$HEADERS" ]; then
 fi
 
 for def in $DEFINES; do
-    echo "#ifndef $def"
-    echo "# define $def"
+    echo "#ifndef $def" | sed 's/=.*//'
+    echo "# define $def" | sed 's/=/ /'
     echo "#endif"
 done