Submitted By: William Harrington <kb0iic at cross-lfs dot org>
Date: 12-28-2015
Initial Package Version: 5.2.0
Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
the Pure LFS project with help from
Martin Ward
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.
Comment: Renamed for GCC 5.3.0
diff -Naur gcc-6.1.0.orig/gcc/config/i386/linux64.h gcc-6.1.0/gcc/config/i386/linux64.h
old
|
new
|
|
27 | 27 | #define GNU_USER_LINK_EMULATION64 "elf_x86_64" |
28 | 28 | #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" |
29 | 29 | |
30 | | #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" |
31 | | #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" |
| 30 | #define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" |
| 31 | #define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2" |
32 | 32 | #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" |
33 | 33 | |
34 | 34 | #undef MUSL_DYNAMIC_LINKER32 |
diff -Naur gcc-6.1.0.orig/gcc/config/i386/t-linux64 gcc-6.1.0/gcc/config/i386/t-linux64
old
|
new
|
|
33 | 33 | comma=, |
34 | 34 | MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG)) |
35 | 35 | MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS))) |
36 | | MULTILIB_OSDIRNAMES = m64=../lib64$(call if_multiarch,:x86_64-linux-gnu) |
37 | | MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:i386-linux-gnu) |
| 36 | MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu) |
| 37 | MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu) |
38 | 38 | MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32) |
diff -Naur gcc-6.1.0.orig/gcc/config/linux.h gcc-6.1.0/gcc/config/linux.h
old
|
new
|
|
82 | 82 | GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets |
83 | 83 | supporting both 32-bit and 64-bit compilation. */ |
84 | 84 | #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" |
85 | | #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" |
| 85 | #define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" |
86 | 86 | #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" |
87 | 87 | #define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0" |
88 | 88 | #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" |
diff -Naur gcc-6.1.0.orig/gcc/config/mips/t-linux64 gcc-6.1.0/gcc/config/mips/t-linux64
old
|
new
|
|
22 | 22 | MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft) |
23 | 23 | MULTILIB_OSDIRNAMES = \ |
24 | 24 | ../lib32$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabin32$(MIPS_SOFT)) \ |
25 | | ../lib$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ |
26 | | ../lib64$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) |
| 25 | ../lib32$(call if_multiarch,:mips$(MIPS_EL)-linux-gnu$(MIPS_SOFT)) \ |
| 26 | ../lib$(call if_multiarch,:mips64$(MIPS_EL)-linux-gnuabi64$(MIPS_SOFT)) |
diff -Naur gcc-6.1.0.orig/gcc/config/rs6000/linux64.h gcc-6.1.0/gcc/config/rs6000/linux64.h
old
|
new
|
|
412 | 412 | #undef LINK_OS_DEFAULT_SPEC |
413 | 413 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" |
414 | 414 | |
415 | | #define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1" |
| 415 | #define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" |
416 | 416 | |
417 | 417 | #ifdef LINUX64_DEFAULT_ABI_ELFv2 |
418 | 418 | #define GLIBC_DYNAMIC_LINKER64 \ |
419 | | "%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \ |
420 | | ":%(dynamic_linker_prefix)/lib64/ld64.so.2}" |
| 419 | "%{mabi=elfv1:/lib/ld64.so.1;" \ |
| 420 | ":/lib/ld64.so.2}" |
421 | 421 | #else |
422 | 422 | #define GLIBC_DYNAMIC_LINKER64 \ |
423 | | "%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \ |
424 | | ":%(dynamic_linker_prefix)/lib64/ld64.so.1}" |
| 423 | "%{mabi=elfv2:/lib/ld64.so.2;" \ |
| 424 | ":/lib/ld64.so.1}" |
425 | 425 | #endif |
426 | 426 | |
427 | 427 | #define MUSL_DYNAMIC_LINKER32 \ |
… |
… |
|
429 | 429 | #define MUSL_DYNAMIC_LINKER64 \ |
430 | 430 | "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" |
431 | 431 | |
432 | | #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" |
| 432 | #define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" |
433 | 433 | #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" |
434 | 434 | #if DEFAULT_LIBC == LIBC_UCLIBC |
435 | 435 | #define CHOOSE_DYNAMIC_LINKER(G, U, M) \ |
diff -Naur gcc-6.1.0.orig/gcc/config/rs6000/t-linux64 gcc-6.1.0/gcc/config/rs6000/t-linux64
old
|
new
|
|
28 | 28 | MULTILIB_OPTIONS := m64/m32 |
29 | 29 | MULTILIB_DIRNAMES := 64 32 |
30 | 30 | MULTILIB_EXTRA_OPTS := |
31 | | MULTILIB_OSDIRNAMES := m64=../lib64$(call if_multiarch,:powerpc64-linux-gnu) |
32 | | MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:powerpc-linux-gnu) |
| 31 | MULTILIB_OSDIRNAMES := m64=../lib$(call if_multiarch,:powerpc64-linux-gnu) |
| 32 | MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:powerpc-linux-gnu) |
33 | 33 | |
34 | 34 | rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c |
35 | 35 | $(COMPILE) $< |
diff -Naur gcc-6.1.0.orig/gcc/config/s390/linux.h gcc-6.1.0/gcc/config/s390/linux.h
old
|
new
|
|
60 | 60 | #define MULTILIB_DEFAULTS { "m31" } |
61 | 61 | #endif |
62 | 62 | |
63 | | #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" |
| 63 | #define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" |
64 | 64 | #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" |
65 | 65 | |
66 | 66 | #undef LINK_SPEC |
diff -Naur gcc-6.1.0.orig/gcc/config/s390/t-linux64 gcc-6.1.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 = ../lib64$(call if_multiarch,:s390x-linux-gnu) |
11 | | MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:s390-linux-gnu) |
| 10 | MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu) |
| 11 | MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:s390-linux-gnu) |
diff -Naur gcc-6.1.0.orig/gcc/config/sparc/linux64.h gcc-6.1.0/gcc/config/sparc/linux64.h
old
|
new
|
|
84 | 84 | When the -shared link option is used a final link is not being |
85 | 85 | done. */ |
86 | 86 | |
87 | | #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" |
88 | | #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 | 89 | |
90 | 90 | #ifdef SPARC_BI_ARCH |
91 | 91 | |
… |
… |
|
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} \ |
diff -Naur gcc-6.1.0.orig/gcc/config/sparc/linux.h gcc-6.1.0/gcc/config/sparc/linux.h
old
|
new
|
|
83 | 83 | When the -shared link option is used a final link is not being |
84 | 84 | done. */ |
85 | 85 | |
86 | | #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" |
| 86 | #define GLIBC_DYNAMIC_LINKER "/lib32/ld-linux.so.2" |
87 | 87 | |
88 | 88 | #undef LINK_SPEC |
89 | 89 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ |
diff -Naur gcc-6.1.0.orig/gcc/config/sparc/t-linux64 gcc-6.1.0/gcc/config/sparc/t-linux64
old
|
new
|
|
25 | 25 | |
26 | 26 | MULTILIB_OPTIONS = m64/m32 |
27 | 27 | MULTILIB_DIRNAMES = 64 32 |
28 | | MULTILIB_OSDIRNAMES = ../lib64$(call if_multiarch,:sparc64-linux-gnu) |
29 | | MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)$(call if_multiarch,:sparc-linux-gnu) |
| 28 | MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu) |
| 29 | MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:sparc-linux-gnu) |