[c0595573] | 1 | Submitted By: Joe Ciccone <jciccone@gmail.com>
|
---|
| 2 | Date: 07-25-2010
|
---|
| 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 |
|
---|
| 10 | diff -Naur gcc-4.5.0.orig/gcc/config/i386/t-linux64 gcc-4.5.0/gcc/config/i386/t-linux64
|
---|
| 11 | --- gcc-4.5.0.orig/gcc/config/i386/t-linux64 2009-04-21 15:03:23.000000000 -0400
|
---|
| 12 | +++ gcc-4.5.0/gcc/config/i386/t-linux64 2010-07-25 16:24:14.609791880 -0400
|
---|
| 13 | @@ -25,7 +25,7 @@
|
---|
| 14 |
|
---|
| 15 | MULTILIB_OPTIONS = m64/m32
|
---|
| 16 | MULTILIB_DIRNAMES = 64 32
|
---|
| 17 | -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
|
---|
| 18 | +MULTILIB_OSDIRNAMES = ../lib ../lib32
|
---|
| 19 |
|
---|
| 20 | LIBGCC = stmp-multilib
|
---|
| 21 | INSTALL_LIBGCC = install-multilib
|
---|
| 22 | diff -Naur gcc-4.5.0.orig/gcc/config/mips/t-linux64 gcc-4.5.0/gcc/config/mips/t-linux64
|
---|
| 23 | --- gcc-4.5.0.orig/gcc/config/mips/t-linux64 2009-04-21 15:03:23.000000000 -0400
|
---|
| 24 | +++ gcc-4.5.0/gcc/config/mips/t-linux64 2010-07-25 16:24:14.609791880 -0400
|
---|
| 25 | @@ -18,7 +18,7 @@
|
---|
| 26 |
|
---|
| 27 | MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
|
---|
| 28 | MULTILIB_DIRNAMES = n32 32 64
|
---|
| 29 | -MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
|
---|
| 30 | +MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
|
---|
| 31 |
|
---|
| 32 | EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
|
---|
| 33 |
|
---|
| 34 | diff -Naur gcc-4.5.0.orig/gcc/config/rs6000/t-linux64 gcc-4.5.0/gcc/config/rs6000/t-linux64
|
---|
| 35 | --- gcc-4.5.0.orig/gcc/config/rs6000/t-linux64 2009-04-21 15:03:23.000000000 -0400
|
---|
| 36 | +++ gcc-4.5.0/gcc/config/rs6000/t-linux64 2010-07-25 16:24:14.609791880 -0400
|
---|
| 37 | @@ -36,7 +36,7 @@
|
---|
| 38 | MULTILIB_EXTRA_OPTS = fPIC mstrict-align
|
---|
| 39 | MULTILIB_EXCEPTIONS = m64/msoft-float
|
---|
| 40 | MULTILIB_EXCLUSIONS = m64/!m32/msoft-float
|
---|
| 41 | -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
|
---|
| 42 | +MULTILIB_OSDIRNAMES = ../lib ../lib32 nof
|
---|
| 43 | MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT)
|
---|
| 44 |
|
---|
| 45 | softfp_wrap_start := '\#ifndef __powerpc64__'
|
---|
| 46 | diff -Naur gcc-4.5.0.orig/gcc/config/s390/t-linux64 gcc-4.5.0/gcc/config/s390/t-linux64
|
---|
| 47 | --- gcc-4.5.0.orig/gcc/config/s390/t-linux64 2009-10-07 04:26:47.000000000 -0400
|
---|
| 48 | +++ gcc-4.5.0/gcc/config/s390/t-linux64 2010-07-25 16:24:14.609791880 -0400
|
---|
| 49 | @@ -1,3 +1,3 @@
|
---|
| 50 | MULTILIB_OPTIONS = m64/m31
|
---|
| 51 | MULTILIB_DIRNAMES = 64 32
|
---|
| 52 | -MULTILIB_OSDIRNAMES = ../lib64 ../lib
|
---|
| 53 | +MULTILIB_OSDIRNAMES = ../lib ../lib32
|
---|
| 54 | diff -Naur gcc-4.5.0.orig/gcc/config/sh/linux.h gcc-4.5.0/gcc/config/sh/linux.h
|
---|
| 55 | --- gcc-4.5.0.orig/gcc/config/sh/linux.h 2007-08-02 06:49:31.000000000 -0400
|
---|
| 56 | +++ gcc-4.5.0/gcc/config/sh/linux.h 2010-07-25 16:24:14.609791880 -0400
|
---|
| 57 | @@ -47,7 +47,7 @@
|
---|
| 58 |
|
---|
| 59 | #define TARGET_ASM_FILE_END file_end_indicate_exec_stack
|
---|
| 60 |
|
---|
| 61 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
---|
| 62 | +#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
|
---|
| 63 |
|
---|
| 64 | #undef SUBTARGET_LINK_EMUL_SUFFIX
|
---|
| 65 | #define SUBTARGET_LINK_EMUL_SUFFIX "_linux"
|
---|
| 66 | diff -Naur gcc-4.5.0.orig/gcc/config/sparc/linux.h gcc-4.5.0/gcc/config/sparc/linux.h
|
---|
| 67 | --- gcc-4.5.0.orig/gcc/config/sparc/linux.h 2009-12-07 18:31:01.000000000 -0500
|
---|
| 68 | +++ gcc-4.5.0/gcc/config/sparc/linux.h 2010-07-25 16:24:14.609791880 -0400
|
---|
| 69 | @@ -86,7 +86,7 @@
|
---|
| 70 | #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
---|
| 71 |
|
---|
| 72 | #undef LINK_SPEC
|
---|
| 73 | -#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
|
---|
| 74 | +#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
|
---|
| 75 | %{!mno-relax:%{!r:-relax}} \
|
---|
| 76 | %{!shared: \
|
---|
| 77 | %{!ibcs: \
|
---|
| 78 | diff -Naur gcc-4.5.0.orig/gcc/config/sparc/linux64.h gcc-4.5.0/gcc/config/sparc/linux64.h
|
---|
| 79 | --- gcc-4.5.0.orig/gcc/config/sparc/linux64.h 2009-12-07 18:31:01.000000000 -0500
|
---|
| 80 | +++ gcc-4.5.0/gcc/config/sparc/linux64.h 2010-07-25 16:24:14.609791880 -0400
|
---|
| 81 | @@ -109,8 +109,8 @@
|
---|
| 82 |
|
---|
| 83 | /* If ELF is the default format, we should not use /lib/elf. */
|
---|
| 84 |
|
---|
| 85 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
|
---|
| 86 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
|
---|
| 87 | +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
|
---|
| 88 | +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
|
---|
| 89 |
|
---|
| 90 | #ifdef SPARC_BI_ARCH
|
---|
| 91 |
|
---|
| 92 | @@ -121,7 +121,7 @@
|
---|
| 93 | { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
|
---|
| 94 | { "link_arch", LINK_ARCH_SPEC },
|
---|
| 95 |
|
---|
| 96 | -#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
|
---|
| 97 | +#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib32 %{shared:-shared} \
|
---|
| 98 | %{!shared: \
|
---|
| 99 | %{!ibcs: \
|
---|
| 100 | %{!static: \
|
---|
| 101 | @@ -130,7 +130,7 @@
|
---|
| 102 | %{static:-static}}} \
|
---|
| 103 | "
|
---|
| 104 |
|
---|
| 105 | -#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
|
---|
| 106 | +#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \
|
---|
| 107 | %{!shared: \
|
---|
| 108 | %{!ibcs: \
|
---|
| 109 | %{!static: \
|
---|
| 110 | @@ -211,7 +211,7 @@
|
---|
| 111 | #else /* !SPARC_BI_ARCH */
|
---|
| 112 |
|
---|
| 113 | #undef LINK_SPEC
|
---|
| 114 | -#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
|
---|
| 115 | +#define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib %{shared:-shared} \
|
---|
| 116 | %{!shared: \
|
---|
| 117 | %{!ibcs: \
|
---|
| 118 | %{!static: \
|
---|
| 119 | diff -Naur gcc-4.5.0.orig/gcc/config/sparc/t-linux64 gcc-4.5.0/gcc/config/sparc/t-linux64
|
---|
| 120 | --- gcc-4.5.0.orig/gcc/config/sparc/t-linux64 2009-04-21 15:03:23.000000000 -0400
|
---|
| 121 | +++ gcc-4.5.0/gcc/config/sparc/t-linux64 2010-07-25 16:24:14.609791880 -0400
|
---|
| 122 | @@ -19,7 +19,7 @@
|
---|
| 123 |
|
---|
| 124 | MULTILIB_OPTIONS = m64/m32
|
---|
| 125 | MULTILIB_DIRNAMES = 64 32
|
---|
| 126 | -MULTILIB_OSDIRNAMES = ../lib64 ../lib
|
---|
| 127 | +MULTILIB_OSDIRNAMES = ../lib ../lib32
|
---|
| 128 |
|
---|
| 129 | LIBGCC = stmp-multilib
|
---|
| 130 | INSTALL_LIBGCC = install-multilib
|
---|