source:
patches/gcc-4.5.1-pure64-2.patch@
41969c7
Last change on this file since 41969c7 was 41969c7, checked in by , 14 years ago | |
---|---|
|
|
File size: 8.2 KB |
-
gcc/config/i386/linux64.h
ubmitted By: Joe Ciccone <jciccone@gmail.com> Date: 07-25-2010 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. diff -Naur gcc-4.5.1.orig/gcc/config/i386/linux64.h gcc-4.5.1/gcc/config/i386/linux64.h
old new 58 58 When the -shared link option is used a final link is not being 59 59 done. */ 60 60 61 #define GLIBC_DYNAMIC_LINKER32 "/lib /ld-linux.so.2"62 #define GLIBC_DYNAMIC_LINKER64 "/lib 64/ld-linux-x86-64.so.2"61 #define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" 62 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" 63 63 64 64 #if TARGET_64BIT_DEFAULT 65 65 #define SPEC_32 "m32" -
gcc/config/i386/t-linux64
diff -Naur gcc-4.5.1.orig/gcc/config/i386/t-linux64 gcc-4.5.1/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.5.1.orig/gcc/config/linux.h gcc-4.5.1/gcc/config/linux.h
old new 118 118 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets 119 119 supporting both 32-bit and 64-bit compilation. */ 120 120 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" 121 #define UCLIBC_DYNAMIC_LINKER32 "/lib /ld-uClibc.so.0"121 #define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" 122 122 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 123 123 #define LINUX_DYNAMIC_LINKER \ 124 124 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) -
gcc/config/mips/linux64.h
diff -Naur gcc-4.5.1.orig/gcc/config/mips/linux64.h gcc-4.5.1/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 LINUX_DYNAMIC_LINKERN32 \ 43 43 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) 44 44 -
gcc/config/mips/t-linux64
diff -Naur gcc-4.5.1.orig/gcc/config/mips/t-linux64 gcc-4.5.1/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.5.1.orig/gcc/config/rs6000/linux64.h gcc-4.5.1/gcc/config/rs6000/linux64.h
old new 348 348 #undef LINK_OS_DEFAULT_SPEC 349 349 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" 350 350 351 #define GLIBC_DYNAMIC_LINKER32 "/lib /ld.so.1"352 #define GLIBC_DYNAMIC_LINKER64 "/lib 64/ld64.so.1"353 #define UCLIBC_DYNAMIC_LINKER32 "/lib /ld-uClibc.so.0"351 #define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" 352 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" 353 #define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" 354 354 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 355 355 #if UCLIBC_DEFAULT 356 356 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" -
gcc/config/rs6000/t-linux64
diff -Naur gcc-4.5.1.orig/gcc/config/rs6000/t-linux64 gcc-4.5.1/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.5.1.orig/gcc/config/s390/linux.h gcc-4.5.1/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.5.1.orig/gcc/config/s390/t-linux64 gcc-4.5.1/gcc/config/s390/t-linux64
old new 1 1 MULTILIB_OPTIONS = m64/m31 2 2 MULTILIB_DIRNAMES = 64 32 3 MULTILIB_OSDIRNAMES = ../lib 64 ../lib3 MULTILIB_OSDIRNAMES = ../lib ../lib32 -
gcc/config/sparc/linux.h
diff -Naur gcc-4.5.1.orig/gcc/config/sparc/linux.h gcc-4.5.1/gcc/config/sparc/linux.h
old new 86 86 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" 87 87 88 88 #undef LINK_SPEC 89 #define LINK_SPEC "-m elf32_sparc -Y P,/ usr/lib%{shared:-shared} \89 #define LINK_SPEC "-m elf32_sparc -Y P,/lib32 %{shared:-shared} \ 90 90 %{!mno-relax:%{!r:-relax}} \ 91 91 %{!shared: \ 92 92 %{!ibcs: \ -
gcc/config/sparc/linux64.h
diff -Naur gcc-4.5.1.orig/gcc/config/sparc/linux64.h gcc-4.5.1/gcc/config/sparc/linux64.h
old new 109 109 110 110 /* If ELF is the default format, we should not use /lib/elf. */ 111 111 112 #define GLIBC_DYNAMIC_LINKER32 "/lib /ld-linux.so.2"113 #define GLIBC_DYNAMIC_LINKER64 "/lib 64/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 114 115 115 #ifdef SPARC_BI_ARCH 116 116 … … 121 121 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ 122 122 { "link_arch", LINK_ARCH_SPEC }, 123 123 124 #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/ usr/lib%{shared:-shared} \124 #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/lib32 %{shared:-shared} \ 125 125 %{!shared: \ 126 126 %{!ibcs: \ 127 127 %{!static: \ … … 130 130 %{static:-static}}} \ 131 131 " 132 132 133 #define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/ usr/lib64%{shared:-shared} \133 #define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \ 134 134 %{!shared: \ 135 135 %{!ibcs: \ 136 136 %{!static: \ … … 211 211 #else /* !SPARC_BI_ARCH */ 212 212 213 213 #undef LINK_SPEC 214 #define LINK_SPEC "-m elf64_sparc -Y P,%R/ usr/lib64%{shared:-shared} \214 #define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \ 215 215 %{!shared: \ 216 216 %{!ibcs: \ 217 217 %{!static: \ -
gcc/config/sparc/t-linux64
diff -Naur gcc-4.5.1.orig/gcc/config/sparc/t-linux64 gcc-4.5.1/gcc/config/sparc/t-linux64
old new 19 19 20 20 MULTILIB_OPTIONS = m64/m32 21 21 MULTILIB_DIRNAMES = 64 32 22 MULTILIB_OSDIRNAMES = ../lib 64 ../lib22 MULTILIB_OSDIRNAMES = ../lib ../lib32 23 23 24 24 LIBGCC = stmp-multilib 25 25 INSTALL_LIBGCC = install-multilib
Note:
See TracBrowser
for help on using the repository browser.