i960.h, rtems.h: Use TARGET_OS_CPP_BUILTINS and TARGET_CPU_CPP_BUILTINS in preference to...

	* i960/i960.h, i960/rtems.h: Use TARGET_OS_CPP_BUILTINS and
	TARGET_CPU_CPP_BUILTINS in preference to CPP_PREDEFINES.

From-SVN: r66903

gcc/ChangeLog

 2003-05-17  Neil Booth  <neil@daikokuya.co.uk>
 
+	* i960/i960.h, i960/rtems.h: Use TARGET_OS_CPP_BUILTINS and
+	TARGET_CPU_CPP_BUILTINS in preference to CPP_PREDEFINES.
+
+2003-05-17  Neil Booth  <neil@daikokuya.co.uk>
+
 	* config.gcc (sparc-*-sysv4*): Add sparc/sysv4-only.h.
 	* sparc/aout.h, sparc/elf.h, sparc/freebsd.h, sparc/linux.h,
 	sparc/linux64.h, sparc/lite.h, sparc/litecoff.h, sparc/liteelf.h,

gcc/config/i960/i960.h

@@ -25,10 +25,20 @@ Boston, MA 02111-1307, USA.  */
 /* Note that some other tm.h files may include this one and then override
    many of the definitions that relate to assembler syntax.  */
 
-#define MULTILIB_DEFAULTS { "mnumerics" }
+/* Target CPU builtins.  */
+#define TARGET_CPU_CPP_BUILTINS()		\
+  do						\
+    {						\
+	builtin_define_std ("i960");		\
+	builtin_define_std ("I960");		\
+	builtin_define_std ("i80960");		\
+	builtin_define_std ("I80960");		\
+	builtin_assert ("cpu=i960");		\
+	builtin_assert ("machine=i960");	\
+    }						\
+  while (0)
 
-/* Names to predefine in the preprocessor for this target machine.  */
-#define CPP_PREDEFINES "-Di960 -Di80960 -DI960 -DI80960 -Acpu=i960 -Amachine=i960"
+#define MULTILIB_DEFAULTS { "mnumerics" }
 
 /* Name to predefine in the preprocessor for processor variations.
    -mic* options make characters signed by default.  */

gcc/config/i960/rtems.h

@@ -19,8 +19,11 @@ 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.  */
 
-/* Specify predefined symbols in preprocessor.  */
-
-#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Di960 -Di80960 -DI960 -DI80960 -D__rtems__ \
-   -Asystem=rtems -Acpu=i960 -Amachine=i960"
+/* Target OS builtins.  */
+#define TARGET_OS_CPP_BUILTINS()		\
+  do						\
+    {						\
+	builtin_define ("__rtems__");		\
+	builtin_assert ("system=rtems");	\
+    }						\
+  while (0)