source: patches/gcc-7.1.0-pure64-1.patch@ 17e5f26

sysvinit
Last change on this file since 17e5f26 was ba4566e, checked in by William Harrington <kb0iic@…>, 8 years ago

Update patches with the proper data.
  • Property mode set to 100644
File size: 8.9 KB

  • gcc/config/i386/linux64.h 

    Submitted By: William Harrington <kb0iic at cross-lfs dot org>
Date: 05-13-2017
Initial Package Version: 6.1.0
Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
        the Pure LFS project with help from
        Martin Ward and Chris Staub
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: Rediffed for 7.1.0

diff -Naur gcc-7.1.0.orig/gcc/config/i386/linux64.h gcc-7.1.0/gcc/config/i386/linux64.h
    old new  
    2727#define GNU_USER_LINK_EMULATION64 "elf_x86_64"
    2828#define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
    2929
    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"
    3232#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
    3333
    3434#undef MUSL_DYNAMIC_LINKER32

  • gcc/config/i386/t-linux64 

    diff -Naur gcc-7.1.0.orig/gcc/config/i386/t-linux64 gcc-7.1.0/gcc/config/i386/t-linux64
    old new  
    3333comma=,
    3434MULTILIB_OPTIONS    = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
    3535MULTILIB_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)
     36MULTILIB_OSDIRNAMES = m64=../lib$(call if_multiarch,:x86_64-linux-gnu)
     37MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:i386-linux-gnu)
    3838MULTILIB_OSDIRNAMES+= mx32=../libx32$(call if_multiarch,:x86_64-linux-gnux32)

  • gcc/config/linux.h 

    diff -Naur gcc-7.1.0.orig/gcc/config/linux.h gcc-7.1.0/gcc/config/linux.h
    old new  
    8282   GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
    8383   supporting both 32-bit and 64-bit compilation.  */
    8484#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"
    8686#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    8787#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
    8888#define BIONIC_DYNAMIC_LINKER "/system/bin/linker"

  • gcc/config/mips/t-linux64 

    diff -Naur gcc-7.1.0.orig/gcc/config/mips/t-linux64 gcc-7.1.0/gcc/config/mips/t-linux64
    old new  
    2222MIPS_SOFT = $(if $(strip $(filter MASK_SOFT_FLOAT_ABI, $(target_cpu_default)) $(filter soft, $(with_float))),soft)
    2323MULTILIB_OSDIRNAMES = \
    2424        ../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))

  • gcc/config/rs6000/linux64.h 

    diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/linux64.h gcc-7.1.0/gcc/config/rs6000/linux64.h
    old new  
    412412#undef  LINK_OS_DEFAULT_SPEC
    413413#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
    414414
    415 #define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1"
     415#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
    416416
    417417#ifdef LINUX64_DEFAULT_ABI_ELFv2
    418418#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}"
    421421#else
    422422#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}"
    425425#endif
    426426
    427427#define MUSL_DYNAMIC_LINKER32 \
    … …  
    429429#define MUSL_DYNAMIC_LINKER64 \
    430430  "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
    431431
    432 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
     432#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
    433433#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    434434#if DEFAULT_LIBC == LIBC_UCLIBC
    435435#define CHOOSE_DYNAMIC_LINKER(G, U, M) \

  • gcc/config/rs6000/t-linux64 

    diff -Naur gcc-7.1.0.orig/gcc/config/rs6000/t-linux64 gcc-7.1.0/gcc/config/rs6000/t-linux64
    old new  
    2828MULTILIB_OPTIONS    := m64/m32
    2929MULTILIB_DIRNAMES   := 64 32
    3030MULTILIB_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)
     31MULTILIB_OSDIRNAMES := m64=../lib$(call if_multiarch,:powerpc64-linux-gnu)
     32MULTILIB_OSDIRNAMES += m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:powerpc-linux-gnu)
    3333
    3434rs6000-linux.o: $(srcdir)/config/rs6000/rs6000-linux.c
    3535        $(COMPILE) $<

  • gcc/config/s390/linux.h 

    diff -Naur gcc-7.1.0.orig/gcc/config/s390/linux.h gcc-7.1.0/gcc/config/s390/linux.h
    old new  
    7373#define MULTILIB_DEFAULTS { "m31" }
    7474#endif
    7575
    76 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
     76#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
    7777#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
    7878
    7979#undef  LINK_SPEC

  • gcc/config/s390/t-linux64 

    diff -Naur gcc-7.1.0.orig/gcc/config/s390/t-linux64 gcc-7.1.0/gcc/config/s390/t-linux64
    old new  
    77
    88MULTILIB_OPTIONS = m64/m31
    99MULTILIB_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)
     10MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:s390x-linux-gnu)
     11MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:s390-linux-gnu)

  • gcc/config/sparc/linux.h 

    diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux.h gcc-7.1.0/gcc/config/sparc/linux.h
    old new  
    8383   When the -shared link option is used a final link is not being
    8484   done.  */
    8585
    86 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
     86#define GLIBC_DYNAMIC_LINKER "/lib32/ld-linux.so.2"
    8787
    8888#undef  LINK_SPEC
    8989#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \

  • gcc/config/sparc/linux64.h 

    diff -Naur gcc-7.1.0.orig/gcc/config/sparc/linux64.h gcc-7.1.0/gcc/config/sparc/linux64.h
    old new  
    8484   When the -shared link option is used a final link is not being
    8585   done.  */
    8686
    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"
    8989
    9090#ifdef SPARC_BI_ARCH
    9191
    … …  
    213213#else /* !SPARC_BI_ARCH */
    214214
    215215#undef LINK_SPEC
    216 #define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
     216#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
    217217  %{!shared: \
    218218    %{!static: \
    219219      %{rdynamic:-export-dynamic} \

  • gcc/config/sparc/t-linux64 

    diff -Naur gcc-7.1.0.orig/gcc/config/sparc/t-linux64 gcc-7.1.0/gcc/config/sparc/t-linux64
    old new  
    2525
    2626MULTILIB_OPTIONS = m64/m32
    2727MULTILIB_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)
     28MULTILIB_OSDIRNAMES = ../lib$(call if_multiarch,:sparc64-linux-gnu)
     29MULTILIB_OSDIRNAMES += $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib32)$(call if_multiarch,:sparc-linux-gnu)
Note: See TracBrowser for help on using the repository browser.