vxworksae.h: Add missing VXWORKS_OS_CPP_BUILTINS.

        * config/vxworksae.h: Add missing VXWORKS_OS_CPP_BUILTINS.
        * config/rs6000/vxworks.h: Remove redundant CPP builtin definitions.


Co-Authored-By: Nicolas Roche <roche@adacore.com>

From-SVN: r164988

gcc/ChangeLog

+2010-10-05  Olivier Hainque  <hainque@adacore.com>
+            Nicolas Roche  <roche@adacore.com>
+
+	* config/vxworksae.h: Add missing VXWORKS_OS_CPP_BUILTINS.
+	* config/rs6000/vxworks.h: Remove redundant CPP builtin definitions.
+
 2010-10-05  Ira Rosen  <irar@il.ibm.com>
 
 	PR tree-optimization/45752

gcc/config/rs6000/vxworks.h

@@ -37,8 +37,6 @@ along with GCC; see the file COPYING3.  If not see
       builtin_define ("__PPC__");		\
       builtin_define ("__EABI__");		\
       builtin_define ("__ELF__");		\
-      builtin_define ("__vxworks");		\
-      builtin_define ("__VXWORKS__");		\
       if (!TARGET_SOFT_FLOAT)			\
 	builtin_define ("__hardfp");		\
 						\

gcc/config/vxworksae.h

@@ -55,3 +55,13 @@ along with GCC; see the file COPYING3.  If not see
 #define VXWORKS_STARTFILE_SPEC ""
 
 #define VXWORKS_KIND VXWORKS_KIND_AE
+
+/* A VxWorks 653 implementation of TARGET_OS_CPP_BUILTINS.  */
+#define VXWORKS_OS_CPP_BUILTINS()                                       \
+  do                                                                    \
+    {                                                                   \
+      builtin_define ("__vxworks");                                     \
+      builtin_define ("__VXWORKS__");                                   \
+    }                                                                   \
+  while (0)
+