aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/rs6000/vxworks.h2
-rw-r--r--gcc/config/vxworksae.h10
3 files changed, 16 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9d8e45c..cef1cd0 100644
--- 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 d748419..007d870 100644
--- 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 a093eda..d29b465 100644
--- 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)
+