source: patches/gcc-4.4.2-pure64-1.patch@ c695188

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since c695188 was 9722468, checked in by Joe Ciccone <jciccone@…>, 15 years ago

Add the new GCC Patches.
  • Property mode set to 100644
File size: 8.4 KB
RevLine 
[9722468]1Submitted By: Jim Gifford (jim at cross-lfs dot org)
2Date: 01-01-2010
3Initial Package Version: 4.4.2
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.4.2.
8
9diff -Naur gcc-4.4.2.orig/gcc/config/i386/linux64.h gcc-4.4.2/gcc/config/i386/linux64.h
10--- gcc-4.4.2.orig/gcc/config/i386/linux64.h 2009-04-09 19:23:07.000000000 -0400
11+++ gcc-4.4.2/gcc/config/i386/linux64.h 2010-01-01 17:11:45.279543460 -0500
12@@ -58,8 +58,8 @@
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
21 #undef ASM_SPEC
22 #define ASM_SPEC "%{v:-V} %{Qy:} %{!Qn:-Qy} %{n} %{T} %{Ym,*} %{Yd,*} \
23diff -Naur gcc-4.4.2.orig/gcc/config/i386/t-linux64 gcc-4.4.2/gcc/config/i386/t-linux64
24--- gcc-4.4.2.orig/gcc/config/i386/t-linux64 2008-07-02 11:59:19.000000000 -0400
25+++ gcc-4.4.2/gcc/config/i386/t-linux64 2010-01-01 17:11:52.924593406 -0500
26@@ -7,7 +7,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)
31+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
32
33 LIBGCC = stmp-multilib
34 INSTALL_LIBGCC = install-multilib
35diff -Naur gcc-4.4.2.orig/gcc/config/linux.h gcc-4.4.2/gcc/config/linux.h
36--- gcc-4.4.2.orig/gcc/config/linux.h 2009-04-09 19:23:07.000000000 -0400
37+++ gcc-4.4.2/gcc/config/linux.h 2010-01-01 17:11:47.200561170 -0500
38@@ -118,7 +118,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.4.2.orig/gcc/config/mips/linux64.h gcc-4.4.2/gcc/config/mips/linux64.h
48--- gcc-4.4.2.orig/gcc/config/mips/linux64.h 2009-02-20 10:20:38.000000000 -0500
49+++ gcc-4.4.2/gcc/config/mips/linux64.h 2010-01-01 17:11:50.684480405 -0500
50@@ -35,10 +35,10 @@
51 %{!shared: \
52 %{profile:-lc_p} %{!profile:-lc}}"
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
65diff -Naur gcc-4.4.2.orig/gcc/config/mips/t-linux64 gcc-4.4.2/gcc/config/mips/t-linux64
66--- gcc-4.4.2.orig/gcc/config/mips/t-linux64 2006-06-06 08:51:24.000000000 -0400
67+++ gcc-4.4.2/gcc/config/mips/t-linux64 2010-01-01 17:11:52.997573274 -0500
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
76diff -Naur gcc-4.4.2.orig/gcc/config/rs6000/linux64.h gcc-4.4.2/gcc/config/rs6000/linux64.h
77--- gcc-4.4.2.orig/gcc/config/rs6000/linux64.h 2009-04-09 19:23:07.000000000 -0400
78+++ gcc-4.4.2/gcc/config/rs6000/linux64.h 2010-01-01 17:11:46.859501493 -0500
79@@ -342,9 +342,9 @@
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"
85-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
86+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
87+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
88+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
89 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
90 #if UCLIBC_DEFAULT
91 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
92diff -Naur gcc-4.4.2.orig/gcc/config/rs6000/t-linux64 gcc-4.4.2/gcc/config/rs6000/t-linux64
93--- gcc-4.4.2.orig/gcc/config/rs6000/t-linux64 2007-09-27 15:56:06.000000000 -0400
94+++ gcc-4.4.2/gcc/config/rs6000/t-linux64 2010-01-01 17:11:52.946593294 -0500
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__'
104diff -Naur gcc-4.4.2.orig/gcc/config/s390/linux.h gcc-4.4.2/gcc/config/s390/linux.h
105--- gcc-4.4.2.orig/gcc/config/s390/linux.h 2007-08-02 06:49:31.000000000 -0400
106+++ gcc-4.4.2/gcc/config/s390/linux.h 2010-01-01 17:11:47.769624176 -0500
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.4.2.orig/gcc/config/s390/t-linux64 gcc-4.4.2/gcc/config/s390/t-linux64
117--- gcc-4.4.2.orig/gcc/config/s390/t-linux64 2006-02-06 12:41:54.000000000 -0500
118+++ gcc-4.4.2/gcc/config/s390/t-linux64 2010-01-01 17:11:52.955593094 -0500
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
127diff -Naur gcc-4.4.2.orig/gcc/config/sparc/linux64.h gcc-4.4.2/gcc/config/sparc/linux64.h
128--- gcc-4.4.2.orig/gcc/config/sparc/linux64.h 2009-02-20 10:20:38.000000000 -0500
129+++ gcc-4.4.2/gcc/config/sparc/linux64.h 2010-01-01 17:11:48.479625464 -0500
130@@ -109,8 +109,8 @@
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"
136+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
137+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
138
139 #ifdef SPARC_BI_ARCH
140
141@@ -121,7 +121,7 @@
142 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
143 { "link_arch", LINK_ARCH_SPEC },
144
145-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
146+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib32 %{shared:-shared} \
147 %{!shared: \
148 %{!ibcs: \
149 %{!static: \
150@@ -130,7 +130,7 @@
151 %{static:-static}}} \
152 "
153
154-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
155+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \
156 %{!shared: \
157 %{!ibcs: \
158 %{!static: \
159@@ -211,7 +211,7 @@
160 #else /* !SPARC_BI_ARCH */
161
162 #undef LINK_SPEC
163-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
164+#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \
165 %{!shared: \
166 %{!ibcs: \
167 %{!static: \
168diff -Naur gcc-4.4.2.orig/gcc/config/sparc/linux.h gcc-4.4.2/gcc/config/sparc/linux.h
169--- gcc-4.4.2.orig/gcc/config/sparc/linux.h 2009-02-20 10:20:38.000000000 -0500
170+++ gcc-4.4.2/gcc/config/sparc/linux.h 2010-01-01 17:11:48.397625419 -0500
171@@ -86,7 +86,7 @@
172 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
173
174 #undef LINK_SPEC
175-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
176+#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
177 %{!mno-relax:%{!r:-relax}} \
178 %{!shared: \
179 %{!ibcs: \
180diff -Naur gcc-4.4.2.orig/gcc/config/sparc/t-linux64 gcc-4.4.2/gcc/config/sparc/t-linux64
181--- gcc-4.4.2.orig/gcc/config/sparc/t-linux64 2006-02-08 02:19:43.000000000 -0500
182+++ gcc-4.4.2/gcc/config/sparc/t-linux64 2010-01-01 17:11:52.979477318 -0500
183@@ -1,6 +1,6 @@
184 MULTILIB_OPTIONS = m64/m32
185 MULTILIB_DIRNAMES = 64 32
186-MULTILIB_OSDIRNAMES = ../lib64 ../lib
187+MULTILIB_OSDIRNAMES = ../lib ../lib32
188
189 LIBGCC = stmp-multilib
190 INSTALL_LIBGCC = install-multilib
Note: See TracBrowser for help on using the repository browser.