From: Alan Modra <amodra@gmail.com>
Date: Thu, 1 Aug 2019 05:57:12 +0000 (+0930)
Subject: [RS6000] PR91135, __linux__ not defined with -mcall-aixdesc on 9.x and ppc64
X-Git-Tag: releases/gcc-9.2.0~85
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d35a5e72590d4bdda59382519d3dc76b5b188e7a;p=thirdparty%2Fgcc.git

[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: r273962
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f837f7d85c68..00064fdfc6b9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2019-08-01  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-31  Jonathan Wakely  <jwakely@redhat.com>
 
 	Backport from mainline
diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h
index 96b97877989b..ffceb32bf653 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 5380f6a6a6f1..9946d3fed944 100644
--- a/gcc/config/rs6000/linux64.h
+++ b/gcc/config/rs6000/linux64.h
@@ -376,7 +376,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)					\
 	{						\
@@ -400,19 +401,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)"