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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9d8e45cd1ba75472bca7c4a5816c3cd53816e686..cef1cd0c6f62c3abe717f71977d4a3df82a49309 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+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

diff --git a/gcc/config/rs6000/vxworks.h b/gcc/config/rs6000/vxworks.h
index d7484197f058149c6f6640e54c34b64dd69e9a33..007d870881863e4fbd2dd54d24d0cd25173c32a3 100644 (file)
--- a/gcc/config/rs6000/vxworks.h
+++ b/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");            \
                                                \

diff --git a/gcc/config/vxworksae.h b/gcc/config/vxworksae.h
index a093eda1d9ffaff89e9ba09653f929c7c15c6f73..d29b465eda0fe52fad9b830c8811ca37a52ee6d0 100644 (file)
--- a/gcc/config/vxworksae.h
+++ b/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)
+