-
- 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)Â |
-
-
-
-
-