config.gcc (powerpc64-*-gnu*): Add rs6000/default64.h to tm_file.

	* config.gcc (powerpc64-*-gnu*): Add rs6000/default64.h to tm_file.
	Remove a number of t-files from tmake_file.
	* config/rs6000/sysv4.opt (mprototype): Name variable target_prototype.
	* config/rs6000/sysv4.h (TARGET_PROTOTYPE): Define.
	* config/rs6000/linux64.h (SUBSUBTARGET_OVERRIDE_OPTIONS): Set
	target_prototype, not TARGET_PROTOTYPE.
	(LINK_OS_GNU_SPEC): Define.
	* config/rs6000/t-linux64 (LIB2FUNCS_EXTRA): Delete tramp.S
	and darwin-ldoubdle.c.

From-SVN: r145477

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3c1ed8f11a1112e73d5a3a8ee22e7bd11bd27dcf..0c7f96d7e17aee9683b32aaa3e2a5cfb0ae9ba40 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2009-04-03  Alan Modra  <amodra@bigpond.net.au>
+
+       * config.gcc (powerpc64-*-gnu*): Add rs6000/default64.h to tm_file.
+       Remove a number of t-files from tmake_file.
+       * config/rs6000/sysv4.opt (mprototype): Name variable target_prototype.
+       * config/rs6000/sysv4.h (TARGET_PROTOTYPE): Define.
+       * config/rs6000/linux64.h (SUBSUBTARGET_OVERRIDE_OPTIONS): Set
+       target_prototype, not TARGET_PROTOTYPE.
+       (LINK_OS_GNU_SPEC): Define.
+       * config/rs6000/t-linux64 (LIB2FUNCS_EXTRA): Delete tramp.S
+       and darwin-ldoubdle.c.
+
 2009-04-02  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        PR driver/39293

diff --git a/gcc/config.gcc b/gcc/config.gcc
index cf8c91b2f12be315884cdf8b37f9e4a39d4082f0..4d1eb8dfc0ef956af2c2ab722d00773107acab29 100644 (file)
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1723,9 +1723,9 @@ powerpc64-*-linux*)
        tmake_file="t-dfprules rs6000/t-fprules ${tmake_file} rs6000/t-ppccomm rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
        ;;
 powerpc64-*-gnu*)
-       tm_file="${cpu_type}/${cpu_type}.h elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/linux64.h rs6000/gnu.h glibc-stdint.h"
+       tm_file="${tm_file} elfos.h svr4.h freebsd-spec.h gnu.h rs6000/sysv4.h rs6000/default64.h rs6000/linux64.h rs6000/gnu.h glibc-stdint.h"
        extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
-       tmake_file="rs6000/t-fprules t-slibgcc-elf-ver t-gnu rs6000/t-linux64 rs6000/t-fprules-softfp soft-fp/t-softfp"
+       tmake_file="t-slibgcc-elf-ver t-gnu"
        ;;
 powerpc-*-darwin*)
        extra_options="${extra_options} rs6000/darwin.opt"

diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
index ad2eb4b7fea99076a91b9d29febd6b9d51e0f07d..24c63d35cfbfa84a841529539b63898ba3613ca7 100644 (file)
--- a/gcc/config/rs6000/linux64.h
+++ b/gcc/config/rs6000/linux64.h
@@ -99,7 +99,7 @@ extern int dot_symbols;
            }                                                   \
          if (TARGET_PROTOTYPE)                                 \
            {                                                   \
-             TARGET_PROTOTYPE = 0;                             \
+             target_prototype = 0;                             \
              error (INVALID_64BIT, "prototype");               \
            }                                                   \
          if ((target_flags & MASK_POWERPC64) == 0)             \
@@ -134,6 +134,10 @@ extern int dot_symbols;
 #undef ASM_SPEC
 #undef LINK_OS_LINUX_SPEC
 
+/* FIXME: This will quite possibly choose the wrong dynamic linker.  */
+#undef LINK_OS_GNU_SPEC
+#define        LINK_OS_GNU_SPEC LINK_OS_LINUX_SPEC
+
 #ifndef        RS6000_BI_ARCH
 #define        ASM_DEFAULT_SPEC "-mppc64"
 #define        ASM_SPEC         "%(asm_spec64) %(asm_spec_common)"

diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index 1deb0eb8cfd4ed5312197fd0aaa1df75d582f411..31028298c0e10d1f202f6e22a0c7a0bc0111f945 100644 (file)
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -54,6 +54,7 @@ extern enum rs6000_sdata_type rs6000_sdata;
 
 #define        TARGET_BITFIELD_TYPE    (! TARGET_NO_BITFIELD_TYPE)
 #define        TARGET_BIG_ENDIAN       (! TARGET_LITTLE_ENDIAN)
+#define        TARGET_PROTOTYPE        target_prototype
 #define        TARGET_NO_PROTOTYPE     (! TARGET_PROTOTYPE)
 #define        TARGET_NO_TOC           (! TARGET_TOC)
 #define        TARGET_NO_EABI          (! TARGET_EABI)

diff --git a/gcc/config/rs6000/sysv4.opt b/gcc/config/rs6000/sysv4.opt
index 85e0018ac788e4b0e51b7cae133dd79ba995b78c..1ead31d4c0155e2057b97a2bbb8c64426458a298 100644 (file)
--- a/gcc/config/rs6000/sysv4.opt
+++ b/gcc/config/rs6000/sysv4.opt
@@ -74,7 +74,7 @@ Target RejectNegative
 no description yet
 
 mprototype
-Target Var(TARGET_PROTOTYPE)
+Target Var(target_prototype)
 Assume all variable arg functions are prototyped
 
 ;; FIXME: Does nothing.

diff --git a/gcc/config/rs6000/t-linux64 b/gcc/config/rs6000/t-linux64
index 2a2e7b0cdc099bdb933814d4bc9e9f3067cff4f2..4c1fae1de83231c1256581ad581700213c505438 100644 (file)
--- a/gcc/config/rs6000/t-linux64
+++ b/gcc/config/rs6000/t-linux64
@@ -1,8 +1,7 @@
 
 #rs6000/t-linux64
 
-LIB2FUNCS_EXTRA += tramp.S $(srcdir)/config/rs6000/ppc64-fp.c \
-       $(srcdir)/config/rs6000/darwin-ldouble.c
+LIB2FUNCS_EXTRA += $(srcdir)/config/rs6000/ppc64-fp.c
 LIB2FUNCS_EXTRA := $(sort $(LIB2FUNCS_EXTRA))
 
 TARGET_LIBGCC2_CFLAGS += -mno-minimal-toc