source: patches/gcc-4.3.3-pure64-1.patch@ 33b3933

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 33b3933 was 0804c00, checked in by Jim Gifford <clfs@…>, 16 years ago

Updated to GCC 4.3.3 - Patches
  • Property mode set to 100644
File size: 8.5 KB
RevLine 
[0804c00]1Submitted By: Jim Gifford (jim at cross-lfs dot org)
2Date: 01-25-2009
3Initial Package Version: 4.3.3
4Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
5 the Pure LFS project.
6Upstream Status: Not Applied
7Description: This patch modifies the location of the dynamic linker for gcc-4.3.3.
8
9diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux64.h gcc-4.3.3/gcc/config/i386/linux64.h
10--- gcc-4.3.3.orig/gcc/config/i386/linux64.h 2007-08-02 03:49:31.000000000 -0700
11+++ gcc-4.3.3/gcc/config/i386/linux64.h 2009-01-25 00:49:04.956938399 -0800
[6a043e2]12@@ -53,8 +53,8 @@
[36d2525]13 When the -shared link option is used a final link is not being
14 done. */
15
16-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
17-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
18+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
19+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
20
[6a043e2]21 #if TARGET_64BIT_DEFAULT
22 #define SPEC_32 "m32"
[0804c00]23diff -Naur gcc-4.3.3.orig/gcc/config/i386/t-linux64 gcc-4.3.3/gcc/config/i386/t-linux64
24--- gcc-4.3.3.orig/gcc/config/i386/t-linux64 2007-09-27 12:56:06.000000000 -0700
25+++ gcc-4.3.3/gcc/config/i386/t-linux64 2009-01-25 00:49:11.211799413 -0800
[36d2525]26@@ -13,7 +13,7 @@
27
28 MULTILIB_OPTIONS = m64/m32
29 MULTILIB_DIRNAMES = 64 32
30-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
[0804c00]31+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
[36d2525]32
33 LIBGCC = stmp-multilib
34 INSTALL_LIBGCC = install-multilib
[0804c00]35diff -Naur gcc-4.3.3.orig/gcc/config/linux.h gcc-4.3.3/gcc/config/linux.h
36--- gcc-4.3.3.orig/gcc/config/linux.h 2007-08-02 03:49:31.000000000 -0700
37+++ gcc-4.3.3/gcc/config/linux.h 2009-01-25 00:49:09.037979047 -0800
38@@ -113,7 +113,7 @@
39 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
40 supporting both 32-bit and 64-bit compilation. */
41 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
42-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
43+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
44 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
45 #define LINUX_DYNAMIC_LINKER \
46 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
47diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux64.h gcc-4.3.3/gcc/config/mips/linux64.h
48--- gcc-4.3.3.orig/gcc/config/mips/linux64.h 2007-08-02 03:49:31.000000000 -0700
49+++ gcc-4.3.3/gcc/config/mips/linux64.h 2009-01-25 00:49:09.124111188 -0800
[6a043e2]50@@ -38,10 +38,10 @@
51 %{!shared: \
52 %{profile:-lc_p} %{!profile:-lc}}"
[36d2525]53
54-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
55-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
56-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
57-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
58+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
59+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
60+#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
61+#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0"
62 #define LINUX_DYNAMIC_LINKERN32 \
63 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
64
[0804c00]65diff -Naur gcc-4.3.3.orig/gcc/config/mips/t-linux64 gcc-4.3.3/gcc/config/mips/t-linux64
66--- gcc-4.3.3.orig/gcc/config/mips/t-linux64 2006-06-06 05:51:24.000000000 -0700
67+++ gcc-4.3.3/gcc/config/mips/t-linux64 2009-01-25 00:49:11.265119430 -0800
[36d2525]68@@ -1,6 +1,6 @@
69 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
70 MULTILIB_DIRNAMES = n32 32 64
71-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
72+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
73
74 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
75
[0804c00]76diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/linux64.h gcc-4.3.3/gcc/config/rs6000/linux64.h
77--- gcc-4.3.3.orig/gcc/config/rs6000/linux64.h 2007-08-02 03:49:31.000000000 -0700
78+++ gcc-4.3.3/gcc/config/rs6000/linux64.h 2009-01-25 00:49:01.265542673 -0800
79@@ -339,9 +339,9 @@
[36d2525]80 #undef LINK_OS_DEFAULT_SPEC
81 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
82
83-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
84-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
[0804c00]85-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
[36d2525]86+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
87+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
[0804c00]88+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
[36d2525]89 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
90 #if UCLIBC_DEFAULT
[0804c00]91 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
92diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/t-linux64 gcc-4.3.3/gcc/config/rs6000/t-linux64
93--- gcc-4.3.3.orig/gcc/config/rs6000/t-linux64 2007-09-27 12:56:06.000000000 -0700
94+++ gcc-4.3.3/gcc/config/rs6000/t-linux64 2009-01-25 00:49:11.137970107 -0800
[36d2525]95@@ -19,7 +19,7 @@
96 MULTILIB_EXTRA_OPTS = fPIC mstrict-align
97 MULTILIB_EXCEPTIONS = m64/msoft-float
98 MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
99-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
100+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
101 MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
102
103 softfp_wrap_start := '\#ifndef __powerpc64__'
[0804c00]104diff -Naur gcc-4.3.3.orig/gcc/config/s390/linux.h gcc-4.3.3/gcc/config/s390/linux.h
105--- gcc-4.3.3.orig/gcc/config/s390/linux.h 2007-08-02 03:49:31.000000000 -0700
106+++ gcc-4.3.3/gcc/config/s390/linux.h 2009-01-25 00:49:04.058697303 -0800
107@@ -72,7 +72,7 @@
108 #define MULTILIB_DEFAULTS { "m31" }
109 #endif
110
111-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
112+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
113 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
114
115 #undef LINK_SPEC
116diff -Naur gcc-4.3.3.orig/gcc/config/s390/t-linux64 gcc-4.3.3/gcc/config/s390/t-linux64
117--- gcc-4.3.3.orig/gcc/config/s390/t-linux64 2006-02-06 09:41:54.000000000 -0800
118+++ gcc-4.3.3/gcc/config/s390/t-linux64 2009-01-25 00:49:11.178985891 -0800
[36d2525]119@@ -1,6 +1,6 @@
120 MULTILIB_OPTIONS = m64/m31
121 MULTILIB_DIRNAMES = 64 32
122-MULTILIB_OSDIRNAMES = ../lib64 ../lib
123+MULTILIB_OSDIRNAMES = ../lib ../lib32
124
125 LIBGCC = stmp-multilib
126 INSTALL_LIBGCC = install-multilib
[0804c00]127diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h
128--- gcc-4.3.3.orig/gcc/config/sparc/linux64.h 2007-10-18 21:29:38.000000000 -0700
129+++ gcc-4.3.3/gcc/config/sparc/linux64.h 2009-01-25 00:49:10.604768822 -0800
130@@ -144,9 +144,9 @@
[36d2525]131
132 /* If ELF is the default format, we should not use /lib/elf. */
133
134-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
135-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
[0804c00]136-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
[36d2525]137+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
138+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
[0804c00]139+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
[36d2525]140 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
141 #if UCLIBC_DEFAULT
[0804c00]142 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
[6a043e2]143@@ -167,7 +167,7 @@
[36d2525]144 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
145 { "link_arch", LINK_ARCH_SPEC },
146
147-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
148+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
149 %{!shared: \
150 %{!ibcs: \
151 %{!static: \
[6a043e2]152@@ -176,7 +176,7 @@
[36d2525]153 %{static:-static}}} \
154 "
155
156-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
157+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
158 %{!shared: \
159 %{!ibcs: \
160 %{!static: \
[6a043e2]161@@ -257,7 +257,7 @@
[36d2525]162 #else /* !SPARC_BI_ARCH */
163
164 #undef LINK_SPEC
165-#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
166+#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
167 %{!shared: \
168 %{!ibcs: \
169 %{!static: \
[0804c00]170diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h
171--- gcc-4.3.3.orig/gcc/config/sparc/linux.h 2007-08-02 03:49:31.000000000 -0700
172+++ gcc-4.3.3/gcc/config/sparc/linux.h 2009-01-25 00:49:10.863168878 -0800
[36d2525]173@@ -132,7 +132,7 @@
174
175
176 #undef LINK_SPEC
177-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
178+#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
179 %{!mno-relax:%{!r:-relax}} \
180 %{!shared: \
181 %{!ibcs: \
[0804c00]182diff -Naur gcc-4.3.3.orig/gcc/config/sparc/t-linux64 gcc-4.3.3/gcc/config/sparc/t-linux64
183--- gcc-4.3.3.orig/gcc/config/sparc/t-linux64 2006-02-07 23:19:43.000000000 -0800
184+++ gcc-4.3.3/gcc/config/sparc/t-linux64 2009-01-25 00:49:11.314338874 -0800
[36d2525]185@@ -1,6 +1,6 @@
186 MULTILIB_OPTIONS = m64/m32
187 MULTILIB_DIRNAMES = 64 32
188-MULTILIB_OSDIRNAMES = ../lib64 ../lib
189+MULTILIB_OSDIRNAMES = ../lib ../lib32
190
191 LIBGCC = stmp-multilib
192 INSTALL_LIBGCC = install-multilib
Note: See TracBrowser for help on using the repository browser.