source: patches/gcc-4.8.3-pure64-1.patch@ 44472aa

clfs-3.0.0-sysvinit sysvinit
Last change on this file since 44472aa was 0b44df8, checked in by Chris Staub <chris@…>, 11 years ago

Added patches for GCC 4.8.3
  • Property mode set to 100644
File size: 9.5 KB

  • gcc/config/i386/linux64.h 

    Submitted By: William Harrington <kb0iic at cross-lfs dot org>
Date: 05-31-2014
Initial Package Version: 4.8.3
Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
        the Pure LFS project with help from
        Martin Ward <macros_the_black@ntlworld.com>
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.8.3.orig/gcc/config/i386/linux64.h gcc-4.8.3/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"

  • gcc/config/i386/t-linux64 

    diff -Naur gcc-4.8.3.orig/gcc/config/i386/t-linux64 gcc-4.8.3/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-4.8.3.orig/gcc/config/linux.h gcc-4.8.3/gcc/config/linux.h
    old new  
    7474   GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
    7575   supporting both 32-bit and 64-bit compilation.  */
    7676#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
    77 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
     77#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
    7878#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    7979#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
    8080#define BIONIC_DYNAMIC_LINKER "/system/bin/linker"

  • gcc/config/mips/linux64.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/mips/linux64.h gcc-4.8.3/gcc/config/mips/linux64.h
    old new  
    2222#define GNU_USER_LINK_EMULATION64 "elf64%{EB:b}%{EL:l}tsmip"
    2323#define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32"
    2424
    25 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
    26 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
    27 #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
    28 #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
     25#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
     26#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
     27#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
     28#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/ld-uClibc.so.0"
    2929#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
    3030#define GNU_USER_DYNAMIC_LINKERN32 \
    3131  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \

  • gcc/config/mips/t-linux64 

    diff -Naur gcc-4.8.3.orig/gcc/config/mips/t-linux64 gcc-4.8.3/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-4.8.3.orig/gcc/config/rs6000/linux64.h gcc-4.8.3/gcc/config/rs6000/linux64.h
    old new  
    366366#undef  LINK_OS_DEFAULT_SPEC
    367367#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
    368368
    369 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
     369#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
    370370#ifdef LINUX64_DEFAULT_ABI_ELFv2
    371 #define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib64/ld64.so.1;:/lib64/ld64.so.2}"
     371#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:/lib/ld64.so.1;:/lib/ld64.so.2}"
    372372#else
    373 #define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib64/ld64.so.2;:/lib64/ld64.so.1}"
     373#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:/lib/ld64.so.2;:/lib/ld64.so.1}"
    374374#endif
    375 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
     375#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
    376376#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    377377#if DEFAULT_LIBC == LIBC_UCLIBC
    378378#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"

  • gcc/config/rs6000/t-linux64 

    diff -Naur gcc-4.8.3.orig/gcc/config/rs6000/t-linux64 gcc-4.8.3/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)

  • gcc/config/s390/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/s390/linux.h gcc-4.8.3/gcc/config/s390/linux.h
    old new  
    6060#define MULTILIB_DEFAULTS { "m31" }
    6161#endif
    6262
    63 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
     63#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
    6464#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
    6565
    6666#undef  LINK_SPEC

  • gcc/config/s390/t-linux64 

    diff -Naur gcc-4.8.3.orig/gcc/config/s390/t-linux64 gcc-4.8.3/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-4.8.3.orig/gcc/config/sparc/linux.h gcc-4.8.3/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-4.8.3.orig/gcc/config/sparc/linux64.h gcc-4.8.3/gcc/config/sparc/linux64.h
    old new  
    9292   When the -shared link option is used a final link is not being
    9393   done.  */
    9494
    95 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
    96 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
     95#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
     96#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
    9797
    9898#ifdef SPARC_BI_ARCH
    9999
    … …  
    201201#else /* !SPARC_BI_ARCH */
    202202
    203203#undef LINK_SPEC
    204 #define LINK_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
     204#define LINK_SPEC "-m elf64_sparc -Y P,%R/lib %{shared:-shared} \
    205205  %{!shared: \
    206206    %{!static: \
    207207      %{rdynamic:-export-dynamic} \

  • gcc/config/sparc/t-linux64 

    diff -Naur gcc-4.8.3.orig/gcc/config/sparc/t-linux64 gcc-4.8.3/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.