aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorBo Thorsen <bo@suse.de>2002-02-28 15:16:17 +0000
committerBo Thorsen <bo@gcc.gnu.org>2002-02-28 16:16:17 +0100
commit9b420a6a58ea7c42ad045a2ab3d8c036c9a2375a (patch)
tree6d269eb5bb1f6a1caa3897e1b0ca561f93f3dc02 /gcc
parent46cfb1010def3669407095b58a1ef83ad90acf62 (diff)
downloadgcc-9b420a6a58ea7c42ad045a2ab3d8c036c9a2375a.zip
gcc-9b420a6a58ea7c42ad045a2ab3d8c036c9a2375a.tar.gz
gcc-9b420a6a58ea7c42ad045a2ab3d8c036c9a2375a.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/config/i386/linux64.h25
2 files changed, 28 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4aa2514..64f1d88 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 8d70972..925cc20 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}"