* config/rs6000/aix.h (TARGET_OS_AIX_CPP_BUILTINS): Add cpu and

machine asserts.  Update defines for 64 bit.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230145 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 318de8f..ea15ada 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-11  David Edelsohn  <dje.gcc@gmail.com>
+
+       * config/rs6000/aix.h (TARGET_OS_AIX_CPP_BUILTINS): Add cpu and
+       machine asserts.  Update defines for 64 bit.
+
 2015-11-11  Charles Baylis  <charles.baylis@linaro.org>
 
        PR target/63870

diff --git a/gcc/config/rs6000/aix.h b/gcc/config/rs6000/aix.h
index dbcfb95..375a13e 100644 (file)
--- a/gcc/config/rs6000/aix.h
+++ b/gcc/config/rs6000/aix.h
@@ -101,8 +101,6 @@
     {                                          \
       builtin_define ("_IBMR2");               \
       builtin_define ("_POWER");               \
-      builtin_define ("__powerpc__");           \
-      builtin_define ("__PPC__");               \
       builtin_define ("__unix__");              \
       builtin_define ("_AIX");                 \
       builtin_define ("_AIX32");               \
@@ -112,6 +110,22 @@
         builtin_define ("__LONGDOUBLE128");    \
       builtin_assert ("system=unix");          \
       builtin_assert ("system=aix");           \
+      if (TARGET_64BIT)                                \
+       {                                       \
+         builtin_define ("__PPC__");           \
+         builtin_define ("__PPC64__");         \
+         builtin_define ("__powerpc__");       \
+         builtin_define ("__powerpc64__");     \
+         builtin_assert ("cpu=powerpc64");     \
+         builtin_assert ("machine=powerpc64"); \
+       }                                       \
+      else                                     \
+       {                                       \
+         builtin_define ("__PPC__");           \
+         builtin_define ("__powerpc__");       \
+         builtin_assert ("cpu=powerpc");       \
+         builtin_assert ("machine=powerpc");   \
+       }                                       \
     }                                          \
   while (0)