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

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

From-SVN: r66903

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d79566674c39c9380663ad38ff147e942e4c5166..12293912dbfe70adffcd87adb7579ba2848eb288 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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.

diff --git a/gcc/config/i960/i960.h b/gcc/config/i960/i960.h
index a6d87d2a5d6472df3dfc97f5bcda4ede0ee4d3e1..595dc4465df64ae8e9c4a900cf681b81c28ce62b 100644 (file)
--- a/gcc/config/i960/i960.h
+++ b/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.  */

diff --git a/gcc/config/i960/rtems.h b/gcc/config/i960/rtems.h
index 411acfcd035f08546cfe1252e0b1e8b8fdfbf11c..4f6059f85f32703bc45f4689d36cbe28a0e2ef21 100644 (file)
--- a/gcc/config/i960/rtems.h
+++ b/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)