From bcee41ff81d1c5aee58820299fe51eaf4545f3c0 Mon Sep 17 00:00:00 2001 From: Olivier Hainque Date: Tue, 5 Oct 2010 12:18:10 +0000 Subject: [PATCH] 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 From-SVN: r164988 --- gcc/ChangeLog | 6 ++++++ gcc/config/rs6000/vxworks.h | 2 -- gcc/config/vxworksae.h | 10 ++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 9d8e45cd1ba..cef1cd0c6f6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2010-10-05 Olivier Hainque + Nicolas Roche + + * config/vxworksae.h: Add missing VXWORKS_OS_CPP_BUILTINS. + * config/rs6000/vxworks.h: Remove redundant CPP builtin definitions. + 2010-10-05 Ira Rosen PR tree-optimization/45752 diff --git a/gcc/config/rs6000/vxworks.h b/gcc/config/rs6000/vxworks.h index d7484197f05..007d8708818 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 a093eda1d9f..d29b465eda0 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) +