source: patches/gcc-4.5.2-pure64-1.patch@ 185cc79

clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 185cc79 was 670bf2c, checked in by Joe Ciccone <jciccone@…>, 14 years ago

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