procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[RS6000] PR91135, __linux__ not defined with -mcall-aixdesc on 9.x and ppc64

Browse source 
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
This commit is contained in:
Alan Modra 2019-07-28 18:59:11 +09:30 • committed by Alan Modra
parent 8d85264514
commit 295ac7c79e
3 changed files with 11 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
gcc/ChangeLog
View file

@ -1,3 +1,12 @@
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

13
gcc/config/rs6000/linux.h
View file

@ -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)"

16
gcc/config/rs6000/linux64.h
View file

@ -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)"