source: patches/gcc-4.5.1-pure64-2.patch@ 616b1809

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 616b1809 was 41969c7, checked in by Joe Ciccone <jciccone@…>, 14 years ago

Updated the GCC Pure64 Patch to -2. -1 has the GCC Pure64 Patch to -2. -1 has inconsistancies and errors.
  • Property mode set to 100644
File size: 8.2 KB
RevLine 
[41969c7]1ubmitted By: Joe Ciccone <jciccone@gmail.com>
2Date: 07-25-2010
3Initial Package Version: 3.4.6
4Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
5 the Pure LFS project.
6Upstream Status: Not Applied - CLFS Specific
7Description: This patch makes changes to the paths for pure64, eg 64bit libs
8 in /usr/lib, 32bit in /usr/lib32.
9
10diff -Naur gcc-4.5.1.orig/gcc/config/i386/linux64.h gcc-4.5.1/gcc/config/i386/linux64.h
11--- gcc-4.5.1.orig/gcc/config/i386/linux64.h 2010-03-24 20:44:48.000000000 +0000
12+++ gcc-4.5.1/gcc/config/i386/linux64.h 2010-08-08 22:28:13.875438085 +0000
13@@ -58,8 +58,8 @@
14 When the -shared link option is used a final link is not being
15 done. */
16
17-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
18-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
19+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
20+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
21
22 #if TARGET_64BIT_DEFAULT
23 #define SPEC_32 "m32"
24diff -Naur gcc-4.5.1.orig/gcc/config/i386/t-linux64 gcc-4.5.1/gcc/config/i386/t-linux64
25--- gcc-4.5.1.orig/gcc/config/i386/t-linux64 2009-04-21 19:03:23.000000000 +0000
26+++ gcc-4.5.1/gcc/config/i386/t-linux64 2010-08-08 22:28:13.875438085 +0000
27@@ -25,7 +25,7 @@
28
29 MULTILIB_OPTIONS = m64/m32
30 MULTILIB_DIRNAMES = 64 32
31-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
32+MULTILIB_OSDIRNAMES = ../lib ../lib32
33
34 LIBGCC = stmp-multilib
35 INSTALL_LIBGCC = install-multilib
36diff -Naur gcc-4.5.1.orig/gcc/config/linux.h gcc-4.5.1/gcc/config/linux.h
37--- gcc-4.5.1.orig/gcc/config/linux.h 2009-04-09 15:00:19.000000000 +0000
38+++ gcc-4.5.1/gcc/config/linux.h 2010-08-08 22:28:13.878326405 +0000
39@@ -118,7 +118,7 @@
40 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
41 supporting both 32-bit and 64-bit compilation. */
42 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
43-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
44+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
45 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
46 #define LINUX_DYNAMIC_LINKER \
47 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER)
48diff -Naur gcc-4.5.1.orig/gcc/config/mips/linux64.h gcc-4.5.1/gcc/config/mips/linux64.h
49--- gcc-4.5.1.orig/gcc/config/mips/linux64.h 2009-02-20 15:20:38.000000000 +0000
50+++ gcc-4.5.1/gcc/config/mips/linux64.h 2010-08-08 22:28:13.878326405 +0000
51@@ -35,10 +35,10 @@
52 %{!shared: \
53 %{profile:-lc_p} %{!profile:-lc}}"
54
55-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
56-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
57-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
58-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
59+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
60+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
61+#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
62+#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0"
63 #define LINUX_DYNAMIC_LINKERN32 \
64 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
65
66diff -Naur gcc-4.5.1.orig/gcc/config/mips/t-linux64 gcc-4.5.1/gcc/config/mips/t-linux64
67--- gcc-4.5.1.orig/gcc/config/mips/t-linux64 2009-04-21 19:03:23.000000000 +0000
68+++ gcc-4.5.1/gcc/config/mips/t-linux64 2010-08-08 22:28:13.878326405 +0000
69@@ -18,7 +18,7 @@
70
71 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
72 MULTILIB_DIRNAMES = n32 32 64
73-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
74+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
75
76 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
77
78diff -Naur gcc-4.5.1.orig/gcc/config/rs6000/linux64.h gcc-4.5.1/gcc/config/rs6000/linux64.h
79--- gcc-4.5.1.orig/gcc/config/rs6000/linux64.h 2010-03-17 04:44:37.000000000 +0000
80+++ gcc-4.5.1/gcc/config/rs6000/linux64.h 2010-08-08 22:28:13.878326405 +0000
81@@ -348,9 +348,9 @@
82 #undef LINK_OS_DEFAULT_SPEC
83 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
84
85-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
86-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
87-#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
88+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
89+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
90+#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
91 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
92 #if UCLIBC_DEFAULT
93 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}"
94diff -Naur gcc-4.5.1.orig/gcc/config/rs6000/t-linux64 gcc-4.5.1/gcc/config/rs6000/t-linux64
95--- gcc-4.5.1.orig/gcc/config/rs6000/t-linux64 2009-04-21 19:03:23.000000000 +0000
96+++ gcc-4.5.1/gcc/config/rs6000/t-linux64 2010-08-08 22:28:13.878326405 +0000
97@@ -36,7 +36,7 @@
98 MULTILIB_EXTRA_OPTS = fPIC mstrict-align
99 MULTILIB_EXCEPTIONS = m64/msoft-float
100 MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
101-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
102+MULTILIB_OSDIRNAMES = ../lib ../lib32 nof
103 MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
104
105 softfp_wrap_start := '\#ifndef __powerpc64__'
106diff -Naur gcc-4.5.1.orig/gcc/config/s390/linux.h gcc-4.5.1/gcc/config/s390/linux.h
107--- gcc-4.5.1.orig/gcc/config/s390/linux.h 2007-08-02 10:49:31.000000000 +0000
108+++ gcc-4.5.1/gcc/config/s390/linux.h 2010-08-08 22:28:13.878326405 +0000
109@@ -72,7 +72,7 @@
110 #define MULTILIB_DEFAULTS { "m31" }
111 #endif
112
113-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
114+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
115 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
116
117 #undef LINK_SPEC
118diff -Naur gcc-4.5.1.orig/gcc/config/s390/t-linux64 gcc-4.5.1/gcc/config/s390/t-linux64
119--- gcc-4.5.1.orig/gcc/config/s390/t-linux64 2009-10-07 08:26:47.000000000 +0000
120+++ gcc-4.5.1/gcc/config/s390/t-linux64 2010-08-08 22:28:13.878326405 +0000
121@@ -1,3 +1,3 @@
122 MULTILIB_OPTIONS = m64/m31
123 MULTILIB_DIRNAMES = 64 32
124-MULTILIB_OSDIRNAMES = ../lib64 ../lib
125+MULTILIB_OSDIRNAMES = ../lib ../lib32
126diff -Naur gcc-4.5.1.orig/gcc/config/sparc/linux.h gcc-4.5.1/gcc/config/sparc/linux.h
127--- gcc-4.5.1.orig/gcc/config/sparc/linux.h 2009-12-07 23:31:01.000000000 +0000
128+++ gcc-4.5.1/gcc/config/sparc/linux.h 2010-08-08 22:28:13.882452246 +0000
129@@ -86,7 +86,7 @@
130 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
131
132 #undef LINK_SPEC
133-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
134+#define LINK_SPEC "-m elf32_sparc -Y P,/lib32 %{shared:-shared} \
135 %{!mno-relax:%{!r:-relax}} \
136 %{!shared: \
137 %{!ibcs: \
138diff -Naur gcc-4.5.1.orig/gcc/config/sparc/linux64.h gcc-4.5.1/gcc/config/sparc/linux64.h
139--- gcc-4.5.1.orig/gcc/config/sparc/linux64.h 2009-12-07 23:31:01.000000000 +0000
140+++ gcc-4.5.1/gcc/config/sparc/linux64.h 2010-08-08 22:28:13.882452246 +0000
141@@ -109,8 +109,8 @@
142
143 /* If ELF is the default format, we should not use /lib/elf. */
144
145-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
146-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
147+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
148+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
149
150 #ifdef SPARC_BI_ARCH
151
152@@ -121,7 +121,7 @@
153 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
154 { "link_arch", LINK_ARCH_SPEC },
155
156-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
157+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/lib32 %{shared:-shared} \
158 %{!shared: \
159 %{!ibcs: \
160 %{!static: \
161@@ -130,7 +130,7 @@
162 %{static:-static}}} \
163 "
164
165-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
166+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
167 %{!shared: \
168 %{!ibcs: \
169 %{!static: \
170@@ -211,7 +211,7 @@
171 #else /* !SPARC_BI_ARCH */
172
173 #undef LINK_SPEC
174-#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
175+#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
176 %{!shared: \
177 %{!ibcs: \
178 %{!static: \
179diff -Naur gcc-4.5.1.orig/gcc/config/sparc/t-linux64 gcc-4.5.1/gcc/config/sparc/t-linux64
180--- gcc-4.5.1.orig/gcc/config/sparc/t-linux64 2009-04-21 19:03:23.000000000 +0000
181+++ gcc-4.5.1/gcc/config/sparc/t-linux64 2010-08-08 22:28:13.882452246 +0000
182@@ -19,7 +19,7 @@
183
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.