From 9b420a6a58ea7c42ad045a2ab3d8c036c9a2375a Mon Sep 17 00:00:00 2001
From: Bo Thorsen <bo@suse.de>
Date: Thu, 28 Feb 2002 15:16:17 +0000
Subject: [PATCH] linux64.h (LINK_SPEC): Fix 32/64 bit compilation.

2002-02-28  Bo Thorsen  <bo@suse.de>

	* config/i386/linux64.h (LINK_SPEC): Fix 32/64 bit compilation.
	(STARTFILE_SPEC): Add 64 bit files.
	(ENDFILE_SPEC): Likewise.

From-SVN: r50137
---
 gcc/ChangeLog             |  6 ++++++
 gcc/config/i386/linux64.h | 25 ++++++++++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4aa251496f4..64f1d8858a3 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-28  Bo Thorsen  <bo@suse.de>
+
+	* config/i386/linux64.h (LINK_SPEC): Fix 32/64 bit compilation.
+	(STARTFILE_SPEC): Add 64 bit files.
+	(ENDFILE_SPEC): Likewise.
+
 2002-02-25  Jason Merrill  <jason@redhat.com>
 
 	* c-decl.c (finish_function): Only warn about missing return
diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
index 8d70972638c..925cc20d1e8 100644
--- a/gcc/config/i386/linux64.h
+++ b/gcc/config/i386/linux64.h
@@ -39,10 +39,29 @@ Boston, MA 02111-1307, USA.  */
    done.  */
 
 #undef	LINK_SPEC
-#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} %{shared:-shared} \
+#define LINK_SPEC "%{!m32:-m elf_x86_64 -Y P,/usr/lib64} %{m32:-m elf_i386} \
+  %{shared:-shared} \
   %{!shared: \
     %{!static: \
       %{rdynamic:-export-dynamic} \
-      %{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}} \
-      %{static:-static}}"
+      %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
+      %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
+    %{static:-static}}"
 
+#undef  STARTFILE_SPEC
+#define STARTFILE_SPEC \
+  "%{m32:%{!shared: \
+       %{pg:gcrt1.o%s} %{!pg:%{p:gcrt1.o%s} \
+       %{!p:%{profile:gcrt1.o%s} %{!profile:crt1.o%s}}}} \
+     crti.o%s %{static:crtbeginT.o%s}\
+     %{!static:%{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}} \
+   %{!m32:%{!shared: \
+       %{pg:/usr/lib64/gcrt1.o%s} %{!pg:%{p:/usr/lib64/gcrt1.o%s} \
+       %{!p:%{profile:/usr/lib64/gcrt1.o%s} %{!profile:/usr/lib64/crt1.o%s}}}}\
+     /usr/lib64/crti.o%s %{static:crtbeginT.o%s} \
+     %{!static:%{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}}"
+
+#undef  ENDFILE_SPEC
+#define ENDFILE_SPEC "\
+  %{m32:%{!shared:crtend.o%s} %{shared:crtendS.o%s} crtn.o%s} \
+  %{!m32:%{!shared:crtend.o%s} %{shared:crtendS.o%s} /usr/lib64/crtn.o%s}"