From 295ac7c79ebe8ec1dec799c748c49e44fd6b4b47 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Sun, 28 Jul 2019 18:59:11 +0930 Subject: [PATCH] [RS6000] PR91135, __linux__ not defined with -mcall-aixdesc on 9.x and ppc64 This patch makes the obvious fix for PR91135, and deletes extraneous copies of GNU_USER_TARGET_D_OS_VERSIONS that appear in rs6000/linux.h and rs6000/linux64.h. Since all configurations using either of these files also include linux.h there is no need to duplicate the macro. PR target/91135 * config/rs6000/linux.h (GNU_USER_TARGET_D_OS_VERSIONS): Don't define. * config/rs6000/linux64.h (TARGET_OS_CPP_BUILTINS): Invoke GNU_USER_TARGET_OS_CPP_BUILTINS for aixdesc abi. (GNU_USER_TARGET_D_OS_VERSIONS): Don't define. From-SVN: r273854 --- gcc/ChangeLog | 9 +++++++++ gcc/config/rs6000/linux.h | 13 ------------- gcc/config/rs6000/linux64.h | 16 ++-------------- 3 files changed, 11 insertions(+), 27 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d005cd965ba..34120003c5f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2019-07-28 Alan Modra + + PR target/91135 + * config/rs6000/linux.h (GNU_USER_TARGET_D_OS_VERSIONS): Don't + define. + * config/rs6000/linux64.h (TARGET_OS_CPP_BUILTINS): Invoke + GNU_USER_TARGET_OS_CPP_BUILTINS for aixdesc abi. + (GNU_USER_TARGET_D_OS_VERSIONS): Don't define. + 2019-07-28 Alan Modra PR target/91050 diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h index 96b97877989..ffceb32bf65 100644 --- a/gcc/config/rs6000/linux.h +++ b/gcc/config/rs6000/linux.h @@ -59,19 +59,6 @@ } \ while (0) -#define GNU_USER_TARGET_D_OS_VERSIONS() \ - do { \ - builtin_version ("linux"); \ - if (OPTION_GLIBC) \ - builtin_version ("CRuntime_Glibc"); \ - else if (OPTION_UCLIBC) \ - builtin_version ("CRuntime_UClibc"); \ - else if (OPTION_BIONIC) \ - builtin_version ("CRuntime_Bionic"); \ - else if (OPTION_MUSL) \ - builtin_version ("CRuntime_Musl"); \ - } while (0) - #undef CPP_OS_DEFAULT_SPEC #define CPP_OS_DEFAULT_SPEC "%(cpp_os_linux)" diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h index ba5f640efc8..4d329b544ad 100644 --- a/gcc/config/rs6000/linux64.h +++ b/gcc/config/rs6000/linux64.h @@ -372,7 +372,8 @@ extern int dot_symbols; #define TARGET_OS_CPP_BUILTINS() \ do \ { \ - if (strcmp (rs6000_abi_name, "linux") == 0) \ + if (strcmp (rs6000_abi_name, "linux") == 0 \ + || strcmp (rs6000_abi_name, "aixdesc") == 0) \ GNU_USER_TARGET_OS_CPP_BUILTINS(); \ if (TARGET_64BIT) \ { \ @@ -396,19 +397,6 @@ extern int dot_symbols; } \ while (0) -#define GNU_USER_TARGET_D_OS_VERSIONS() \ - do { \ - builtin_version ("linux"); \ - if (OPTION_GLIBC) \ - builtin_version ("CRuntime_Glibc"); \ - else if (OPTION_UCLIBC) \ - builtin_version ("CRuntime_UClibc"); \ - else if (OPTION_BIONIC) \ - builtin_version ("CRuntime_Bionic"); \ - else if (OPTION_MUSL) \ - builtin_version ("CRuntime_Musl"); \ - } while (0) - #undef CPP_OS_DEFAULT_SPEC #define CPP_OS_DEFAULT_SPEC "%(cpp_os_linux) %(include_extra)" -- 2.30.2