source:
patches/gcc-4.6.2-pure64-1.patch@
8a48307
Last change on this file since 8a48307 was f1873f3, checked in by , 13 years ago | |
---|---|
|
|
File size: 8.6 KB |
-
gcc/config/i386/linux64.h
Submitted By: Joe Ciccone <jciccone@gmail.com> Date: 04-16-2011 Initial Package Version: 3.4.6 Origin: Idea originally developed by Ryan Oliver and Greg Schafer for the Pure LFS project. Upstream Status: Not Applied - CLFS Specific Description: This patch makes changes to the paths for pure64, eg 64bit libs in /usr/lib, 32bit in /usr/lib32. Rediffed Against 4.5.2 By Pontus Carlsson <PontusCarlsson at live dot se> Rediffed Against 4.6.0 By Joe Ciccone <jciccone@gmail.com> diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux64.h gcc-4.6.0/gcc/config/i386/linux64.h
old new 62 62 When the -shared link option is used a final link is not being 63 63 done. */ 64 64 65 #define GLIBC_DYNAMIC_LINKER32 "/lib /ld-linux.so.2"66 #define GLIBC_DYNAMIC_LINKER64 "/lib 64/ld-linux-x86-64.so.2"65 #define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" 66 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" 67 67 68 68 #if TARGET_64BIT_DEFAULT 69 69 #define SPEC_32 "m32" -
gcc/config/i386/t-linux64
diff -Naur gcc-4.6.0.orig/gcc/config/i386/t-linux64 gcc-4.6.0/gcc/config/i386/t-linux64
old new 25 25 26 26 MULTILIB_OPTIONS = m64/m32 27 27 MULTILIB_DIRNAMES = 64 32 28 MULTILIB_OSDIRNAMES = ../lib 64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)28 MULTILIB_OSDIRNAMES = ../lib ../lib32 29 29 30 30 LIBGCC = stmp-multilib 31 31 INSTALL_LIBGCC = install-multilib -
gcc/config/linux.h
diff -Naur gcc-4.6.0.orig/gcc/config/linux.h gcc-4.6.0/gcc/config/linux.h
old new 75 75 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets 76 76 supporting both 32-bit and 64-bit compilation. */ 77 77 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" 78 #define UCLIBC_DYNAMIC_LINKER32 "/lib /ld-uClibc.so.0"78 #define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" 79 79 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 80 80 #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" 81 81 #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" -
gcc/config/mips/linux64.h
diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux64.h gcc-4.6.0/gcc/config/mips/linux64.h
old new 35 35 %{!shared: \ 36 36 %{profile:-lc_p} %{!profile:-lc}}" 37 37 38 #define GLIBC_DYNAMIC_LINKER32 "/lib /ld.so.1"39 #define GLIBC_DYNAMIC_LINKER64 "/lib 64/ld.so.1"40 #define GLIBC_DYNAMIC_LINKERN32 "/lib 32/ld.so.1"41 #define UCLIBC_DYNAMIC_LINKERN32 "/lib 32/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 42 #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" 43 43 #define LINUX_DYNAMIC_LINKERN32 \ 44 44 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ -
gcc/config/mips/t-linux64
diff -Naur gcc-4.6.0.orig/gcc/config/mips/t-linux64 gcc-4.6.0/gcc/config/mips/t-linux64
old new 18 18 19 19 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 20 20 MULTILIB_DIRNAMES = n32 32 64 21 MULTILIB_OSDIRNAMES = ../lib 32 ../lib ../lib6421 MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib 22 22 23 23 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o 24 24 -
gcc/config/rs6000/linux64.h
diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/linux64.h gcc-4.6.0/gcc/config/rs6000/linux64.h
old new 372 372 #undef LINK_OS_DEFAULT_SPEC 373 373 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" 374 374 375 #define GLIBC_DYNAMIC_LINKER32 "/lib /ld.so.1"376 #define GLIBC_DYNAMIC_LINKER64 "/lib 64/ld64.so.1"377 #define UCLIBC_DYNAMIC_LINKER32 "/lib /ld-uClibc.so.0"375 #define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" 376 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" 377 #define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" 378 378 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 379 379 #if DEFAULT_LIBC == LIBC_UCLIBC 380 380 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -
gcc/config/rs6000/t-linux64
diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/t-linux64 gcc-4.6.0/gcc/config/rs6000/t-linux64
old new 36 36 MULTILIB_EXTRA_OPTS = fPIC mstrict-align 37 37 MULTILIB_EXCEPTIONS = m64/msoft-float 38 38 MULTILIB_EXCLUSIONS = m64/!m32/msoft-float 39 MULTILIB_OSDIRNAMES = ../lib 64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)nof39 MULTILIB_OSDIRNAMES = ../lib ../lib32 nof 40 40 MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) 41 41 42 42 softfp_wrap_start := '\#ifndef __powerpc64__' -
gcc/config/s390/linux.h
diff -Naur gcc-4.6.0.orig/gcc/config/s390/linux.h gcc-4.6.0/gcc/config/s390/linux.h
old new 72 72 #define MULTILIB_DEFAULTS { "m31" } 73 73 #endif 74 74 75 #define GLIBC_DYNAMIC_LINKER32 "/lib /ld.so.1"75 #define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" 76 76 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" 77 77 78 78 #undef LINK_SPEC -
gcc/config/s390/t-linux64
diff -Naur gcc-4.6.0.orig/gcc/config/s390/t-linux64 gcc-4.6.0/gcc/config/s390/t-linux64
old new 7 7 8 8 MULTILIB_OPTIONS = m64/m31 9 9 MULTILIB_DIRNAMES = 64 32 10 MULTILIB_OSDIRNAMES = ../lib 64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)10 MULTILIB_OSDIRNAMES = ../lib ../lib32 -
gcc/config/sparc/linux.h
diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux.h gcc-4.6.0/gcc/config/sparc/linux.h
old new 74 74 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" 75 75 76 76 #undef LINK_SPEC 77 #define LINK_SPEC "-m elf32_sparc -Y P,/ usr/lib%{shared:-shared} \77 #define LINK_SPEC "-m elf32_sparc -Y P,/lib32 %{shared:-shared} \ 78 78 %{!mno-relax:%{!r:-relax}} \ 79 79 %{!shared: \ 80 80 %{!static: \ -
gcc/config/sparc/linux64.h
diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux64.h gcc-4.6.0/gcc/config/sparc/linux64.h
old new 101 101 When the -shared link option is used a final link is not being 102 102 done. */ 103 103 104 #define GLIBC_DYNAMIC_LINKER32 "/lib /ld-linux.so.2"105 #define GLIBC_DYNAMIC_LINKER64 "/lib 64/ld-linux.so.2"104 #define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" 105 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" 106 106 107 107 #ifdef SPARC_BI_ARCH 108 108 … … 113 113 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ 114 114 { "link_arch", LINK_ARCH_SPEC }, 115 115 116 #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/ usr/lib%{shared:-shared} \116 #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/lib32 %{shared:-shared} \ 117 117 %{!shared: \ 118 118 %{!static: \ 119 119 %{rdynamic:-export-dynamic} \ … … 121 121 %{static:-static}} \ 122 122 " 123 123 124 #define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/ usr/lib64%{shared:-shared} \124 #define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \ 125 125 %{!shared: \ 126 126 %{!static: \ 127 127 %{rdynamic:-export-dynamic} \ … … 193 193 #else /* !SPARC_BI_ARCH */ 194 194 195 195 #undef LINK_SPEC 196 #define LINK_SPEC "-m elf64_sparc -Y P,%R/ usr/lib64%{shared:-shared} \196 #define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \ 197 197 %{!shared: \ 198 198 %{!static: \ 199 199 %{rdynamic:-export-dynamic} \ -
gcc/config/sparc/t-linux64
diff -Naur gcc-4.6.0.orig/gcc/config/sparc/t-linux64 gcc-4.6.0/gcc/config/sparc/t-linux64
old new 26 26 27 27 MULTILIB_OPTIONS = m64/m32 28 28 MULTILIB_DIRNAMES = 64 32 29 MULTILIB_OSDIRNAMES = ../lib 64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)29 MULTILIB_OSDIRNAMES = ../lib ../lib64 30 30 31 31 LIBGCC = stmp-multilib 32 32 INSTALL_LIBGCC = install-multilib
Note:
See TracBrowser
for help on using the repository browser.