This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
RFA: Remove CPP_PREDEFINES from i960/
- From: Neil Booth <neil at daikokuya dot co dot uk>
- To: gcc-patches at gcc dot gnu dot org
- Date: Fri, 16 May 2003 23:48:50 +0100
- Subject: RFA: Remove CPP_PREDEFINES from i960/
Tested on i960-foo-rtems. OK?
Neil.
* i960/i960.h, i960/rtems.h: Use TARGET_OS_CPP_BUILTINS and
TARGET_CPU_CPP_BUILTINS in preference to CPP_PREDEFINES.
Index: i960.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i960/i960.h,v
retrieving revision 1.75
diff -u -p -r1.75 i960.h
--- i960.h 12 May 2003 09:51:27 -0000 1.75
+++ i960.h 16 May 2003 22:50:14 -0000
@@ -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. */
Index: rtems.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i960/rtems.h,v
retrieving revision 1.11
diff -u -p -r1.11 rtems.h
--- rtems.h 12 Apr 2002 13:34:52 -0000 1.11
+++ rtems.h 16 May 2003 22:50:14 -0000
@@ -19,8 +19,11 @@ along with GNU CC; see the file COPYING.
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)