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