[670bf2c] | 1 | Submitted By: Joe Ciccone <jciccone@gmail.com> |
---|
[d3cbdd9] | 2 | Date: 04-16-2011 |
---|
[41969c7] | 3 | Initial Package Version: 3.4.6 |
---|
| 4 | Origin: Idea originally developed by Ryan Oliver and Greg Schafer for |
---|
| 5 | the Pure LFS project. |
---|
| 6 | Upstream Status: Not Applied - CLFS Specific |
---|
| 7 | Description: 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> |
---|
[d3cbdd9] | 11 | Rediffed Against 4.6.0 By Joe Ciccone <jciccone@gmail.com> |
---|
[670bf2c] | 12 | |
---|
[d3cbdd9] | 13 | diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux64.h gcc-4.6.0/gcc/config/i386/linux64.h |
---|
| 14 | --- gcc-4.6.0.orig/gcc/config/i386/linux64.h 2011-03-02 17:35:36.000000000 -0500 |
---|
| 15 | +++ gcc-4.6.0/gcc/config/i386/linux64.h 2011-04-16 15:49:02.335213604 -0400 |
---|
| 16 | @@ -62,8 +62,8 @@ |
---|
[41969c7] | 17 | When the -shared link option is used a final link is not being |
---|
| 18 | done. */ |
---|
| 19 | |
---|
| 20 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" |
---|
| 21 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" |
---|
| 22 | +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" |
---|
| 23 | +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" |
---|
| 24 | |
---|
| 25 | #if TARGET_64BIT_DEFAULT |
---|
| 26 | #define SPEC_32 "m32" |
---|
[d3cbdd9] | 27 | diff -Naur gcc-4.6.0.orig/gcc/config/i386/t-linux64 gcc-4.6.0/gcc/config/i386/t-linux64 |
---|
| 28 | --- gcc-4.6.0.orig/gcc/config/i386/t-linux64 2009-04-21 15:03:23.000000000 -0400 |
---|
| 29 | +++ gcc-4.6.0/gcc/config/i386/t-linux64 2011-04-16 15:49:02.335213604 -0400 |
---|
[41969c7] | 30 | @@ -25,7 +25,7 @@ |
---|
| 31 | |
---|
| 32 | MULTILIB_OPTIONS = m64/m32 |
---|
| 33 | MULTILIB_DIRNAMES = 64 32 |
---|
| 34 | -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) |
---|
| 35 | +MULTILIB_OSDIRNAMES = ../lib ../lib32 |
---|
| 36 | |
---|
| 37 | LIBGCC = stmp-multilib |
---|
| 38 | INSTALL_LIBGCC = install-multilib |
---|
[d3cbdd9] | 39 | diff -Naur gcc-4.6.0.orig/gcc/config/linux.h gcc-4.6.0/gcc/config/linux.h |
---|
| 40 | --- gcc-4.6.0.orig/gcc/config/linux.h 2011-01-12 09:29:14.000000000 -0500 |
---|
| 41 | +++ gcc-4.6.0/gcc/config/linux.h 2011-04-16 15:49:02.335213604 -0400 |
---|
| 42 | @@ -75,7 +75,7 @@ |
---|
[41969c7] | 43 | GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets |
---|
| 44 | supporting both 32-bit and 64-bit compilation. */ |
---|
| 45 | #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" |
---|
| 46 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" |
---|
| 47 | +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" |
---|
| 48 | #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" |
---|
[d3cbdd9] | 49 | #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" |
---|
| 50 | #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" |
---|
| 51 | diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux64.h gcc-4.6.0/gcc/config/mips/linux64.h |
---|
| 52 | --- gcc-4.6.0.orig/gcc/config/mips/linux64.h 2011-01-19 15:39:09.000000000 -0500 |
---|
| 53 | +++ gcc-4.6.0/gcc/config/mips/linux64.h 2011-04-16 15:50:00.807213626 -0400 |
---|
[41969c7] | 54 | @@ -35,10 +35,10 @@ |
---|
| 55 | %{!shared: \ |
---|
| 56 | %{profile:-lc_p} %{!profile:-lc}}" |
---|
| 57 | |
---|
| 58 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" |
---|
| 59 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1" |
---|
| 60 | -#define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" |
---|
| 61 | -#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" |
---|
| 62 | +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" |
---|
| 63 | +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1" |
---|
| 64 | +#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1" |
---|
| 65 | +#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0" |
---|
[d3cbdd9] | 66 | #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" |
---|
[41969c7] | 67 | #define LINUX_DYNAMIC_LINKERN32 \ |
---|
[d3cbdd9] | 68 | CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ |
---|
| 69 | diff -Naur gcc-4.6.0.orig/gcc/config/mips/t-linux64 gcc-4.6.0/gcc/config/mips/t-linux64 |
---|
| 70 | --- gcc-4.6.0.orig/gcc/config/mips/t-linux64 2009-04-21 15:03:23.000000000 -0400 |
---|
| 71 | +++ gcc-4.6.0/gcc/config/mips/t-linux64 2011-04-16 15:49:02.335213604 -0400 |
---|
[41969c7] | 72 | @@ -18,7 +18,7 @@ |
---|
| 73 | |
---|
| 74 | MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 |
---|
| 75 | MULTILIB_DIRNAMES = n32 32 64 |
---|
| 76 | -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64 |
---|
| 77 | +MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib |
---|
| 78 | |
---|
| 79 | EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o |
---|
| 80 | |
---|
[d3cbdd9] | 81 | diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/linux64.h gcc-4.6.0/gcc/config/rs6000/linux64.h |
---|
| 82 | --- gcc-4.6.0.orig/gcc/config/rs6000/linux64.h 2011-03-07 02:50:23.000000000 -0500 |
---|
| 83 | +++ gcc-4.6.0/gcc/config/rs6000/linux64.h 2011-04-16 15:49:02.335213604 -0400 |
---|
| 84 | @@ -372,9 +372,9 @@ |
---|
[41969c7] | 85 | #undef LINK_OS_DEFAULT_SPEC |
---|
| 86 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" |
---|
| 87 | |
---|
| 88 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" |
---|
| 89 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" |
---|
| 90 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" |
---|
| 91 | +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" |
---|
| 92 | +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" |
---|
| 93 | +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" |
---|
| 94 | #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" |
---|
[d3cbdd9] | 95 | #if DEFAULT_LIBC == LIBC_UCLIBC |
---|
| 96 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" |
---|
| 97 | diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/t-linux64 gcc-4.6.0/gcc/config/rs6000/t-linux64 |
---|
| 98 | --- gcc-4.6.0.orig/gcc/config/rs6000/t-linux64 2009-04-21 15:03:23.000000000 -0400 |
---|
| 99 | +++ gcc-4.6.0/gcc/config/rs6000/t-linux64 2011-04-16 15:49:02.335213604 -0400 |
---|
[41969c7] | 100 | @@ -36,7 +36,7 @@ |
---|
| 101 | MULTILIB_EXTRA_OPTS = fPIC mstrict-align |
---|
| 102 | MULTILIB_EXCEPTIONS = m64/msoft-float |
---|
| 103 | MULTILIB_EXCLUSIONS = m64/!m32/msoft-float |
---|
| 104 | -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof |
---|
| 105 | +MULTILIB_OSDIRNAMES = ../lib ../lib32 nof |
---|
| 106 | MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) |
---|
| 107 | |
---|
| 108 | softfp_wrap_start := '\#ifndef __powerpc64__' |
---|
[d3cbdd9] | 109 | diff -Naur gcc-4.6.0.orig/gcc/config/s390/linux.h gcc-4.6.0/gcc/config/s390/linux.h |
---|
| 110 | --- gcc-4.6.0.orig/gcc/config/s390/linux.h 2010-12-09 08:27:07.000000000 -0500 |
---|
| 111 | +++ gcc-4.6.0/gcc/config/s390/linux.h 2011-04-16 15:49:02.335213604 -0400 |
---|
[41969c7] | 112 | @@ -72,7 +72,7 @@ |
---|
| 113 | #define MULTILIB_DEFAULTS { "m31" } |
---|
| 114 | #endif |
---|
| 115 | |
---|
| 116 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" |
---|
| 117 | +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" |
---|
| 118 | #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" |
---|
| 119 | |
---|
| 120 | #undef LINK_SPEC |
---|
[d3cbdd9] | 121 | diff -Naur gcc-4.6.0.orig/gcc/config/s390/t-linux64 gcc-4.6.0/gcc/config/s390/t-linux64 |
---|
| 122 | --- gcc-4.6.0.orig/gcc/config/s390/t-linux64 2010-10-04 12:51:59.000000000 -0400 |
---|
| 123 | +++ gcc-4.6.0/gcc/config/s390/t-linux64 2011-04-16 15:49:02.335213604 -0400 |
---|
[670bf2c] | 124 | @@ -7,4 +7,4 @@ |
---|
| 125 | |
---|
[41969c7] | 126 | MULTILIB_OPTIONS = m64/m31 |
---|
| 127 | MULTILIB_DIRNAMES = 64 32 |
---|
[670bf2c] | 128 | -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) |
---|
[41969c7] | 129 | +MULTILIB_OSDIRNAMES = ../lib ../lib32 |
---|
[d3cbdd9] | 130 | diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux.h gcc-4.6.0/gcc/config/sparc/linux.h |
---|
| 131 | --- gcc-4.6.0.orig/gcc/config/sparc/linux.h 2011-01-26 15:30:12.000000000 -0500 |
---|
| 132 | +++ gcc-4.6.0/gcc/config/sparc/linux.h 2011-04-16 15:49:02.335213604 -0400 |
---|
| 133 | @@ -74,7 +74,7 @@ |
---|
[41969c7] | 134 | #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" |
---|
| 135 | |
---|
| 136 | #undef LINK_SPEC |
---|
| 137 | -#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ |
---|
| 138 | +#define LINK_SPEC "-m elf32_sparc -Y P,/lib32 %{shared:-shared} \ |
---|
| 139 | %{!mno-relax:%{!r:-relax}} \ |
---|
| 140 | %{!shared: \ |
---|
[d3cbdd9] | 141 | %{!static: \ |
---|
| 142 | diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux64.h gcc-4.6.0/gcc/config/sparc/linux64.h |
---|
| 143 | --- gcc-4.6.0.orig/gcc/config/sparc/linux64.h 2011-02-17 08:57:21.000000000 -0500 |
---|
| 144 | +++ gcc-4.6.0/gcc/config/sparc/linux64.h 2011-04-16 15:49:02.335213604 -0400 |
---|
| 145 | @@ -101,8 +101,8 @@ |
---|
| 146 | When the -shared link option is used a final link is not being |
---|
| 147 | done. */ |
---|
[41969c7] | 148 | |
---|
| 149 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" |
---|
| 150 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" |
---|
| 151 | +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" |
---|
| 152 | +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" |
---|
| 153 | |
---|
| 154 | #ifdef SPARC_BI_ARCH |
---|
| 155 | |
---|
[d3cbdd9] | 156 | @@ -113,7 +113,7 @@ |
---|
[41969c7] | 157 | { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ |
---|
| 158 | { "link_arch", LINK_ARCH_SPEC }, |
---|
| 159 | |
---|
| 160 | -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \ |
---|
| 161 | +#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/lib32 %{shared:-shared} \ |
---|
| 162 | %{!shared: \ |
---|
[d3cbdd9] | 163 | %{!static: \ |
---|
| 164 | %{rdynamic:-export-dynamic} \ |
---|
| 165 | @@ -121,7 +121,7 @@ |
---|
| 166 | %{static:-static}} \ |
---|
[41969c7] | 167 | " |
---|
| 168 | |
---|
| 169 | -#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ |
---|
| 170 | +#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \ |
---|
| 171 | %{!shared: \ |
---|
[d3cbdd9] | 172 | %{!static: \ |
---|
| 173 | %{rdynamic:-export-dynamic} \ |
---|
| 174 | @@ -193,7 +193,7 @@ |
---|
[41969c7] | 175 | #else /* !SPARC_BI_ARCH */ |
---|
| 176 | |
---|
| 177 | #undef LINK_SPEC |
---|
| 178 | -#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \ |
---|
| 179 | +#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \ |
---|
| 180 | %{!shared: \ |
---|
[d3cbdd9] | 181 | %{!static: \ |
---|
| 182 | %{rdynamic:-export-dynamic} \ |
---|
| 183 | diff -Naur gcc-4.6.0.orig/gcc/config/sparc/t-linux64 gcc-4.6.0/gcc/config/sparc/t-linux64 |
---|
| 184 | --- gcc-4.6.0.orig/gcc/config/sparc/t-linux64 2011-01-03 15:52:22.000000000 -0500 |
---|
| 185 | +++ gcc-4.6.0/gcc/config/sparc/t-linux64 2011-04-16 15:49:02.335213604 -0400 |
---|
[670bf2c] | 186 | @@ -26,7 +26,7 @@ |
---|
[41969c7] | 187 | |
---|
| 188 | MULTILIB_OPTIONS = m64/m32 |
---|
| 189 | MULTILIB_DIRNAMES = 64 32 |
---|
[670bf2c] | 190 | -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) |
---|
| 191 | +MULTILIB_OSDIRNAMES = ../lib ../lib64 |
---|
[41969c7] | 192 | |
---|
| 193 | LIBGCC = stmp-multilib |
---|
| 194 | INSTALL_LIBGCC = install-multilib |
---|