source: patches/gcc-4.8.3-pure64_specs-1.patch@ ee09b240

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

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

  • gcc/config/aarch64/aarch64-linux.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, and help from
        Martin Ward <macros_the_black@ntlworld.com>
Upstream Status: Not Applied - CLFS Specific
Description: The specs patch changes the location of the dynamic linker as
             well as the link spec to /tools/lib{,32,64}. This patch in
             addition 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/aarch64/aarch64-linux.h gcc-4.8.3/gcc/config/aarch64/aarch64-linux.h
    old new  
    2121#ifndef GCC_AARCH64_LINUX_H
    2222#define GCC_AARCH64_LINUX_H
    2323
    24 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1"
     24#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-aarch64.so.1"
    2525
    2626#define CPP_SPEC "%{pthread:-D_REENTRANT}"
    2727

  • gcc/config/aarch64/t-aarch64-linux 

    diff -Naur gcc-4.8.3.orig/gcc/config/aarch64/t-aarch64-linux gcc-4.8.3/gcc/config/aarch64/t-aarch64-linux
    old new  
    2222LIB1ASMFUNCS = _aarch64_sync_cache_range
    2323
    2424AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
    25 MULTILIB_OSDIRNAMES = .=../lib64$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
     25MULTILIB_OSDIRNAMES = .=../lib$(call if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)

  • gcc/config/alpha/linux-elf.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/alpha/linux-elf.h gcc-4.8.3/gcc/config/alpha/linux-elf.h
    old new  
    2323#define EXTRA_SPECS \
    2424{ "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
    2525
    26 #define GLIBC_DYNAMIC_LINKER    "/lib/ld-linux.so.2"
    27 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
     26#define GLIBC_DYNAMIC_LINKER    "/tools/lib/ld-linux.so.2"
     27#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
    2828#if DEFAULT_LIBC == LIBC_UCLIBC
    2929#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
    3030#elif DEFAULT_LIBC == LIBC_GLIBC

  • gcc/config/arm/linux-eabi.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/arm/linux-eabi.h gcc-4.8.3/gcc/config/arm/linux-eabi.h
    old new  
    6868   GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI.  */
    6969
    7070#undef  GLIBC_DYNAMIC_LINKER
    71 #define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3"
    72 #define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3"
     71#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/tools/lib/ld-linux.so.3"
     72#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/tools/lib/ld-linux-armhf.so.3"
    7373#define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT
    7474
    7575#define GLIBC_DYNAMIC_LINKER \

  • gcc/config/arm/linux-elf.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/arm/linux-elf.h gcc-4.8.3/gcc/config/arm/linux-elf.h
    old new  
    5757
    5858#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
    5959
    60 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
     60#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
    6161
    6262#define LINUX_TARGET_LINK_SPEC  "%{h*} \
    6363   %{static:-Bstatic} \

  • gcc/config/bfin/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/bfin/linux.h gcc-4.8.3/gcc/config/bfin/linux.h
    old new  
    4545  %{shared:-G -Bdynamic} \
    4646  %{!shared: %{!static: \
    4747   %{rdynamic:-export-dynamic} \
    48    -dynamic-linker /lib/ld-uClibc.so.0} \
     48   -dynamic-linker /tools/lib/ld-uClibc.so.0} \
    4949   %{static}} -init __init -fini __fini"
    5050
    5151#undef TARGET_SUPPORTS_SYNC_CALLS

  • gcc/config/cris/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/cris/linux.h gcc-4.8.3/gcc/config/cris/linux.h
    old new  
    102102#undef CRIS_DEFAULT_CPU_VERSION
    103103#define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
    104104
    105 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     105#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    106106
    107107#undef CRIS_LINK_SUBTARGET_SPEC
    108108#define CRIS_LINK_SUBTARGET_SPEC \

  • gcc/config/freebsd-spec.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/freebsd-spec.h gcc-4.8.3/gcc/config/freebsd-spec.h
    old new  
    130130#if FBSD_MAJOR < 6
    131131#define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
    132132#else
    133 #define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
     133#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1"
    134134#endif
    135135
    136136/* NOTE: The freebsd-spec.h header is included also for various

  • gcc/config/frv/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/frv/linux.h gcc-4.8.3/gcc/config/frv/linux.h
    old new  
    3434#define ENDFILE_SPEC \
    3535  "%{shared|pie:crtendS.o%s;:crtend.o%s} crtn.o%s"
    3636
    37 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     37#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    3838
    3939#undef LINK_SPEC
    4040#define LINK_SPEC "\

  • gcc/config/i386/gnu.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/i386/gnu.h gcc-4.8.3/gcc/config/i386/gnu.h
    old new  
    2222#define GNU_USER_LINK_EMULATION "elf_i386"
    2323
    2424#undef GNU_USER_DYNAMIC_LINKER
    25 #define GNU_USER_DYNAMIC_LINKER "/lib/ld.so"
     25#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so"
    2626
    2727#undef  STARTFILE_SPEC
    2828#if defined HAVE_LD_PIE

  • gcc/config/i386/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/i386/linux.h gcc-4.8.3/gcc/config/i386/linux.h
    old new  
    2020<http://www.gnu.org/licenses/>.  */
    2121
    2222#define GNU_USER_LINK_EMULATION "elf_i386"
    23 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
     23#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"

  • gcc/config/i386/linux64.h 

    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"
    32 #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
     30#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
     31#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
     32#define GLIBC_DYNAMIC_LINKERX32 "/tools/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/ia64/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/ia64/linux.h gcc-4.8.3/gcc/config/ia64/linux.h
    old new  
    5555/* Define this for shared library support because it isn't in the main
    5656   linux.h file.  */
    5757
    58 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
     58#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
    5959
    6060#undef LINK_SPEC
    6161#define LINK_SPEC "\

  • gcc/config/knetbsd-gnu.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/knetbsd-gnu.h gcc-4.8.3/gcc/config/knetbsd-gnu.h
    old new  
    3232
    3333
    3434#undef GNU_USER_DYNAMIC_LINKER
    35 #define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
     35#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"

  • gcc/config/kopensolaris-gnu.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/kopensolaris-gnu.h gcc-4.8.3/gcc/config/kopensolaris-gnu.h
    old new  
    3131  while (0)
    3232
    3333#undef GNU_USER_DYNAMIC_LINKER
    34 #define GNU_USER_DYNAMIC_LINKER "/lib/ld.so.1"
     34#define GNU_USER_DYNAMIC_LINKER "/tools/lib/ld.so.1"

  • 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  
    7373   GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
    7474   GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
    7575   supporting both 32-bit and 64-bit compilation.  */
    76 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
    77 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
    78 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    79 #define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
     76#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
     77#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
     78#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
     79#define UCLIBC_DYNAMIC_LINKERX32 "/tools/lib/ldx32-uClibc.so.0"
    8080#define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
    8181#define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
    8282#define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"

  • gcc/config/lm32/uclinux-elf.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/lm32/uclinux-elf.h gcc-4.8.3/gcc/config/lm32/uclinux-elf.h
    old new  
    6767   %{shared:-shared} \
    6868   %{symbolic:-Bsymbolic} \
    6969   %{rdynamic:-export-dynamic} \
    70    -dynamic-linker /lib/ld-linux.so.2"
     70   -dynamic-linker /tools/lib/ld-linux.so.2"
    7171
    7272#define TARGET_OS_CPP_BUILTINS() GNU_USER_TARGET_OS_CPP_BUILTINS()
    7373

  • gcc/config/m68k/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/m68k/linux.h gcc-4.8.3/gcc/config/m68k/linux.h
    old new  
    7171   When the -shared link option is used a final link is not being
    7272   done.  */
    7373
    74 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     74#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    7575
    7676#undef LINK_SPEC
    7777#define LINK_SPEC "-m m68kelf %{shared} \

  • gcc/config/microblaze/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/microblaze/linux.h gcc-4.8.3/gcc/config/microblaze/linux.h
    old new  
    2525#undef TLS_NEEDS_GOT
    2626#define TLS_NEEDS_GOT 1
    2727
    28 #define DYNAMIC_LINKER "/lib/ld.so.1"
     28#define DYNAMIC_LINKER "/tools/lib/ld.so.1"
    2929#undef  SUBTARGET_EXTRA_SPECS
    3030#define SUBTARGET_EXTRA_SPECS \
    3131  { "dynamic_linker", DYNAMIC_LINKER }

  • gcc/config/mips/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/mips/linux.h gcc-4.8.3/gcc/config/mips/linux.h
    old new  
    1717along with GCC; see the file COPYING3.  If not see
    1818<http://www.gnu.org/licenses/>.  */
    1919
    20 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     20#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"

  • 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 "/tools/lib/ld.so.1"
     26#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld.so.1"
     27#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1"
     28#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/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/mn10300/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/mn10300/linux.h gcc-4.8.3/gcc/config/mn10300/linux.h
    old new  
    3232#undef  ASM_SPEC
    3333#define ASM_SPEC ""
    3434
    35 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     35#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    3636
    3737#undef  LINK_SPEC
    3838#define LINK_SPEC "%{mrelax:--relax} %{shared:-shared} \

  • gcc/config/pa/pa-linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/pa/pa-linux.h gcc-4.8.3/gcc/config/pa/pa-linux.h
    old new  
    3737/* Define this for shared library support because it isn't in the main
    3838   linux.h file.  */
    3939
    40 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     40#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    4141
    4242#undef LINK_SPEC
    4343#define LINK_SPEC "\

  • 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 "/tools/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:/tools/lib/ld64.so.1;:/tools/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:/tools/lib/ld64.so.2;:/tools/lib/ld64.so.1}"
    374374#endif
    375 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
    376 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
     375#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-uClibc.so.0"
     376#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
    377377#if DEFAULT_LIBC == LIBC_UCLIBC
    378378#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
    379379#elif DEFAULT_LIBC == LIBC_GLIBC

  • gcc/config/rs6000/sysv4.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/rs6000/sysv4.h gcc-4.8.3/gcc/config/rs6000/sysv4.h
    old new  
    761761
    762762#define LINK_START_LINUX_SPEC ""
    763763
    764 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
    765 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
     764#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
     765#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
    766766#if DEFAULT_LIBC == LIBC_UCLIBC
    767767#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
    768768#elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC

  • 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"
    64 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
     63#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld.so.1"
     64#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
    6565
    6666#undef  LINK_SPEC
    6767#define 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/sh/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/sh/linux.h gcc-4.8.3/gcc/config/sh/linux.h
    old new  
    4343
    4444#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
    4545
    46 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
     46#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
    4747
    4848#undef SUBTARGET_LINK_EMUL_SUFFIX
    4949#define SUBTARGET_LINK_EMUL_SUFFIX "_linux"

  • 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 "/tools/lib/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 "/tools/lib32/ld-linux.so.2"
     96#define GLIBC_DYNAMIC_LINKER64 "/tools/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/tools/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)

  • gcc/config/vax/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/vax/linux.h gcc-4.8.3/gcc/config/vax/linux.h
    old new  
    4141  %{!shared: \
    4242    %{!static: \
    4343      %{rdynamic:-export-dynamic} \
    44       -dynamic-linker /lib/ld.so.1} \
     44      -dynamic-linker /tools/lib/ld.so.1} \
    4545    %{static:-static}}"
    4646
    4747#undef  WCHAR_TYPE

  • gcc/config/xtensa/linux.h 

    diff -Naur gcc-4.8.3.orig/gcc/config/xtensa/linux.h gcc-4.8.3/gcc/config/xtensa/linux.h
    old new  
    4444  %{mlongcalls:--longcalls} \
    4545  %{mno-longcalls:--no-longcalls}"
    4646
    47 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     47#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    4848
    4949#undef LINK_SPEC
    5050#define LINK_SPEC \
Note: See TracBrowser for help on using the repository browser.