source: patches/gcc-4.2.0-pure64-1.patch@ 9280e88

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 9280e88 was 850f2ea6, checked in by Joe Ciccone <jciccone@…>, 18 years ago

Removed a chunk in the GCC pure64 specs patch that should NOT be there. Thanks horst for finding this.
  • Property mode set to 100644
File size: 6.8 KB
RevLine 
[08c058a]1diff -Naur gcc-4.2.0.orig/gcc/config/i386/linux64.h gcc-4.2.0/gcc/config/i386/linux64.h
2--- gcc-4.2.0.orig/gcc/config/i386/linux64.h 2007-05-16 19:21:19.000000000 -0400
3+++ gcc-4.2.0/gcc/config/i386/linux64.h 2007-05-18 17:04:05.000000000 -0400
4@@ -49,8 +49,8 @@
5 When the -shared link option is used a final link is not being
6 done. */
7
8-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
9-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
10+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
11+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
12
13 #undef LINK_SPEC
14 #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
15diff -Naur gcc-4.2.0.orig/gcc/config/i386/t-linux64 gcc-4.2.0/gcc/config/i386/t-linux64
16--- gcc-4.2.0.orig/gcc/config/i386/t-linux64 2007-05-16 19:21:19.000000000 -0400
17+++ gcc-4.2.0/gcc/config/i386/t-linux64 2007-05-18 17:04:36.000000000 -0400
18@@ -6,7 +6,7 @@
19
20 MULTILIB_OPTIONS = m64/m32
21 MULTILIB_DIRNAMES = 64 32
22-MULTILIB_OSDIRNAMES = ../lib64 ../lib
23+MULTILIB_OSDIRNAMES = ../lib ../lib32
24
25 LIBGCC = stmp-multilib
26 INSTALL_LIBGCC = install-multilib
27diff -Naur gcc-4.2.0.orig/gcc/config/mips/linux64.h gcc-4.2.0/gcc/config/mips/linux64.h
28--- gcc-4.2.0.orig/gcc/config/mips/linux64.h 2007-05-16 19:21:19.000000000 -0400
29+++ gcc-4.2.0/gcc/config/mips/linux64.h 2007-05-18 17:04:05.000000000 -0400
30@@ -36,10 +36,10 @@
31 %{!shared: %{pthread:-lpthread} \
32 %{profile:-lc_p} %{!profile: -lc}}"
33
34-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
35-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
36-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
37-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
38+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
39+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
40+#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
41+#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0"
42 #define LINUX_DYNAMIC_LINKERN32 \
43 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
44
45diff -Naur gcc-4.2.0.orig/gcc/config/mips/t-linux64 gcc-4.2.0/gcc/config/mips/t-linux64
46--- gcc-4.2.0.orig/gcc/config/mips/t-linux64 2007-05-16 19:21:19.000000000 -0400
47+++ gcc-4.2.0/gcc/config/mips/t-linux64 2007-05-18 17:05:40.000000000 -0400
48@@ -1,6 +1,6 @@
49 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
50 MULTILIB_DIRNAMES = n32 32 64
51-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
52+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
53
54 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
55
56diff -Naur gcc-4.2.0.orig/gcc/config/rs6000/linux64.h gcc-4.2.0/gcc/config/rs6000/linux64.h
57--- gcc-4.2.0.orig/gcc/config/rs6000/linux64.h 2007-05-16 19:21:19.000000000 -0400
58+++ gcc-4.2.0/gcc/config/rs6000/linux64.h 2007-05-18 17:04:05.000000000 -0400
59@@ -336,8 +336,8 @@
60 #undef LINK_OS_DEFAULT_SPEC
61 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
62
63-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
64-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
65+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
66+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
67 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
68 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
69 #if UCLIBC_DEFAULT
70diff -Naur gcc-4.2.0.orig/gcc/config/rs6000/t-linux64 gcc-4.2.0/gcc/config/rs6000/t-linux64
71--- gcc-4.2.0.orig/gcc/config/rs6000/t-linux64 2007-05-16 19:21:19.000000000 -0400
72+++ gcc-4.2.0/gcc/config/rs6000/t-linux64 2007-05-18 17:06:22.000000000 -0400
73@@ -12,7 +12,7 @@
74 MULTILIB_EXTRA_OPTS = fPIC mstrict-align
75 MULTILIB_EXCEPTIONS = m64/msoft-float
76 MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
77-MULTILIB_OSDIRNAMES = ../lib64 ../lib nof
78+MULTILIB_OSDIRNAMES = ../lib ../lib32 nof
79 MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
80
81 softfp_wrap_start := '\#ifndef __powerpc64__'
82diff -Naur gcc-4.2.0.orig/gcc/config/s390/t-linux64 gcc-4.2.0/gcc/config/s390/t-linux64
83--- gcc-4.2.0.orig/gcc/config/s390/t-linux64 2007-05-16 19:21:19.000000000 -0400
84+++ gcc-4.2.0/gcc/config/s390/t-linux64 2007-05-18 17:07:44.000000000 -0400
85@@ -1,6 +1,6 @@
86 MULTILIB_OPTIONS = m64/m31
87 MULTILIB_DIRNAMES = 64 32
88-MULTILIB_OSDIRNAMES = ../lib64 ../lib
89+MULTILIB_OSDIRNAMES = ../lib ../lib32
90
91 LIBGCC = stmp-multilib
92 INSTALL_LIBGCC = install-multilib
93diff -Naur gcc-4.2.0.orig/gcc/config/sparc/linux64.h gcc-4.2.0/gcc/config/sparc/linux64.h
94--- gcc-4.2.0.orig/gcc/config/sparc/linux64.h 2007-05-16 19:21:19.000000000 -0400
95+++ gcc-4.2.0/gcc/config/sparc/linux64.h 2007-05-18 17:04:05.000000000 -0400
96@@ -144,8 +144,8 @@
97
98 /* If ELF is the default format, we should not use /lib/elf. */
99
100-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
101-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
102+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
103+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
104 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
105 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
106 #if UCLIBC_DEFAULT
107@@ -167,7 +167,7 @@
108 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
109 { "link_arch", LINK_ARCH_SPEC },
110
111-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
112+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
113 %{!shared: \
114 %{!ibcs: \
115 %{!static: \
116@@ -176,7 +176,7 @@
117 %{static:-static}}} \
118 "
119
120-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
121+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
122 %{!shared: \
123 %{!ibcs: \
124 %{!static: \
125@@ -257,7 +257,7 @@
126 #else /* !SPARC_BI_ARCH */
127
128 #undef LINK_SPEC
129-#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
130+#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
131 %{!shared: \
132 %{!ibcs: \
133 %{!static: \
134diff -Naur gcc-4.2.0.orig/gcc/config/sparc/linux.h gcc-4.2.0/gcc/config/sparc/linux.h
135--- gcc-4.2.0.orig/gcc/config/sparc/linux.h 2007-05-16 19:21:19.000000000 -0400
136+++ gcc-4.2.0/gcc/config/sparc/linux.h 2007-05-18 17:04:05.000000000 -0400
137@@ -133,7 +133,7 @@
138
139
140 #undef LINK_SPEC
141-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
142+#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
143 %{!mno-relax:%{!r:-relax}} \
144 %{!shared: \
145 %{!ibcs: \
146diff -Naur gcc-4.2.0.orig/gcc/config/sparc/t-linux64 gcc-4.2.0/gcc/config/sparc/t-linux64
147--- gcc-4.2.0.orig/gcc/config/sparc/t-linux64 2007-05-16 19:21:19.000000000 -0400
148+++ gcc-4.2.0/gcc/config/sparc/t-linux64 2007-05-18 17:06:53.000000000 -0400
149@@ -1,6 +1,6 @@
150 MULTILIB_OPTIONS = m64/m32
151 MULTILIB_DIRNAMES = 64 32
152-MULTILIB_OSDIRNAMES = ../lib64 ../lib
153+MULTILIB_OSDIRNAMES = ../lib ../lib32
154
155 LIBGCC = stmp-multilib
156 INSTALL_LIBGCC = install-multilib
157@@ -10,4 +10,4 @@
158
159 CRTSTUFF_T_CFLAGS = `if test x$$($(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) \
160 -print-multi-os-directory) \
161- = x../lib64; then echo -mcmodel=medany; fi`
162+ = x../lib; then echo -mcmodel=medany; fi`
Note: See TracBrowser for help on using the repository browser.