config/i370:

	* i370.h (TARGET_CPU_CPP_BUILTINS): Use.
	* linux.h: Use TARGET_OS_CPP_BUILTINS rather than CPP_PREDEFINES.
	* mvs.h: Similarly.
	* oe.h: Similarly.


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

4 files changed, 41 insertions, 10 deletions

diff --git a/gcc/config/i370/i370.h b/gcc/config/i370/i370.h
index be1e79d81d9..f29fae7aa42 100644
--- a/gcc/config/i370/i370.h
+++ b/gcc/config/i370/i370.h
@@ -24,6 +24,18 @@ Boston, MA 02111-1307, USA.  */
 
 #ifndef GCC_I370_H
 #define GCC_I370_H
+
+/* Target CPU builtins.  */			\
+#define TARGET_CPU_CPP_BUILTINS()		\
+  do						\
+    {						\
+      builtin_define_std ("GCC");		\
+      builtin_define_std ("gcc");		\
+      builtin_assert ("machine=i370");		\
+      builtin_assert ("cpu=i370");		\
+    }						\
+  while (0)
+
 /* Run-time compilation parameters selecting different hardware subsets.  */
 
 extern int target_flags;
diff --git a/gcc/config/i370/linux.h b/gcc/config/i370/linux.h
index 004b4f2f836..c07dc408a42 100644
--- a/gcc/config/i370/linux.h
+++ b/gcc/config/i370/linux.h
@@ -32,10 +32,15 @@ Boston, MA 02111-1307, USA.  */
 /* TODO: convert include to ${tm_file} list in config.gcc.  */
 #include "i370/i370.h"
 
-/* Names to predefine in the preprocessor for this target machine.  */
-
-#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-DGCC -Dgcc -D__ELF__ -Dunix -D__gnu_linux__ -Dlinux -Asystem=posix -Acpu=i370 -Amachine=i370"
+/* Target OS preprocessor built-ins.  */	\
+#define TARGET_OS_CPP_BUILTINS()		\
+    do {					\
+	builtin_define_std ("unix");		\
+	builtin_define_std ("linux");		\
+	builtin_define ("__gnu_linux__");	\
+	builtin_define ("__ELF__");		\
+	builtin_assert ("system=posix");	\
+    } while (0)
 
 /* Options for this target machine.  */
 
diff --git a/gcc/config/i370/mvs.h b/gcc/config/i370/mvs.h
index 747077451b6..4734fbd10d5 100644
--- a/gcc/config/i370/mvs.h
+++ b/gcc/config/i370/mvs.h
@@ -32,12 +32,19 @@ Boston, MA 02111-1307, USA.  */
 
 #define CPP_SPEC "-trigraphs"
 
-/* Names to predefine in the preprocessor for this target machine.  */
+/* Target OS preprocessor built-ins.  */	\
+#define TARGET_OS_CPP_BUILTINS()		\
+    do {					\
+	builtin_define_std ("MVS");		\
+	builtin_define_std ("mvs");		\
+	MAYBE_LE370_MACROS();			\
+	builtin_assert ("system=mvs");		\
+    } while (0)
 
 #if defined(LE370)
-#define CPP_PREDEFINES "-DGCC -Dgcc -DMVS -Dmvs -DLE370 -Asystem=mvs -Acpu=i370 -Amachine=i370"
+# define MAYBE_LE370_MACROS() do {builtin_define_std ("LE370");} while (0)
 #else
-#define CPP_PREDEFINES "-DGCC -Dgcc -DMVS -Dmvs -Asystem=mvs -Acpu=i370 -Amachine=i370"
+# define MAYBE_LE370_MACROS()
 #endif
 
 /* Include system common definitions */
diff --git a/gcc/config/i370/oe.h b/gcc/config/i370/oe.h
index 3ac9dfb9abf..0101ba89c05 100644
--- a/gcc/config/i370/oe.h
+++ b/gcc/config/i370/oe.h
@@ -39,9 +39,16 @@ Boston, MA 02111-1307, USA.  */
 #define LIBGCC_SPEC ""
 #define STARTFILE_SPEC "/usr/local/lib/gccmain.o"
 
-/* Names to predefine in the preprocessor for this target machine.  */
-
-#define CPP_PREDEFINES "-DGCC -Dgcc -DUNIX -Dunix -Dopenedition -D__i370__ -Asystem=openedition -Asystem=unix -Acpu=i370 -Amachine=i370"
+/* Target OS preprocessor built-ins.  */	\
+#define TARGET_OS_CPP_BUILTINS()		\
+    do {					\
+	builtin_define_std ("unix");		\
+	builtin_define_std ("UNIX");		\
+	builtin_define_std ("openedition");	\
+	builtin_define ("__i370__");		\
+	builtin_assert ("system=openedition");	\
+	builtin_assert ("system=unix");		\
+    } while (0)
 
 /* Include system common definitions */