From 0a80d4985d6c1f430e8a845750f8836657b2febf Mon Sep 17 00:00:00 2001
From: geoffk <geoffk@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 27 Apr 2004 23:07:52 +0000
Subject: [PATCH] 	* config/darwin.h (STARTFILE_SPEC): Use %s to find
 crt2.o. 	* config/darwin-crt2.c: Only have contents on __ppc__.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@81230 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog            | 5 +++++
 gcc/config/darwin-crt2.c | 9 ++++++++-
 gcc/config/darwin.h      | 4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b72cf396a23..42936724fc3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-27  Geoffrey Keating  <geoffk@apple.com>
+
+	* config/darwin.h (STARTFILE_SPEC): Use %s to find crt2.o.
+	* config/darwin-crt2.c: Only have contents on __ppc__.
+
 2004-04-27  Bob Wilson  <bob.wilson@acm.org>
 
 	* config/xtensa/xtensa.c (call_insn_operand): Check
diff --git a/gcc/config/darwin-crt2.c b/gcc/config/darwin-crt2.c
index 1ea2413c809..e225279bfa5 100644
--- a/gcc/config/darwin-crt2.c
+++ b/gcc/config/darwin-crt2.c
@@ -1,5 +1,5 @@
 /* KeyMgr backwards-compatibility support for Darwin.
-   Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -34,6 +34,11 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "tconfig.h"
 #include "tsystem.h"
 
+/* This file doesn't do anything useful on non-powerpc targets, since they
+   don't have backwards compatibility anyway.  */
+
+#ifdef __ppc__
+
 /* Homemade decls substituting for getsect.h and dyld.h, so cross
    compilation works.  */
 struct mach_header;
@@ -149,3 +154,5 @@ __darwin_gcc3_preregister_frame_info (void)
   _dyld_register_func_for_add_image (darwin_unwind_dyld_add_image_hook);
   _dyld_register_func_for_remove_image (darwin_unwind_dyld_remove_image_hook);
 }
+
+#endif  /* __ppc__ */
diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h
index 28b58a5e179..de8d0c419f0 100644
--- a/gcc/config/darwin.h
+++ b/gcc/config/darwin.h
@@ -289,11 +289,11 @@ Boston, MA 02111-1307, USA.  */
      %{!Zbundle:%{pg:%{static:-lgcrt0.o} \
                      %{!static:%{object:-lgcrt0.o} \
                                %{!object:%{preload:-lgcrt0.o} \
-                                 %{!preload:-lgcrt1.o -lcrt2.o}}}} \
+                                 %{!preload:-lgcrt1.o crt2.o%s}}}} \
                 %{!pg:%{static:-lcrt0.o} \
                       %{!static:%{object:-lcrt0.o} \
                                 %{!object:%{preload:-lcrt0.o} \
-                                  %{!preload:-lcrt1.o -lcrt2.o}}}}}}"
+                                  %{!preload:-lcrt1.o crt2.o%s}}}}}}"
 
 /* The native Darwin linker doesn't necessarily place files in the order
    that they're specified on the link line.  Thus, it is pointless
-- 
2.11.0