]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
* config.gcc (powerpc*-*-*, rs6000-*-*-*): Don't bother including
authorgeoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 11 Jun 2002 23:14:47 +0000 (23:14 +0000)
committergeoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 11 Jun 2002 23:14:47 +0000 (23:14 +0000)
softfloat.h.
* config/rs6000/vxppc.h (CPP_ENDIAN_BIG_SPEC): Delete.
(CPP_ENDIAN_LITTLE_SPEC): Delete.
* config/rs6000/sysv4le.h (CPP_ENDIAN_DEFAULT_SPEC): Delete.
* config/rs6000/sysv4.h (CPP_SYSV_SPEC): Delete _SOFT_FLOAT setting,
__LONG_DOUBLE_128__ setting, _CALL_* setting.
(CPP_DEFAULT_SPEC): Delete.
(CPP_FLOAT_DEFAULT_SPEC): Delete.
(CPP_LONGDOUBLE_DEFAULT_SPEC): Delete.
(CPP_SYSV_DEFAULT_SPEC): Delete.
(CPP_ENDIAN_BIG_SPEC): Delete.
(CPP_ENDIAN_LITTLE_SPEC): Delete.
(CPP_ENDIAN_SPEC): Delete.
(CPP_SPEC): Don't include cpp_endian, cpp_cpu.
(SUBTARGET_EXTRA_SPECS): Delete cpp_sysv_default, cpp_endian_default,
cpp_endian, cpp_endian_big, cpp_endian_little, cpp_float_default,
cpp_longdouble_default.
* config/rs6000/softfloat.h: Delete.
* config/rs6000/rs6000.h (CPP_CPU_SPEC): Delete.
(EXTRA_SPECS): Delete cpp_cpu.
(TARGET_CPU_CPP_BUILTINS): New.
* config/rs6000/rs6000-protos.h (rs6000_cpu_cpp_builtins): New
prototype.
* config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): New.
* config/rs6000/linux64.h (CPP_PREDEFINES): Remove endianness defines.
(CPP_DEFAULT_SPEC): Delete.
* config/rs6000/eabiaix.h (CPP_SYSV_DEFAULT_SPEC): Delete.
* config/rs6000/darwin.h (CPP_PREDEFINES): Don't define __BIG_ENDIAN__.
* config/rs6000/beos.h (CPP_SPEC): Remove cpp_cpu.
(CPP_DEFAULT_SPEC): Delete.
* config/rs6000/aix51.h (CPP_SPEC): Remove cpp_cpu, -D_ARCH_PPC.
(CPLUSPLUS_CPP_SPEC): Likewise.
(CPP_CPU_SPEC): Delete.
(CPP_DEFAULT_SPEC): Delete.
* config/rs6000/aix43.h (CPP_SPEC): Remove cpp_cpu, -D_ARCH_PPC.
(CPLUSPLUS_CPP_SPEC): Likewise.
(CPP_CPU_SPEC): Delete.
(CPP_DEFAULT_SPEC): Delete.
* config/rs6000/aix41.h (CPP_SPEC): Remove cpp_cpu.
(CPP_DEFAULT_SPEC): Delete.
* config/rs6000/aix.h (CPP_SPEC): Remove cpp_cpu.
(CPP_DEFAULT_SPEC): Delete.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54534 138bc75d-0d04-0410-961f-82ee72b054a4

17 files changed:
gcc/ChangeLog
gcc/config.gcc
gcc/config/rs6000/aix.h
gcc/config/rs6000/aix41.h
gcc/config/rs6000/aix43.h
gcc/config/rs6000/aix51.h
gcc/config/rs6000/beos.h
gcc/config/rs6000/darwin.h
gcc/config/rs6000/eabiaix.h
gcc/config/rs6000/linux64.h
gcc/config/rs6000/rs6000-c.c
gcc/config/rs6000/rs6000-protos.h
gcc/config/rs6000/rs6000.h
gcc/config/rs6000/softfloat.h [deleted file]
gcc/config/rs6000/sysv4.h
gcc/config/rs6000/sysv4le.h
gcc/config/rs6000/vxppc.h

index 1db13101c77dc136f29b544e6a402f24691cda1a..995ee28869cf0d96df51265776b0cb1e841f03ec 100644 (file)
@@ -1,5 +1,49 @@
 2002-06-11  Geoffrey Keating  <geoffk@redhat.com>
 
+       * config.gcc (powerpc*-*-*, rs6000-*-*-*): Don't bother including
+       softfloat.h.
+       * config/rs6000/vxppc.h (CPP_ENDIAN_BIG_SPEC): Delete.
+       (CPP_ENDIAN_LITTLE_SPEC): Delete.
+       * config/rs6000/sysv4le.h (CPP_ENDIAN_DEFAULT_SPEC): Delete.
+       * config/rs6000/sysv4.h (CPP_SYSV_SPEC): Delete _SOFT_FLOAT setting,
+       __LONG_DOUBLE_128__ setting, _CALL_* setting.
+       (CPP_DEFAULT_SPEC): Delete.
+       (CPP_FLOAT_DEFAULT_SPEC): Delete.
+       (CPP_LONGDOUBLE_DEFAULT_SPEC): Delete.
+       (CPP_SYSV_DEFAULT_SPEC): Delete.
+       (CPP_ENDIAN_BIG_SPEC): Delete.
+       (CPP_ENDIAN_LITTLE_SPEC): Delete.
+       (CPP_ENDIAN_SPEC): Delete.
+       (CPP_SPEC): Don't include cpp_endian, cpp_cpu.
+       (SUBTARGET_EXTRA_SPECS): Delete cpp_sysv_default, cpp_endian_default,
+       cpp_endian, cpp_endian_big, cpp_endian_little, cpp_float_default,
+       cpp_longdouble_default.
+       * config/rs6000/softfloat.h: Delete.
+       * config/rs6000/rs6000.h (CPP_CPU_SPEC): Delete.
+       (EXTRA_SPECS): Delete cpp_cpu.
+       (TARGET_CPU_CPP_BUILTINS): New.
+       * config/rs6000/rs6000-protos.h (rs6000_cpu_cpp_builtins): New
+       prototype.
+       * config/rs6000/rs6000-c.c (rs6000_cpu_cpp_builtins): New.
+       * config/rs6000/linux64.h (CPP_PREDEFINES): Remove endianness defines.
+       (CPP_DEFAULT_SPEC): Delete.
+       * config/rs6000/eabiaix.h (CPP_SYSV_DEFAULT_SPEC): Delete.
+       * config/rs6000/darwin.h (CPP_PREDEFINES): Don't define __BIG_ENDIAN__.
+       * config/rs6000/beos.h (CPP_SPEC): Remove cpp_cpu.
+       (CPP_DEFAULT_SPEC): Delete.
+       * config/rs6000/aix51.h (CPP_SPEC): Remove cpp_cpu, -D_ARCH_PPC.
+       (CPLUSPLUS_CPP_SPEC): Likewise.
+       (CPP_CPU_SPEC): Delete.
+       (CPP_DEFAULT_SPEC): Delete.
+       * config/rs6000/aix43.h (CPP_SPEC): Remove cpp_cpu, -D_ARCH_PPC.
+       (CPLUSPLUS_CPP_SPEC): Likewise.
+       (CPP_CPU_SPEC): Delete.
+       (CPP_DEFAULT_SPEC): Delete.
+       * config/rs6000/aix41.h (CPP_SPEC): Remove cpp_cpu.
+       (CPP_DEFAULT_SPEC): Delete.
+       * config/rs6000/aix.h (CPP_SPEC): Remove cpp_cpu.
+       (CPP_DEFAULT_SPEC): Delete.
+
        * doc/gty.texi: Small updates.
 
 2002-06-12  Gabriel Dos Reis  <gdr@codesourcery.com>
index 24e0c9b8df6b50e4b1c5fdb9154012da56c77c50..3ae8d433ef73c850f3e66a9e1bb670d16b661e09 100644 (file)
@@ -2876,7 +2876,6 @@ powerpc*-*-* | rs6000-*-*)
 
                x401 | x403 | x405 | xec603e | x801 | x821 | x823 | x860)
                        target_cpu_default2="\\\"$with_cpu\\\""
-                       tm_file="$tm_file rs6000/softfloat.h"
                        ;;
 
                xyes | xno)
index d8dde5bbba815ed66311606a1964ad9e7297fb53..7c0a4cf41b23e6b6b8a548d3ede372a043bef176 100644 (file)
@@ -48,11 +48,7 @@ Boston, MA 02111-1307, USA.  */
    target switches.  */
 
 #define CPP_SPEC "%{posix: -D_POSIX_SOURCE}\
-   %{ansi: -D_ANSI_C_SOURCE}\
-   %(cpp_cpu)"
-
-#undef CPP_DEFAULT_SPEC
-#define CPP_DEFAULT_SPEC "-D_ARCH_PWR"
+   %{ansi: -D_ANSI_C_SOURCE}"
 
 #undef ASM_DEFAULT_SPEC
 #define ASM_DEFAULT_SPEC ""
index cae1a85a1b26a2f8b02b5ac498d53976c0b4f9d2..cc839b2c4945ee8c4d57e426c1d2e601f79ca056 100644 (file)
@@ -41,11 +41,7 @@ Boston, MA 02111-1307, USA.  */
 #define CPP_SPEC "%{posix: -D_POSIX_SOURCE}\
    %{ansi: -D_ANSI_C_SOURCE}\
    %{mpe: -I/usr/lpp/ppe.poe/include}\
-   %{pthread: -D_THREAD_SAFE}\
-   %(cpp_cpu)"
-
-#undef CPP_DEFAULT_SPEC
-#define CPP_DEFAULT_SPEC "-D_ARCH_COM"
+   %{pthread: -D_THREAD_SAFE}"
 
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT MASK_NEW_MNEMONICS
index 19421cce63692378c320783ac8f9e0900e59ef30..fe560a2247027d893295aac5cc0640552d931609 100644 (file)
@@ -103,10 +103,9 @@ do {                                                                       \
 #undef CPP_SPEC
 #define CPP_SPEC "%{posix: -D_POSIX_SOURCE}\
    %{ansi: -D_ANSI_C_SOURCE}\
-   %{maix64: -D__64BIT__ -D_ARCH_PPC -D__LONG_MAX__=9223372036854775807L}\
+   %{maix64: -D__64BIT__ -D__LONG_MAX__=9223372036854775807L}\
    %{mpe: -I/usr/lpp/ppe.poe/include}\
-   %{pthread: -D_THREAD_SAFE}\
-   %(cpp_cpu)"
+   %{pthread: -D_THREAD_SAFE}"
 
 /* The GNU C++ standard library requires that these macros be 
    defined.  */
@@ -116,42 +115,9 @@ do {                                                                       \
    -D_XOPEN_SOURCE_EXTENDED=1                  \
    -D_LARGE_FILE_API                           \
    -D_ALL_SOURCE                                \
-   %{maix64: -D__64BIT__ -D_ARCH_PPC -D__LONG_MAX__=9223372036854775807L}\
+   %{maix64: -D__64BIT__ -D__LONG_MAX__=9223372036854775807L}\
    %{mpe: -I/usr/lpp/ppe.poe/include}\
-   %{pthread: -D_THREAD_SAFE}\
-   %(cpp_cpu)"
-
-/* Common CPP definitions used by CPP_SPEC among the various targets
-   for handling -mcpu=xxx switches.  */
-#undef CPP_CPU_SPEC
-#define CPP_CPU_SPEC \
-"%{!mcpu*: %{!maix64: \
-  %{mpower: %{!mpower2: -D_ARCH_PWR}} \
-  %{mpower2: -D_ARCH_PWR2} \
-  %{mpowerpc*: -D_ARCH_PPC} \
-  %{!mpower*: %{!mpowerpc*: %(cpp_default)}}}} \
-%{mcpu=common: -D_ARCH_COM} \
-%{mcpu=power: -D_ARCH_PWR} \
-%{mcpu=power2: -D_ARCH_PWR2} \
-%{mcpu=power3: -D_ARCH_PPC} \
-%{mcpu=power4: -D_ARCH_PPC} \
-%{mcpu=powerpc: -D_ARCH_PPC} \
-%{mcpu=rios: -D_ARCH_PWR} \
-%{mcpu=rios1: -D_ARCH_PWR} \
-%{mcpu=rios2: -D_ARCH_PWR2} \
-%{mcpu=rsc: -D_ARCH_PWR} \
-%{mcpu=rsc1: -D_ARCH_PWR} \
-%{mcpu=rs64a: -D_ARCH_PPC} \
-%{mcpu=601: -D_ARCH_PPC -D_ARCH_PWR} \
-%{mcpu=602: -D_ARCH_PPC} \
-%{mcpu=603: -D_ARCH_PPC} \
-%{mcpu=603e: -D_ARCH_PPC} \
-%{mcpu=604: -D_ARCH_PPC} \
-%{mcpu=620: -D_ARCH_PPC} \
-%{mcpu=630: -D_ARCH_PPC}"
-
-#undef CPP_DEFAULT_SPEC
-#define CPP_DEFAULT_SPEC "-D_ARCH_COM"
+   %{pthread: -D_THREAD_SAFE}"
 
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT MASK_NEW_MNEMONICS
index 8b3fb2982c7b4b5d442cdf2319249b19461b5765..f0b9e7df503694f2890db46e090e37fc21d82369 100644 (file)
@@ -103,10 +103,9 @@ do {                                                                       \
 #undef CPP_SPEC
 #define CPP_SPEC "%{posix: -D_POSIX_SOURCE}\
   %{ansi: -D_ANSI_C_SOURCE}\
-  %{maix64: -D__64BIT__ -D_ARCH_PPC -D__LONG_MAX__=9223372036854775807L}
+  %{maix64: -D__64BIT__ -D__LONG_MAX__=9223372036854775807L}
   %{mpe: -I/usr/lpp/ppe.poe/include}\
-  %{pthread: -D_THREAD_SAFE}\
-  %(cpp_cpu)"
+  %{pthread: -D_THREAD_SAFE}"
 
 /* The GNU C++ standard library requires that these macros be 
    defined.  */
@@ -116,42 +115,9 @@ do {                                                                       \
    -D_XOPEN_SOURCE_EXTENDED=1                   \
    -D_LARGE_FILE_API                            \
    -D_ALL_SOURCE                                \
-   %{maix64: -D__64BIT__ -D_ARCH_PPC -D__LONG_MAX__=9223372036854775807L}
+   %{maix64: -D__64BIT__ -D__LONG_MAX__=9223372036854775807L}
    %{mpe: -I/usr/lpp/ppe.poe/include}\
-   %{pthread: -D_THREAD_SAFE}\
-   %(cpp_cpu)"
-
-/* Common CPP definitions used by CPP_SPEC among the various targets
-   for handling -mcpu=xxx switches.  */
-#undef CPP_CPU_SPEC
-#define CPP_CPU_SPEC \
-"%{!mcpu*: %{!maix64: \
-  %{mpower: %{!mpower2: -D_ARCH_PWR}} \
-  %{mpower2: -D_ARCH_PWR2} \
-  %{mpowerpc*: -D_ARCH_PPC} \
-  %{!mpower*: %{!mpowerpc*: %(cpp_default)}}}} \
-%{mcpu=common: -D_ARCH_COM} \
-%{mcpu=power: -D_ARCH_PWR} \
-%{mcpu=power2: -D_ARCH_PWR2} \
-%{mcpu=power3: -D_ARCH_PPC} \
-%{mcpu=power4: -D_ARCH_PPC} \
-%{mcpu=powerpc: -D_ARCH_PPC} \
-%{mcpu=rios: -D_ARCH_PWR} \
-%{mcpu=rios1: -D_ARCH_PWR} \
-%{mcpu=rios2: -D_ARCH_PWR2} \
-%{mcpu=rsc: -D_ARCH_PWR} \
-%{mcpu=rsc1: -D_ARCH_PWR} \
-%{mcpu=rs64a: -D_ARCH_PPC} \
-%{mcpu=601: -D_ARCH_PPC -D_ARCH_PWR} \
-%{mcpu=602: -D_ARCH_PPC} \
-%{mcpu=603: -D_ARCH_PPC} \
-%{mcpu=603e: -D_ARCH_PPC} \
-%{mcpu=604: -D_ARCH_PPC} \
-%{mcpu=620: -D_ARCH_PPC} \
-%{mcpu=630: -D_ARCH_PPC}"
-
-#undef CPP_DEFAULT_SPEC
-#define CPP_DEFAULT_SPEC "-D_ARCH_COM"
+   %{pthread: -D_THREAD_SAFE}"
 
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT MASK_NEW_MNEMONICS
index f569c3c0b086540c6175ee7ce231d5f626b8f982..4d2952a10aa5744fbcf8c0e983c799d253e3a22e 100644 (file)
@@ -43,10 +43,7 @@ Boston, MA 02111-1307, USA.  */
 #define CPP_PREDEFINES "-D__BEOS__ -D__POWERPC__ -Asystem=beos -Acpu=powerpc -Amachine=powerpc"
 
 #undef CPP_SPEC
-#define CPP_SPEC "%{posix: -D_POSIX_SOURCE} %(cpp_cpu)"
-
-#undef CPP_DEFAULT_SPEC
-#define CPP_DEFAULT_SPEC "-D_ARCH_PPC"
+#define CPP_SPEC "%{posix: -D_POSIX_SOURCE}"
 
 /* This is the easiest way to disable use of gcc's builtin alloca,
    which in the current BeOS release (DR9) is a problem because of the
index c415fe95210ad5bb37489d2afc2a5e2f19b74362..a472334b7b0824428f0afa15e53f608f290c3263 100644 (file)
@@ -44,7 +44,7 @@ Boston, MA 02111-1307, USA.  */
 #define SUBTARGET_OVERRIDE_OPTIONS  \
   rs6000_altivec_abi = 1;
 
-#define CPP_PREDEFINES "-D__ppc__ -D__POWERPC__ -D__NATURAL_ALIGNMENT__ -D__MACH__ -D__BIG_ENDIAN__ -D__APPLE__"
+#define CPP_PREDEFINES "-D__ppc__ -D__POWERPC__ -D__NATURAL_ALIGNMENT__ -D__MACH__ -D__APPLE__"
 
 /* We want -fPIC by default, unless we're using -static to compile for
    the kernel or some such.  */
index 639a3358356c6f64849fce4259eb19c06038f226..4e1806791346754502faeadaede057b83b97b809 100644 (file)
@@ -23,9 +23,6 @@ Boston, MA 02111-1307, USA.  */
 #undef RS6000_ABI_NAME
 #define RS6000_ABI_NAME "aix"
 
-#undef CPP_SYSV_DEFAULT_SPEC
-#define        CPP_SYSV_DEFAULT_SPEC "-D_CALL_AIX"
-
 /* Define this macro as a C expression for the initializer of an
    array of string to tell the driver program which options are
    defaults for this target and thus do not need to be handled
index b34be5ce198ee20f9e0749ca861b18c4ee2d39aa..ab2a40968c9e245399370fb75c514f43b12c336f 100644 (file)
@@ -36,9 +36,6 @@ Boston, MA 02111-1307, USA.  */
 #undef PROCESSOR_DEFAULT64
 #define PROCESSOR_DEFAULT64 PROCESSOR_PPC630
 
-#undef  CPP_DEFAULT_SPEC
-#define CPP_DEFAULT_SPEC "-D_ARCH_PPC64"
-
 #undef  ASM_DEFAULT_SPEC
 #define ASM_DEFAULT_SPEC "-mppc64"
 
@@ -112,7 +109,7 @@ Boston, MA 02111-1307, USA.  */
 #undef  CPP_PREDEFINES
 #define CPP_PREDEFINES \
  "-D_PPC_ -D__PPC__ -D_PPC64_ -D__PPC64__ -D__powerpc__ -D__powerpc64__ \
-  -D_PIC_ -D__PIC__ -D_BIG_ENDIAN -D__BIG_ENDIAN__ -D__ELF__ \
+  -D_PIC_ -D__PIC__ -D__ELF__ \
   -D__LONG_MAX__=9223372036854775807L \
   -Acpu=powerpc64 -Amachine=powerpc64"
 
index 15cd5a6c33808249a567ec02defdab9283f4414d..ab31cc58f7cab6b4c6d2b5bfdee64af848e72254 100644 (file)
@@ -69,3 +69,61 @@ rs6000_pragma_longcall (pfile)
 
   rs6000_default_long_calls = (n == integer_one_node);
 }
+
+/* Handle defining many CPP flags based on TARGET_xxx.  As a general
+   policy, rather than trying to guess what flags a user might want a
+   #define for, it's better to define a flag for everything.  */
+
+#define builtin_define(TXT) cpp_define (pfile, TXT)
+#define builtin_assert(TXT) cpp_assert (pfile, TXT)
+
+void
+rs6000_cpu_cpp_builtins (pfile)
+     cpp_reader *pfile;
+{
+  if (TARGET_POWER2)
+    builtin_define ("_ARCH_PWR2");
+  else if (TARGET_POWER)
+    builtin_define ("_ARCH_PWR");
+  if (TARGET_POWERPC)
+    builtin_define ("_ARCH_PPC");
+  if (TARGET_POWERPC64)
+    builtin_define ("_ARCH_PPC64");
+  if (! TARGET_POWER && ! TARGET_POWER2 && ! TARGET_POWERPC)
+    builtin_define ("_ARCH_COM");
+  if (TARGET_ALTIVEC)
+    builtin_define ("__ALTIVEC__");
+  if (TARGET_SOFT_FLOAT)
+    builtin_define ("_SOFT_FLOAT");
+  if (BYTES_BIG_ENDIAN)
+    {
+      builtin_define ("__BIG_ENDIAN__");
+      builtin_define ("_BIG_ENDIAN");
+      builtin_assert ("machine=bigendian");
+    }
+  else
+    {
+      builtin_define ("__LITTLE_ENDIAN__");
+      builtin_define ("_LITTLE_ENDIAN");
+      builtin_assert ("machine=littleendian");
+    }
+  if (TARGET_LONG_DOUBLE_128)
+    builtin_define ("__LONG_DOUBLE_128__");
+
+  switch (rs6000_current_abi)
+    {
+    case ABI_V4:
+      builtin_define ("_CALL_SYSV");
+      break;
+    case ABI_AIX_NODESC:
+      builtin_define ("_CALL_AIX");
+      break;
+    case ABI_AIX:
+      builtin_define ("_CALL_AIXDESC");
+      builtin_define ("_CALL_AIX");
+      break;
+    case ABI_DARWIN:
+      builtin_define ("_CALL_DARWIN");
+      break;
+    }
+}
index 8d9d12eb81a0cd8569412c9d4ce7db55175952eb..92a2f35d48098a5828ec1c9f0b3a2a60b8295438 100644 (file)
@@ -183,8 +183,11 @@ extern void debug_stack_info PARAMS ((rs6000_stack_t *));
 
 extern void machopic_output_stub PARAMS ((FILE *, const char *, const char *));
 
+/* Declare functions in rs6000-c.c */
+
 #ifdef GCC_CPPLIB_H
 extern void rs6000_pragma_longcall PARAMS ((cpp_reader *));
+extern void rs6000_cpu_cpp_builtins PARAMS ((cpp_reader *));
 #endif
 
 #endif  /* rs6000-protos.h */
index 19b359088302b70b2aa0c6a4b938166411ab157b..2d8b9244431958996de3cf1e84028aef28366567 100644 (file)
@@ -46,48 +46,6 @@ Boston, MA 02111-1307, USA.  */
 #define TARGET_CPU_DEFAULT ((char *)0)
 #endif
 
-/* Common CPP definitions used by CPP_SPEC among the various targets
-   for handling -mcpu=xxx switches.  */
-#define CPP_CPU_SPEC \
-"%{!mcpu*: \
-  %{mpower: %{!mpower2: -D_ARCH_PWR}} \
-  %{mpower2: -D_ARCH_PWR2} \
-  %{mpowerpc*: -D_ARCH_PPC} \
-  %{mno-power: %{!mpowerpc*: -D_ARCH_COM}} \
-  %{!mno-power: %{!mpower2: %(cpp_default)}}} \
-%{mcpu=common: -D_ARCH_COM} \
-%{mcpu=power: -D_ARCH_PWR} \
-%{mcpu=power2: -D_ARCH_PWR2} \
-%{mcpu=power3: -D_ARCH_PPC} \
-%{mcpu=power4: -D_ARCH_PPC} \
-%{mcpu=powerpc: -D_ARCH_PPC} \
-%{mcpu=rios: -D_ARCH_PWR} \
-%{mcpu=rios1: -D_ARCH_PWR} \
-%{mcpu=rios2: -D_ARCH_PWR2} \
-%{mcpu=rsc: -D_ARCH_PWR} \
-%{mcpu=rsc1: -D_ARCH_PWR} \
-%{mcpu=401: -D_ARCH_PPC} \
-%{mcpu=403: -D_ARCH_PPC} \
-%{mcpu=405: -D_ARCH_PPC} \
-%{mcpu=505: -D_ARCH_PPC} \
-%{mcpu=601: -D_ARCH_PPC -D_ARCH_PWR} \
-%{mcpu=602: -D_ARCH_PPC} \
-%{mcpu=603: -D_ARCH_PPC} \
-%{mcpu=603e: -D_ARCH_PPC} \
-%{mcpu=ec603e: -D_ARCH_PPC} \
-%{mcpu=604: -D_ARCH_PPC} \
-%{mcpu=604e: -D_ARCH_PPC} \
-%{mcpu=620: -D_ARCH_PPC} \
-%{mcpu=740: -D_ARCH_PPC} \
-%{mcpu=7400: -D_ARCH_PPC} \
-%{mcpu=7450: -D_ARCH_PPC} \
-%{mcpu=750: -D_ARCH_PPC} \
-%{mcpu=801: -D_ARCH_PPC} \
-%{mcpu=821: -D_ARCH_PPC} \
-%{mcpu=823: -D_ARCH_PPC} \
-%{mcpu=860: -D_ARCH_PPC} \
-%{maltivec: -D__ALTIVEC__}"
-
 /* Common ASM definitions used by ASM_SPEC among the various targets
    for handling -mcpu=xxx switches.  */
 #define ASM_CPU_SPEC \
@@ -148,7 +106,6 @@ Boston, MA 02111-1307, USA.  */
 #define SUBTARGET_EXTRA_SPECS
 
 #define EXTRA_SPECS                                                    \
-  { "cpp_cpu",                 CPP_CPU_SPEC },                         \
   { "cpp_default",             CPP_DEFAULT_SPEC },                     \
   { "asm_cpu",                 ASM_CPU_SPEC },                         \
   { "asm_default",             ASM_DEFAULT_SPEC },                     \
@@ -494,15 +451,19 @@ extern int rs6000_default_long_calls;
 /* Define this to change the optimizations performed by default.  */
 #define OPTIMIZATION_OPTIONS(LEVEL,SIZE) optimization_options(LEVEL,SIZE)
 
+/* Show we can debug even without a frame pointer.  */
+#define CAN_DEBUG_WITHOUT_FP
+
 /* Target pragma.  */
 #define REGISTER_TARGET_PRAGMAS(PFILE) do { \
   cpp_register_pragma (PFILE, 0, "longcall", rs6000_pragma_longcall); \
 } while (0)
 
-/* Show we can debug even without a frame pointer.  */
-#define CAN_DEBUG_WITHOUT_FP
+/* Target #defines.  */
+#define TARGET_CPU_CPP_BUILTINS() \
+  rs6000_cpu_cpp_builtins (pfile)
 \f
-/* target machine storage layout */
+/* Target machine storage layout.  */
 
 /* Define this macro if it is advisable to hold scalars in registers
    in a wider mode than that declared by the program.  In such cases,
diff --git a/gcc/config/rs6000/softfloat.h b/gcc/config/rs6000/softfloat.h
deleted file mode 100644 (file)
index c0dc10d..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Target definitions for GNU compiler for PowerPC defaulting to -msoft-float
-   Copyright (C) 2001
-   Free Software Foundation, Inc.
-   Contributed by Red Hat Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-#undef CPP_FLOAT_DEFAULT_SPEC
-#define CPP_FLOAT_DEFAULT_SPEC "-D_SOFT_FLOAT"
index 8aee2e22a857313a342344bb5b503b1e478f54a5..bb8538540d801294fa72ab95ae24bbb1738bd482 100644 (file)
@@ -34,10 +34,6 @@ Boston, MA 02111-1307, USA.  */
 #undef ASM_DEFAULT_SPEC
 #define        ASM_DEFAULT_SPEC "-mppc"
 
-/* Override rs6000.h definition.  */
-#undef CPP_DEFAULT_SPEC
-#define        CPP_DEFAULT_SPEC "-D_ARCH_PPC"
-
 /* Small data support types.  */
 enum rs6000_sdata_type {
   SDATA_NONE,                  /* No small data support.  */
@@ -969,55 +965,11 @@ do {                                              \
 #define CPP_SYSV_SPEC \
 "%{mrelocatable*: -D_RELOCATABLE} \
 %{fpic: -D__PIC__=1 -D__pic__=1} \
-%{!fpic: %{fPIC: -D__PIC__=2 -D__pic__=2}} \
-%{mlong-double-128: -D__LONG_DOUBLE_128__=1} \
-%{!mlong-double-64: %(cpp_longdouble_default)} \
-%{mcall-sysv: -D_CALL_SYSV} \
-%{mcall-aix: -D_CALL_AIX} %{mcall-aixdesc: -D_CALL_AIX -D_CALL_AIXDESC} \
-%{!mcall-sysv: %{!mcall-aix: %{!mcall-aixdesc: %(cpp_sysv_default) }}} \
-%{msoft-float: -D_SOFT_FLOAT} \
-%{!msoft-float: %{!mhard-float: \
-    %{mcpu=401: -D_SOFT_FLOAT} \
-    %{mcpu=403: -D_SOFT_FLOAT} \
-    %{mcpu=405: -D_SOFT_FLOAT} \
-    %{mcpu=ec603e: -D_SOFT_FLOAT} \
-    %{mcpu=801: -D_SOFT_FLOAT} \
-    %{mcpu=821: -D_SOFT_FLOAT} \
-    %{mcpu=823: -D_SOFT_FLOAT} \
-    %{mcpu=860: -D_SOFT_FLOAT} \
-    %{!mcpu*: %(cpp_float_default) }}}"
-
-/* Whether floating point is disabled by default.  */
-#define        CPP_FLOAT_DEFAULT_SPEC ""
-
-/* Whether 'long double' is 128 bits by default.  */
-#define        CPP_LONGDOUBLE_DEFAULT_SPEC ""
-
-#define        CPP_SYSV_DEFAULT_SPEC "-D_CALL_SYSV"
-
-#define CPP_ENDIAN_BIG_SPEC "-D_BIG_ENDIAN -D__BIG_ENDIAN__ -Amachine=bigendian"
-
-#define CPP_ENDIAN_LITTLE_SPEC "-D_LITTLE_ENDIAN -D__LITTLE_ENDIAN__ -Amachine=littleendian"
-
-#define        CPP_ENDIAN_SPEC \
-"%{mlittle: %(cpp_endian_little) } \
-%{mlittle-endian: %(cpp_endian_little) } \
-%{mbig: %(cpp_endian_big) } \
-%{mbig-endian: %(cpp_endian_big) } \
-%{!mlittle: %{!mlittle-endian: %{!mbig: %{!mbig-endian: \
-    %{mcall-freebsd: %(cpp_endian_big) } \
-    %{mcall-linux: %(cpp_endian_big) } \
-    %{mcall-gnu: %(cpp_endian_big) } \
-    %{mcall-netbsd: %(cpp_endian_big) } \
-    %{mcall-i960-old: %(cpp_endian_little) } \
-    %{mcall-aixdesc:  %(cpp_endian_big) } \
-    %{!mcall-linux: %{!mcall-gnu: %{!mcall-freebsd: %{!mcall-netbsd: %{!mcall-aixdesc: %(cpp_endian_default) }}}}}}}}}"
-
-#define        CPP_ENDIAN_DEFAULT_SPEC "%(cpp_endian_big)"
+%{!fpic: %{fPIC: -D__PIC__=2 -D__pic__=2}}"
 
 /* Override rs6000.h definition.  */
 #undef CPP_SPEC
-#define        CPP_SPEC "%{posix: -D_POSIX_SOURCE} %(cpp_sysv) %(cpp_endian) %(cpp_cpu) \
+#define        CPP_SPEC "%{posix: -D_POSIX_SOURCE} %(cpp_sysv) \
 %{mads: %(cpp_os_ads) } \
 %{myellowknife: %(cpp_os_yellowknife) } \
 %{mmvme: %(cpp_os_mvme) } \
@@ -1323,9 +1275,6 @@ ncrtn.o%s"
 #undef SUBTARGET_EXTRA_SPECS
 #define        SUBTARGET_EXTRA_SPECS                                           \
   { "cpp_sysv",                        CPP_SYSV_SPEC },                        \
-  { "cpp_sysv_default",                CPP_SYSV_DEFAULT_SPEC },                \
-  { "cpp_endian_default",      CPP_ENDIAN_DEFAULT_SPEC },              \
-  { "cpp_endian",              CPP_ENDIAN_SPEC },                      \
   { "crtsavres_default",        CRTSAVRES_DEFAULT_SPEC },              \
   { "lib_ads",                 LIB_ADS_SPEC },                         \
   { "lib_yellowknife",         LIB_YELLOWKNIFE_SPEC },                 \
@@ -1390,10 +1339,6 @@ ncrtn.o%s"
   { "cc1_endian_big",          CC1_ENDIAN_BIG_SPEC },                  \
   { "cc1_endian_little",       CC1_ENDIAN_LITTLE_SPEC },               \
   { "cc1_endian_default",      CC1_ENDIAN_DEFAULT_SPEC },              \
-  { "cpp_endian_big",          CPP_ENDIAN_BIG_SPEC },                  \
-  { "cpp_endian_little",       CPP_ENDIAN_LITTLE_SPEC },               \
-  { "cpp_float_default",       CPP_FLOAT_DEFAULT_SPEC },               \
-  { "cpp_longdouble_default",  CPP_LONGDOUBLE_DEFAULT_SPEC },          \
   { "cpp_os_ads",              CPP_OS_ADS_SPEC },                      \
   { "cpp_os_yellowknife",      CPP_OS_YELLOWKNIFE_SPEC },              \
   { "cpp_os_mvme",             CPP_OS_MVME_SPEC },                     \
index 1c0daeafbc717557dc9fec567ac22fdf50b96491..fda84775cc3b3a818d224cddf4e6f631ad9ff8c1 100644 (file)
@@ -23,9 +23,6 @@ Boston, MA 02111-1307, USA.  */
 #undef TARGET_DEFAULT
 #define TARGET_DEFAULT (MASK_POWERPC | MASK_NEW_MNEMONICS | MASK_LITTLE_ENDIAN)
 
-#undef CPP_ENDIAN_DEFAULT_SPEC
-#define        CPP_ENDIAN_DEFAULT_SPEC "%(cpp_endian_little)"
-
 #undef CC1_ENDIAN_DEFAULT_SPEC
 #define        CC1_ENDIAN_DEFAULT_SPEC "%(cc1_endian_little)"
 
index b13f6f5cf86dc0d862546deb5ab0c783178d104c..79c63eaa26c240778f740630df196bf28d2cc26a 100644 (file)
@@ -44,13 +44,6 @@ Boston, MA 02111-1307, USA.  */
 -D__vxworks -D__vxworks__ -Asystem=vxworks -Asystem=embedded \
 -Acpu=powerpc -Amachine=powerpc"
 
-/* Don't define _LITTLE_ENDIAN or _BIG_ENDIAN */
-#undef CPP_ENDIAN_BIG_SPEC
-#define CPP_ENDIAN_BIG_SPEC "-D__BIG_ENDIAN__ -Amachine=bigendian"
-
-#undef CPP_ENDIAN_LITTLE_SPEC
-#define CPP_ENDIAN_LITTLE_SPEC "-D__LITTLE_ENDIAN__ -Amachine=littleendian"
-
 /* We use stabs-in-elf for debugging */
 #undef PREFERRED_DEBUGGING_TYPE
 #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG