From da92beb3726e8acafe0301fdf0d3381a33d0ccd4 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Sun, 18 Aug 2019 18:44:58 +0000 Subject: [PATCH] [Darwin, PPC] Fix fail of cpp/assert4.c This test needs the cpu and machine asserts to be implemented which hadn't been done for PPC Darwin. Fixed thus. gcc/ 2019-08-18 Iain Sandoe * config/rs6000/darwin.h (TARGET_OS_CPP_BUILTINS): Add asserts for cpu and machine. Factor 64/32b builtins. From-SVN: r274623 --- gcc/ChangeLog | 5 +++++ gcc/config/rs6000/darwin.h | 20 ++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index f8a7a12451d..bf0dbe0fb16 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2019-08-18 Iain Sandoe + + * config/rs6000/darwin.h (TARGET_OS_CPP_BUILTINS): Add asserts + for cpu and machine. Factor 64/32b builtins. + 2019-08-18 Gerald Pfeifer * doc/install.texi (Specific, bfin): blackfin.uclinux.org is diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h index 150dc4f4cdd..a626325c2d0 100644 --- a/gcc/config/rs6000/darwin.h +++ b/gcc/config/rs6000/darwin.h @@ -52,11 +52,23 @@ #define TARGET_OS_CPP_BUILTINS() \ do \ { \ - if (!TARGET_64BIT) builtin_define ("__ppc__"); \ - if (!TARGET_64BIT) builtin_define ("__PPC__"); \ - if (TARGET_64BIT) builtin_define ("__ppc64__"); \ - if (TARGET_64BIT) builtin_define ("__PPC64__"); \ builtin_define ("__POWERPC__"); \ + builtin_define ("__PPC__"); \ + if (TARGET_64BIT) \ + { \ + builtin_define ("__ppc64__"); \ + builtin_define ("__PPC64__"); \ + builtin_define ("__powerpc64__"); \ + builtin_assert ("cpu=powerpc64"); \ + builtin_assert ("machine=powerpc64"); \ + } \ + else \ + { \ + builtin_define ("__ppc__"); \ + builtin_define_std ("PPC"); \ + builtin_assert ("cpu=powerpc"); \ + builtin_assert ("machine=powerpc"); \ + } \ builtin_define ("__NATURAL_ALIGNMENT__"); \ darwin_cpp_builtins (pfile); \ } \ -- 2.30.2