source: patches/gcc-4.2.4-pure64-1.patch@ c90a839

Last change on this file since c90a839 was 67300de, checked in by Joe Ciccone <jciccone@…>, 16 years ago

Create a clfs-1.1 branch in preperation for a RC.
  • Property mode set to 100644
File size: 7.4 KB
RevLine 
[67300de]1Submitted By: Jim Gifford (patches at jg555 dot com)
2Date: 2005-08-27
3Initial Package Version: 4.x
4Origin: Ken Moffat and Jim Gifford
5 Rediffed against 4.1.0 by Chris Staub
6 Changes for 4.2.{0,1,2} not noted
7 Rediffed against 4.2.4 and header reinstated by Ken Moffat
8Upstream Status: CLFS Specific
9Description: Make LIB64 builds in /lib instead of /lib64
10
11diff -Naur gcc-4.2.4.orig/gcc/config/i386/linux64.h gcc-4.2.4/gcc/config/i386/linux64.h
12--- gcc-4.2.4.orig/gcc/config/i386/linux64.h 2007-09-01 16:28:30.000000000 +0100
13+++ gcc-4.2.4/gcc/config/i386/linux64.h 2008-06-12 19:55:27.000000000 +0100
14@@ -48,8 +48,8 @@
15 When the -shared link option is used a final link is not being
16 done. */
17
18-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
19-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
20+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
21+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
22
23 #undef LINK_SPEC
24 #define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \
25diff -Naur gcc-4.2.4.orig/gcc/config/i386/t-linux64 gcc-4.2.4/gcc/config/i386/t-linux64
26--- gcc-4.2.4.orig/gcc/config/i386/t-linux64 2008-03-05 17:25:28.000000000 +0000
27+++ gcc-4.2.4/gcc/config/i386/t-linux64 2008-06-12 20:05:44.000000000 +0100
28@@ -13,7 +13,7 @@
29
30 MULTILIB_OPTIONS = m64/m32
31 MULTILIB_DIRNAMES = 64 32
32-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
33+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
34
35 LIBGCC = stmp-multilib
36 INSTALL_LIBGCC = install-multilib
37diff -Naur gcc-4.2.4.orig/gcc/config/mips/linux64.h gcc-4.2.4/gcc/config/mips/linux64.h
38--- gcc-4.2.4.orig/gcc/config/mips/linux64.h 2007-09-01 16:28:30.000000000 +0100
39+++ gcc-4.2.4/gcc/config/mips/linux64.h 2008-06-12 19:55:27.000000000 +0100
40@@ -35,10 +35,10 @@
41 %{!shared: %{pthread:-lpthread} \
42 %{profile:-lc_p} %{!profile: -lc}}"
43
44-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
45-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
46-#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
47-#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
48+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
49+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
50+#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
51+#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0"
52 #define LINUX_DYNAMIC_LINKERN32 \
53 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
54
55diff -Naur gcc-4.2.4.orig/gcc/config/mips/t-linux64 gcc-4.2.4/gcc/config/mips/t-linux64
56--- gcc-4.2.4.orig/gcc/config/mips/t-linux64 2006-06-06 13:51:24.000000000 +0100
57+++ gcc-4.2.4/gcc/config/mips/t-linux64 2008-06-12 19:55:27.000000000 +0100
58@@ -1,6 +1,6 @@
59 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
60 MULTILIB_DIRNAMES = n32 32 64
61-MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
62+MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
63
64 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
65
66diff -Naur gcc-4.2.4.orig/gcc/config/rs6000/linux64.h gcc-4.2.4/gcc/config/rs6000/linux64.h
67--- gcc-4.2.4.orig/gcc/config/rs6000/linux64.h 2007-09-01 16:28:30.000000000 +0100
68+++ gcc-4.2.4/gcc/config/rs6000/linux64.h 2008-06-12 19:55:27.000000000 +0100
69@@ -335,8 +335,8 @@
70 #undef LINK_OS_DEFAULT_SPEC
71 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
72
73-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
74-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
75+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
76+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
77 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
78 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
79 #if UCLIBC_DEFAULT
80diff -Naur gcc-4.2.4.orig/gcc/config/rs6000/t-linux64 gcc-4.2.4/gcc/config/rs6000/t-linux64
81--- gcc-4.2.4.orig/gcc/config/rs6000/t-linux64 2008-03-05 17:25:28.000000000 +0000
82+++ gcc-4.2.4/gcc/config/rs6000/t-linux64 2008-06-12 20:13:59.000000000 +0100
83@@ -19,7 +19,7 @@
84 MULTILIB_EXTRA_OPTS = fPIC mstrict-align
85 MULTILIB_EXCEPTIONS = m64/msoft-float
86 MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
87-MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
88+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
89 MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
90
91 softfp_wrap_start := '\#ifndef __powerpc64__'
92diff -Naur gcc-4.2.4.orig/gcc/config/s390/t-linux64 gcc-4.2.4/gcc/config/s390/t-linux64
93--- gcc-4.2.4.orig/gcc/config/s390/t-linux64 2006-02-06 17:41:54.000000000 +0000
94+++ gcc-4.2.4/gcc/config/s390/t-linux64 2008-06-12 19:55:27.000000000 +0100
95@@ -1,6 +1,6 @@
96 MULTILIB_OPTIONS = m64/m31
97 MULTILIB_DIRNAMES = 64 32
98-MULTILIB_OSDIRNAMES = ../lib64 ../lib
99+MULTILIB_OSDIRNAMES = ../lib ../lib32
100
101 LIBGCC = stmp-multilib
102 INSTALL_LIBGCC = install-multilib
103diff -Naur gcc-4.2.4.orig/gcc/config/sparc/linux64.h gcc-4.2.4/gcc/config/sparc/linux64.h
104--- gcc-4.2.4.orig/gcc/config/sparc/linux64.h 2007-09-01 16:28:30.000000000 +0100
105+++ gcc-4.2.4/gcc/config/sparc/linux64.h 2008-06-12 19:55:27.000000000 +0100
106@@ -143,8 +143,8 @@
107
108 /* If ELF is the default format, we should not use /lib/elf. */
109
110-#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
111-#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
112+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
113+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
114 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
115 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
116 #if UCLIBC_DEFAULT
117@@ -166,7 +166,7 @@
118 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
119 { "link_arch", LINK_ARCH_SPEC },
120
121-#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
122+#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
123 %{!shared: \
124 %{!ibcs: \
125 %{!static: \
126@@ -175,7 +175,7 @@
127 %{static:-static}}} \
128 "
129
130-#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
131+#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
132 %{!shared: \
133 %{!ibcs: \
134 %{!static: \
135@@ -256,7 +256,7 @@
136 #else /* !SPARC_BI_ARCH */
137
138 #undef LINK_SPEC
139-#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
140+#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
141 %{!shared: \
142 %{!ibcs: \
143 %{!static: \
144diff -Naur gcc-4.2.4.orig/gcc/config/sparc/linux.h gcc-4.2.4/gcc/config/sparc/linux.h
145--- gcc-4.2.4.orig/gcc/config/sparc/linux.h 2007-09-01 16:28:30.000000000 +0100
146+++ gcc-4.2.4/gcc/config/sparc/linux.h 2008-06-12 19:55:27.000000000 +0100
147@@ -132,7 +132,7 @@
148
149
150 #undef LINK_SPEC
151-#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
152+#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
153 %{!mno-relax:%{!r:-relax}} \
154 %{!shared: \
155 %{!ibcs: \
156diff -Naur gcc-4.2.4.orig/gcc/config/sparc/t-linux64 gcc-4.2.4/gcc/config/sparc/t-linux64
157--- gcc-4.2.4.orig/gcc/config/sparc/t-linux64 2006-02-08 07:19:43.000000000 +0000
158+++ gcc-4.2.4/gcc/config/sparc/t-linux64 2008-06-12 19:55:27.000000000 +0100
159@@ -1,6 +1,6 @@
160 MULTILIB_OPTIONS = m64/m32
161 MULTILIB_DIRNAMES = 64 32
162-MULTILIB_OSDIRNAMES = ../lib64 ../lib
163+MULTILIB_OSDIRNAMES = ../lib ../lib32
164
165 LIBGCC = stmp-multilib
166 INSTALL_LIBGCC = install-multilib
167@@ -10,4 +10,4 @@
168
169 CRTSTUFF_T_CFLAGS = `if test x$$($(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) \
170 -print-multi-os-directory) \
171- = x../lib64; then echo -mcmodel=medany; fi`
172+ = x../lib; then echo -mcmodel=medany; fi`
Note: See TracBrowser for help on using the repository browser.