From 67796c1fc2f5fa0e7abcb4083d1f377c9d017a48 Mon Sep 17 00:00:00 2001
From: Geoffrey Keating <geoffk@apple.com>
Date: Fri, 29 Sep 2006 01:21:14 +0000
Subject: [PATCH] re PR target/28617 (___divti3 and ___umodti3 undefined for
 -m64 on powerpc-apple-darwin8)

	PR target/28617
	* config/rs6000/rs6000.h [IN_LIBGCC2] (TARGET_POWERPC64): Define
	to 1 when __ppc64__ is defined.
	* config/rs6000/t-darwin (LIB2FUNCS_EXTRA): Add ppc64-fp.c and
	darwin-64.c.
	* config/rs6000/ppc64-fp.c: Also compile when __ppc64__ is defined.

From-SVN: r117296
---
 gcc/ChangeLog                | 9 +++++++++
 gcc/config/rs6000/ppc64-fp.c | 2 +-
 gcc/config/rs6000/rs6000.h   | 2 +-
 gcc/config/rs6000/t-darwin   | 2 ++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fda7534d95b..c4161a0b3b1 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-28  Geoffrey Keating  <geoffk@apple.com>
+
+	PR target/28617
+	* config/rs6000/rs6000.h [IN_LIBGCC2] (TARGET_POWERPC64): Define
+	to 1 when __ppc64__ is defined.
+	* config/rs6000/t-darwin (LIB2FUNCS_EXTRA): Add ppc64-fp.c and
+	darwin-64.c.
+	* config/rs6000/ppc64-fp.c: Also compile when __ppc64__ is defined.
+
 2006-09-28  Steve Ellcey  <sje@cup.hp.com>
 
 	* config/ia64/t-hpux (LIB2FUNCS_EXTRA): Remove unwind-hpux.c.
diff --git a/gcc/config/rs6000/ppc64-fp.c b/gcc/config/rs6000/ppc64-fp.c
index 284750b3ed3..184f34e1de9 100644
--- a/gcc/config/rs6000/ppc64-fp.c
+++ b/gcc/config/rs6000/ppc64-fp.c
@@ -30,7 +30,7 @@ along with GCC; see the file COPYING.  If not, write to the Free
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-#if defined(__powerpc64__) || defined (__64BIT__)
+#if defined(__powerpc64__) || defined (__64BIT__) || defined(__ppc64__)
 #define TMODES
 #include "config/fp-bit.h"
 
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index c83c49529a9..12fbbbdabbb 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -178,7 +178,7 @@
 
 #ifdef IN_LIBGCC2
 /* For libgcc2 we make sure this is a compile time constant */
-#if defined (__64BIT__) || defined (__powerpc64__)
+#if defined (__64BIT__) || defined (__powerpc64__) || defined (__ppc64__)
 #undef TARGET_POWERPC64
 #define TARGET_POWERPC64	1
 #else
diff --git a/gcc/config/rs6000/t-darwin b/gcc/config/rs6000/t-darwin
index 3f207754eea..52c3e999ba5 100644
--- a/gcc/config/rs6000/t-darwin
+++ b/gcc/config/rs6000/t-darwin
@@ -1,4 +1,6 @@
 LIB2FUNCS_EXTRA = $(srcdir)/config/rs6000/darwin-tramp.asm \
+	$(srcdir)/config/rs6000/ppc64-fp.c \
+	$(srcdir)/config/darwin-64.c \
 	$(srcdir)/config/rs6000/darwin-ldouble.c
 
 LIB2FUNCS_STATIC_EXTRA = \
-- 
2.30.2