diff options
| author | Alan Modra <amodra@gmail.com> | 2019-07-28 18:59:11 +0930 |
|---|---|---|
| committer | Alan Modra <amodra@gcc.gnu.org> | 2019-07-28 18:59:11 +0930 |
| commit | 295ac7c79ebe8ec1dec799c748c49e44fd6b4b47 (patch) | |
| tree | 0ffe169a6e3bd1aaf5ef04ca3f91529fab315eee /gcc | |
| parent | 8d852645145d10bbf72cbd82ef080a0057eb9c0e (diff) | |
| download | gcc-295ac7c79ebe8ec1dec799c748c49e44fd6b4b47.zip gcc-295ac7c79ebe8ec1dec799c748c49e44fd6b4b47.tar.gz gcc-295ac7c79ebe8ec1dec799c748c49e44fd6b4b47.tar.bz2 | |
[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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/config/rs6000/linux.h | 13 | ||||
| -rw-r--r-- | gcc/config/rs6000/linux64.h | 16 |
3 files changed, 11 insertions, 27 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d005cd9..3412000 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,14 @@ 2019-07-28 Alan Modra <amodra@gmail.com> + 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 <amodra@gmail.com> + PR target/91050 * config/rs6000/sysv4.h (ASM_DEFAULT_SPEC): Modify if -m64. * config/rs6000/default64.h (ASM_DEFAULT_SPEC): Define. diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h index 96b9787..ffceb32 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 ba5f640..4d329b5 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)" |