source: patches/gcc-4.0.3-pure64-1.patch@ 4af05f3

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 4af05f3 was 69cde8d, checked in by Jim Gifford <clfs@…>, 19 years ago

Added: All patches needed for the book.
  • Property mode set to 100644
File size: 6.3 KB
RevLine 
[69cde8d]1Submitted By: Jim Gifford (patches at jg555 dot com)
2Date: 2005-08-27
3Initial Package Version: 4.x
4Origin: Ken Moffat and Jim Gifford
5Upstream Status: LFS Specific
6Description: Make LIB64 builds in /lib instead of /lib64
7
8diff -Naur gcc-4.0.1.orig/gcc/config/i386/linux64.h gcc-4.0.1/gcc/config/i386/linux64.h
9--- gcc-4.0.1.orig/gcc/config/i386/linux64.h 2004-11-27 22:29:34.000000000 +0000
10+++ gcc-4.0.1/gcc/config/i386/linux64.h 2005-08-28 05:07:59.000000000 +0000
11@@ -60,8 +60,8 @@
12 %{!shared: \
13 %{!static: \
14 %{rdynamic:-export-dynamic} \
15- %{m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
16- %{!m32:%{!dynamic-linker:-dynamic-linker /lib64/ld-linux-x86-64.so.2}}} \
17+ %{m32:%{!dynamic-linker:-dynamic-linker /lib32/ld-linux.so.2}} \
18+ %{!m32:%{!dynamic-linker:-dynamic-linker /lib/ld-linux-x86-64.so.2}}} \
19 %{static:-static}}"
20
21 #define MULTILIB_DEFAULTS { "m64" }
22diff -Naur gcc-4.0.1.orig/gcc/config/i386/t-linux64 gcc-4.0.1/gcc/config/i386/t-linux64
23--- gcc-4.0.1.orig/gcc/config/i386/t-linux64 2002-11-28 14:47:02.000000000 +0000
24+++ gcc-4.0.1/gcc/config/i386/t-linux64 2005-08-28 05:08:37.000000000 +0000
25@@ -6,7 +6,7 @@
26
27 MULTILIB_OPTIONS = m64/m32
28 MULTILIB_DIRNAMES = 64 32
29-MULTILIB_OSDIRNAMES = ../lib64 ../lib
30+MULTILIB_OSDIRNAMES = ../lib ../lib32
31
32 LIBGCC = stmp-multilib
33 INSTALL_LIBGCC = install-multilib
34diff -Naur gcc-4.0.1.orig/gcc/config/mips/linux64.h gcc-4.0.1/gcc/config/mips/linux64.h
35--- gcc-4.0.1.orig/gcc/config/mips/linux64.h 2005-01-26 02:04:46.000000000 +0000
36+++ gcc-4.0.1/gcc/config/mips/linux64.h 2005-08-28 05:09:17.000000000 +0000
37@@ -47,9 +47,9 @@
38 %{!static: \
39 %{rdynamic:-export-dynamic} \
40 %{!dynamic-linker: \
41- %{mabi=n32: -dynamic-linker /lib32/ld.so.1} \
42- %{mabi=64: -dynamic-linker /lib64/ld.so.1} \
43- %{mabi=32: -dynamic-linker /lib/ld.so.1}}} \
44+ %{mabi=n32: -dynamic-linker /lib64/ld.so.1} \
45+ %{mabi=64: -dynamic-linker /lib/ld.so.1} \
46+ %{mabi=32: -dynamic-linker /lib32/ld.so.1}}} \
47 %{static:-static}}} \
48 %{mabi=n32:-melf32%{EB:b}%{EL:l}tsmipn32} \
49 %{mabi=64:-melf64%{EB:b}%{EL:l}tsmip} \
50diff -Naur gcc-4.0.1.orig/gcc/config/mips/t-linux64 gcc-4.0.1/gcc/config/mips/t-linux64
51--- gcc-4.0.1.orig/gcc/config/mips/t-linux64 2005-01-17 21:09:14.000000000 +0000
52+++ gcc-4.0.1/gcc/config/mips/t-linux64 2005-08-28 05:09:29.000000000 +0000
53@@ -1,6 +1,6 @@
54 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
55 MULTILIB_DIRNAMES = n32 32 64
56-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
57+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
58
59 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
60
61diff -Naur gcc-4.0.1.orig/gcc/config/rs6000/linux64.h gcc-4.0.1/gcc/config/rs6000/linux64.h
62--- gcc-4.0.1.orig/gcc/config/rs6000/linux64.h 2005-04-29 00:19:47.000000000 +0000
63+++ gcc-4.0.1/gcc/config/rs6000/linux64.h 2005-08-28 05:10:24.000000000 +0000
64@@ -351,11 +351,11 @@
65
66 #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \
67 %{rdynamic:-export-dynamic} \
68- %{!dynamic-linker:-dynamic-linker /lib/ld.so.1}}}"
69+ %{!dynamic-linker:-dynamic-linker /lib32/ld.so.1}}}"
70
71 #define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \
72 %{rdynamic:-export-dynamic} \
73- %{!dynamic-linker:-dynamic-linker /lib64/ld64.so.1}}}"
74+ %{!dynamic-linker:-dynamic-linker /lib/ld64.so.1}}}"
75
76 #undef TOC_SECTION_ASM_OP
77 #define TOC_SECTION_ASM_OP \
78diff -Naur gcc-4.0.1.orig/gcc/config/rs6000/t-linux64 gcc-4.0.1/gcc/config/rs6000/t-linux64
79--- gcc-4.0.1.orig/gcc/config/rs6000/t-linux64 2004-03-17 15:15:32.000000000 +0000
80+++ gcc-4.0.1/gcc/config/rs6000/t-linux64 2005-08-28 05:10:04.000000000 +0000
81@@ -13,7 +13,7 @@
82 MULTILIB_EXTRA_OPTS = fPIC mstrict-align
83 MULTILIB_EXCEPTIONS = m64/msoft-float
84 MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
85-MULTILIB_OSDIRNAMES = ../lib64 ../lib nof
86+MULTILIB_OSDIRNAMES = ../lib ../lib32 nof
87 MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
88
89 # We want fine grained libraries, so use the new code to build the
90diff -Naur gcc-4.0.1.orig/gcc/config/sparc/linux64.h gcc-4.0.1/gcc/config/sparc/linux64.h
91--- gcc-4.0.1.orig/gcc/config/sparc/linux64.h 2005-04-04 15:32:00.000000000 +0000
92+++ gcc-4.0.1/gcc/config/sparc/linux64.h 2005-08-28 05:11:35.000000000 +0000
93@@ -167,21 +167,21 @@
94 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
95 { "link_arch", LINK_ARCH_SPEC },
96
97-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
98+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
99 %{!shared: \
100 %{!ibcs: \
101 %{!static: \
102 %{rdynamic:-export-dynamic} \
103- %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
104+ %{!dynamic-linker:-dynamic-linker /lib32/ld-linux.so.2}} \
105 %{static:-static}}} \
106 "
107
108-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
109+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
110 %{!shared: \
111 %{!ibcs: \
112 %{!static: \
113 %{rdynamic:-export-dynamic} \
114- %{!dynamic-linker:-dynamic-linker /lib64/ld-linux.so.2}} \
115+ %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
116 %{static:-static}}} \
117 "
118
119@@ -257,12 +257,12 @@
120 #else /* !SPARC_BI_ARCH */
121
122 #undef LINK_SPEC
123-#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
124+#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
125 %{!shared: \
126 %{!ibcs: \
127 %{!static: \
128 %{rdynamic:-export-dynamic} \
129- %{!dynamic-linker:-dynamic-linker /lib64/ld-linux.so.2}} \
130+ %{!dynamic-linker:-dynamic-linker /lib/ld-linux.so.2}} \
131 %{static:-static}}} \
132 %{mlittle-endian:-EL} \
133 %{!mno-relax:%{!r:-relax}} \
134diff -Naur gcc-4.0.1.orig/gcc/config/sparc/t-linux64 gcc-4.0.1/gcc/config/sparc/t-linux64
135--- gcc-4.0.1.orig/gcc/config/sparc/t-linux64 2004-04-01 16:05:20.000000000 +0000
136+++ gcc-4.0.1/gcc/config/sparc/t-linux64 2005-08-28 05:12:02.000000000 +0000
137@@ -1,6 +1,6 @@
138 MULTILIB_OPTIONS = m64/m32
139 MULTILIB_DIRNAMES = 64 32
140-MULTILIB_OSDIRNAMES = ../lib64 ../lib
141+MULTILIB_OSDIRNAMES = ../lib ../lib32
142
143 LIBGCC = stmp-multilib
144 INSTALL_LIBGCC = install-multilib
145@@ -16,4 +16,4 @@
146
147 CRTSTUFF_T_CFLAGS = `if test x$$($(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) \
148 -print-multi-os-directory) \
149- = x../lib64; then echo -mcmodel=medany; fi`
150+ = x../lib; then echo -mcmodel=medany; fi`
Note: See TracBrowser for help on using the repository browser.