This patch adds some asserts of cpu and machine to fix an assert testcase and makes the defines consistent with PPC64 Linux.
boottrapped on powerpc-ibm-aix7.1.0.0 * config/rs6000/aix.h (TARGET_OS_AIX_CPP_BUILTINS): Add cpu and machine asserts. Update defines for 64 bit. Thanks, David Index: aix.h =================================================================== --- aix.h (revision 230144) +++ aix.h (working copy) @@ -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)