[PATCH/RFA] CPP built-in cleanup for ns32k

[Jason R Thorpe]

...and adds a few useful ones in the process.
 
Note, the namespace-invasive ones are no longer defined because NetBSD is
the only supported config, and NetBSD never expected the namespace-invasive
ones to be defined.
 
OK to check in? 
 
        * config/ns32k/netbsd.h: Update copyright years.
        (TARGET_OS_CPP_BUILTINS): Define.
        (CPP_PREDEFINES): Remove. 
        * config/ns32k/ns32k.h (CPP_PREDEFINES): Remove.
        (TARGET_CPU_CPP_BUILTINS): Define.  

-- 
        -- Jason R. Thorpe <thorpej@wasabisystems.com>
-------------- next part --------------
Index: config/ns32k/netbsd.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/ns32k/netbsd.h,v
retrieving revision 1.15
diff -u -r1.15 netbsd.h
--- config/ns32k/netbsd.h	31 May 2002 04:23:14 -0000	1.15
+++ config/ns32k/netbsd.h	2 Jun 2002 23:05:22 -0000
@@ -1,5 +1,6 @@
 /* Configuration for a ns32532 running NetBSD as the target machine.
-   Copyright (C) 1988, 1994, 1995, 1996, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1994, 1995, 1996, 1998, 2002
+   Free Software Foundation, Inc.
 
 This file is part of GNU CC.
 
@@ -18,6 +19,15 @@
 the Free Software Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
+
+#define TARGET_OS_CPP_BUILTINS()			\
+  do							\
+    {							\
+      NETBSD_OS_CPP_BUILTINS_AOUT();			\
+      builtin_define ("__ns32k__");			\
+    }							\
+  while (0)
+
 /* Compile for the floating point unit & 32532 by default;
    Don't assume SB is zero;
    Don't use bitfield instructions;
@@ -62,13 +72,10 @@
 
 #define MOVD_FLOAT_OK
 
-/* Names to predefine in the preprocessor for this target machine.  */
-
-#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dns32k -Dns32000 -Dns32532 -D__NetBSD__ -Dpc532 -D__ns32k__ -D__KPRINTF_ATTRIBUTE__ -Asystem=unix -Asystem=NetBSD -Acpu=ns32k -Amachine=ns32k"
+/* Define a CPP_SPEC appropriate for NetBSD.  */
 
 #undef CPP_SPEC
-#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}"
+#define CPP_SPEC NETBSD_CPP_SPEC
 
 /* Make gcc agree with <machine/ansi.h> */
 
Index: config/ns32k/ns32k.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/ns32k/ns32k.h,v
retrieving revision 1.40
diff -u -r1.40 ns32k.h
--- config/ns32k/ns32k.h	31 May 2002 04:23:14 -0000	1.40
+++ config/ns32k/ns32k.h	2 Jun 2002 23:05:24 -0000
@@ -21,12 +21,33 @@
 Boston, MA 02111-1307, USA.  */
 
 
-/* Note that some other tm.h files include this one and then override
-   many of the definitions that relate to assembler syntax.  */
-
-/* Names to predefine in the preprocessor for this target machine.  */
-
-#define CPP_PREDEFINES "-Dns32000 -Dunix -Asystem=unix -Acpu=ns32k -Amachine=ns32k"
+#define TARGET_CPU_CPP_BUILTINS()			\
+  do							\
+    {							\
+      builtin_define ("__ns32000__");			\
+							\
+      /* CPU type */					\
+      if (TARGET_32532)					\
+	builtin_define ("__ns32532__");			\
+      else if (TARGET_32332)				\
+	builtin_define ("__ns32332__");			\
+      else						\
+	builtin_define ("__ns32032__");			\
+							\
+      /* FPU type */					\
+      if (TARGET_32381)					\
+	builtin_define ("__ns32381__");			\
+      else if (TARGET_32081)				\
+	builtin_define ("__ns32081__");			\
+							\
+      /* Misc. */					\
+      if (TARGET_RTD)					\
+	builtin_define ("__RTD__");			\
+							\
+      builtin_assert ("cpu=ns32k");			\
+      builtin_assert ("machine=ns32k");			\
+    }							\
+  while (0)
 
 /* Print subsidiary information on the compiler version in use.  */
 #define TARGET_VERSION fprintf (stderr, " (32000, GAS syntax)");