From bb904c1a4819739fa932740c67e6f0cca354ce1a Mon Sep 17 00:00:00 2001
From: David Edelsohn <edelsohn@gnu.org>
Date: Wed, 10 Mar 2004 21:22:40 +0000
Subject: [PATCH] aix.h (TARGET_OS_CPP_BUILTINS): Rename to ...
* config/rs6000/aix.h (TARGET_OS_CPP_BUILTINS): Rename to ...
(TARGET_OS_AIX_CPP_BUILTINS): this. Conditionally define
__LONGDOUBLE128.
* config/rs6000/aix41.h (TARGET_OS_CPP_BUILTINS): Use
TARGET_OS_AIX_CPP_BUILTINS.
* config/rs6000/aix43.h (TARGET_OS_CPP_BUILTINS): Same.
* config/rs6000/aix51.h (TARGET_OS_CPP_BUILTINS): Same.
* config/rs6000/aix52.h (TARGET_OS_CPP_BUILTINS): Same.
* config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Revert
previous change.
From-SVN: r79274
---
gcc/ChangeLog | 13 +++++++++++++
gcc/config/rs6000/aix.h | 27 ++++++++++++++-------------
gcc/config/rs6000/aix41.h | 17 +++++------------
gcc/config/rs6000/aix43.h | 19 ++++++-------------
gcc/config/rs6000/aix51.h | 21 +++++++--------------
gcc/config/rs6000/aix52.h | 23 ++++++++---------------
gcc/config/rs6000/rs6000-c.c | 6 +-----
7 files changed, 54 insertions(+), 72 deletions(-)
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7366aaa65f11..ad2449dc2af1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,16 @@
+2004-03-10 David Edelsohn <edelsohn@gnu.org>
+
+ * config/rs6000/aix.h (TARGET_OS_CPP_BUILTINS): Rename to ...
+ (TARGET_OS_AIX_CPP_BUILTINS): this. Conditionally define
+ __LONGDOUBLE128.
+ * config/rs6000/aix41.h (TARGET_OS_CPP_BUILTINS): Use
+ TARGET_OS_AIX_CPP_BUILTINS.
+ * config/rs6000/aix43.h (TARGET_OS_CPP_BUILTINS): Same.
+ * config/rs6000/aix51.h (TARGET_OS_CPP_BUILTINS): Same.
+ * config/rs6000/aix52.h (TARGET_OS_CPP_BUILTINS): Same.
+ * config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): Revert
+ previous change.
+
2004-03-10 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
* fold-const.c (tree_expr_nonnegative_p): Add more builtin cases.
diff --git a/gcc/config/rs6000/aix.h b/gcc/config/rs6000/aix.h
index f189407b3f48..c530f988e251 100644
--- a/gcc/config/rs6000/aix.h
+++ b/gcc/config/rs6000/aix.h
@@ -58,19 +58,20 @@
#define LINK_LIBGCC_SPECIAL_1
/* Names to predefine in the preprocessor for this target machine. */
-#define TARGET_OS_CPP_BUILTINS() \
- do \
- { \
- builtin_define ("_IBMR2"); \
- builtin_define ("_POWER"); \
- builtin_define ("_AIX"); \
- builtin_define ("_AIX32"); \
- builtin_define ("_LONG_LONG"); \
- builtin_assert ("system=unix"); \
- builtin_assert ("system=aix"); \
- builtin_assert ("cpu=rs6000"); \
- builtin_assert ("machine=rs6000"); \
- } \
+#define TARGET_OS_AIX_CPP_BUILTINS() \
+ do \
+ { \
+ builtin_define ("_IBMR2"); \
+ builtin_define ("_POWER"); \
+ builtin_define ("_AIX"); \
+ builtin_define ("_AIX32"); \
+ builtin_define ("_AIX41"); \
+ builtin_define ("_LONG_LONG"); \
+ if (TARGET_LONG_DOUBLE_128) \
+ builtin_define ("__LONGDOUBLE128"); \
+ builtin_assert ("system=unix"); \
+ builtin_assert ("system=aix"); \
+ } \
while (0)
/* Define appropriate architecture macros for preprocessor depending on
diff --git a/gcc/config/rs6000/aix41.h b/gcc/config/rs6000/aix41.h
index 373c10c22ffa..b362e531bc2a 100644
--- a/gcc/config/rs6000/aix41.h
+++ b/gcc/config/rs6000/aix41.h
@@ -33,18 +33,11 @@
#define ASM_DEFAULT_SPEC "-mcom"
#undef TARGET_OS_CPP_BUILTINS
-#define TARGET_OS_CPP_BUILTINS() \
- do \
- { \
- builtin_define ("_IBMR2"); \
- builtin_define ("_POWER"); \
- builtin_define ("_AIX"); \
- builtin_define ("_AIX32"); \
- builtin_define ("_AIX41"); \
- builtin_define ("_LONG_LONG"); \
- builtin_assert ("system=unix"); \
- builtin_assert ("system=aix"); \
- } \
+#define TARGET_OS_CPP_BUILTINS() \
+ do \
+ { \
+ TARGET_OS_AIX_CPP_BUILTINS (); \
+ } \
while (0)
#undef CPP_SPEC
diff --git a/gcc/config/rs6000/aix43.h b/gcc/config/rs6000/aix43.h
index a76e694c1ee7..3602bcbe081a 100644
--- a/gcc/config/rs6000/aix43.h
+++ b/gcc/config/rs6000/aix43.h
@@ -96,19 +96,12 @@ do { \
#define ASM_DEFAULT_SPEC "-mcom"
#undef TARGET_OS_CPP_BUILTINS
-#define TARGET_OS_CPP_BUILTINS() \
- do \
- { \
- builtin_define ("_IBMR2"); \
- builtin_define ("_POWER"); \
- builtin_define ("_AIX"); \
- builtin_define ("_AIX32"); \
- builtin_define ("_AIX41"); \
- builtin_define ("_AIX43"); \
- builtin_define ("_LONG_LONG"); \
- builtin_assert ("system=unix"); \
- builtin_assert ("system=aix"); \
- } \
+#define TARGET_OS_CPP_BUILTINS() \
+ do \
+ { \
+ builtin_define ("_AIX43"); \
+ TARGET_OS_AIX_CPP_BUILTINS (); \
+ } \
while (0)
#undef CPP_SPEC
diff --git a/gcc/config/rs6000/aix51.h b/gcc/config/rs6000/aix51.h
index f5bcfd339ab4..266dc699c3be 100644
--- a/gcc/config/rs6000/aix51.h
+++ b/gcc/config/rs6000/aix51.h
@@ -96,20 +96,13 @@ do { \
#define ASM_DEFAULT_SPEC "-mcom"
#undef TARGET_OS_CPP_BUILTINS
-#define TARGET_OS_CPP_BUILTINS() \
- do \
- { \
- builtin_define ("_IBMR2"); \
- builtin_define ("_POWER"); \
- builtin_define ("_LONG_LONG"); \
- builtin_define ("_AIX"); \
- builtin_define ("_AIX32"); \
- builtin_define ("_AIX41"); \
- builtin_define ("_AIX43"); \
- builtin_define ("_AIX51"); \
- builtin_assert ("system=unix"); \
- builtin_assert ("system=aix"); \
- } \
+#define TARGET_OS_CPP_BUILTINS() \
+ do \
+ { \
+ builtin_define ("_AIX43"); \
+ builtin_define ("_AIX51"); \
+ TARGET_OS_AIX_CPP_BUILTINS (); \
+ } \
while (0)
#undef CPP_SPEC
diff --git a/gcc/config/rs6000/aix52.h b/gcc/config/rs6000/aix52.h
index 485151cd61e1..196854652d08 100644
--- a/gcc/config/rs6000/aix52.h
+++ b/gcc/config/rs6000/aix52.h
@@ -83,21 +83,14 @@ do { \
#define ASM_DEFAULT_SPEC "-mppc"
#undef TARGET_OS_CPP_BUILTINS
-#define TARGET_OS_CPP_BUILTINS() \
- do \
- { \
- builtin_define ("_IBMR2"); \
- builtin_define ("_POWER"); \
- builtin_define ("_LONG_LONG"); \
- builtin_define ("_AIX"); \
- builtin_define ("_AIX32"); \
- builtin_define ("_AIX41"); \
- builtin_define ("_AIX43"); \
- builtin_define ("_AIX51"); \
- builtin_define ("_AIX52"); \
- builtin_assert ("system=unix"); \
- builtin_assert ("system=aix"); \
- } \
+#define TARGET_OS_CPP_BUILTINS() \
+ do \
+ { \
+ builtin_define ("_AIX43"); \
+ builtin_define ("_AIX51"); \
+ builtin_define ("_AIX52"); \
+ TARGET_OS_AIX_CPP_BUILTINS (); \
+ } \
while (0)
#undef CPP_SPEC
diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c
index 646b0c2e5853..5d36d5d28b37 100644
--- a/gcc/config/rs6000/rs6000-c.c
+++ b/gcc/config/rs6000/rs6000-c.c
@@ -113,11 +113,7 @@ rs6000_cpu_cpp_builtins (cpp_reader *pfile)
RS6000_CPU_CPP_ENDIAN_BUILTINS();
if (TARGET_LONG_DOUBLE_128)
- {
- builtin_define ("__LONG_DOUBLE_128__");
- if (TARGET_AIX && TARGET_XCOFF)
- builtin_define ("__LONGDOUBLE128");
- }
+ builtin_define ("__LONG_DOUBLE_128__");
switch (rs6000_current_abi)
{
--
GitLab