Ticket #1114: gcc-7.1.0-pure64_specs-1.2.patch

File gcc-7.1.0-pure64_specs-1.2.patch, 19.9 KB (added by chris@…, 8 years ago)

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

    Submitted By: William Harrington <kb0iic at cross-lfs dot org>
Date: 12-28-2015
Initial Package Version: 5.1.0
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.
Comment: Renamed for GCC 5.3.0

diff -Naur gcc-6.1.0.orig/gcc/config/aarch64/aarch64-linux.h gcc-6.1.0/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%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
     24#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"
    2525
    2626#undef MUSL_DYNAMIC_LINKER
    2727#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1"

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

    diff -Naur gcc-6.1.0.orig/gcc/config/alpha/linux-elf.h gcc-6.1.0/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-6.1.0.orig/gcc/config/arm/linux-eabi.h gcc-6.1.0/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-6.1.0.orig/gcc/config/arm/linux-elf.h gcc-6.1.0/gcc/config/arm/linux-elf.h
    old new  
    6262
    6363#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc"
    6464
    65 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
     65#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
    6666
    6767#define LINUX_TARGET_LINK_SPEC  "%{h*} \
    6868   %{static:-Bstatic} \

  • gcc/config/bfin/linux.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/bfin/linux.h gcc-6.1.0/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/c6x/uclinux-elf.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/c6x/uclinux-elf.h gcc-6.1.0/gcc/config/c6x/uclinux-elf.h
    old new  
    3636#define STARTFILE_SPEC \
    3737  "%{!shared:crt1%O%s} crti%O%s %{shared|pie:crtbeginS.o%s;:crtbegin.o%s}"
    3838
    39 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
     39#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
    4040
    4141#undef LINK_SPEC
    4242#define LINK_SPEC ENDIAN_LINK_SPEC \

  • gcc/config/cris/linux.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/cris/linux.h gcc-6.1.0/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-6.1.0.orig/gcc/config/freebsd-spec.h gcc-6.1.0/gcc/config/freebsd-spec.h
    old new  
    131131#if FBSD_MAJOR < 6
    132132#define FBSD_DYNAMIC_LINKER "/usr/libexec/ld-elf.so.1"
    133133#else
    134 #define FBSD_DYNAMIC_LINKER "/libexec/ld-elf.so.1"
     134#define FBSD_DYNAMIC_LINKER "/tools/libexec/ld-elf.so.1"
    135135#endif
    136136
    137137/* NOTE: The freebsd-spec.h header is included also for various

  • gcc/config/frv/linux.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/frv/linux.h gcc-6.1.0/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-6.1.0.orig/gcc/config/i386/gnu.h gcc-6.1.0/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/kfreebsd-gnu64.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/i386/kfreebsd-gnu64.h gcc-6.1.0/gcc/config/i386/kfreebsd-gnu64.h
    old new  
    2222#define GNU_USER_LINK_EMULATION64 "elf_x86_64_fbsd"
    2323#define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64_fbsd"
    2424
    25 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
    26 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld-kfreebsd-x86-64.so.1"
    27 #define GLIBC_DYNAMIC_LINKERX32 "/lib/ld-kfreebsd-x32.so.1"
     25#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
     26#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-kfreebsd-x86-64.so.1"
     27#define GLIBC_DYNAMIC_LINKERX32 "/tools/lib/ld-kfreebsd-x32.so.1"

  • gcc/config/i386/kfreebsd-gnu.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/i386/kfreebsd-gnu.h gcc-6.1.0/gcc/config/i386/kfreebsd-gnu.h
    old new  
    1919<http://www.gnu.org/licenses/>.  */
    2020
    2121#define GNU_USER_LINK_EMULATION "elf_i386_fbsd"
    22 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     22#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"

  • gcc/config/i386/linux64.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/i386/linux64.h gcc-6.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"
    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"
    3333
    3434#undef MUSL_DYNAMIC_LINKER32
    3535#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"

  • gcc/config/i386/linux.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/i386/linux.h gcc-6.1.0/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"
    2424
    2525#undef MUSL_DYNAMIC_LINKER
    2626#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"

  • gcc/config/i386/t-linux64 

    diff -Naur gcc-6.1.0.orig/gcc/config/i386/t-linux64 gcc-6.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/ia64/linux.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/ia64/linux.h gcc-6.1.0/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/kopensolaris-gnu.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/kopensolaris-gnu.h gcc-6.1.0/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-6.1.0.orig/gcc/config/linux.h gcc-6.1.0/gcc/config/linux.h
    old new  
    8181   GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
    8282   GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
    8383   supporting both 32-bit and 64-bit compilation.  */
    84 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
    85 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
    86 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    87 #define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0"
     84#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
     85#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
     86#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
     87#define UCLIBC_DYNAMIC_LINKERX32 "/tools/lib/ldx32-uClibc.so.0"
    8888#define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
    8989#define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"
    9090#define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64"

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

    diff -Naur gcc-6.1.0.orig/gcc/config/lm32/uclinux-elf.h gcc-6.1.0/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/m32r/linux.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/m32r/linux.h gcc-6.1.0/gcc/config/m32r/linux.h
    old new  
    3737   When the -shared link option is used a final link is not being
    3838   done.  */
    3939
    40 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
     40#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
    4141
    4242#undef  LINK_SPEC
    4343#if TARGET_LITTLE_ENDIAN

  • gcc/config/m68k/linux.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/m68k/linux.h gcc-6.1.0/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-6.1.0.orig/gcc/config/microblaze/linux.h gcc-6.1.0/gcc/config/microblaze/linux.h
    old new  
    2828#undef TLS_NEEDS_GOT
    2929#define TLS_NEEDS_GOT 1
    3030
    31 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     31#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    3232#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
    3333
    3434#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */

  • gcc/config/mn10300/linux.h 

     #define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:;:el}"
diff -Naur gcc-6.1.0.orig/gcc/config/mn10300/linux.h gcc-6.1.0/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/nios2/linux.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/nios2/linux.h gcc-6.1.0/gcc/config/nios2/linux.h
    old new  
    2929#undef CPP_SPEC
    3030#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
    3131
    32 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-nios2.so.1"
     32#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-nios2.so.1"
    3333
    3434#undef LINK_SPEC
    3535#define LINK_SPEC LINK_SPEC_ENDIAN \

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

    diff -Naur gcc-6.1.0.orig/gcc/config/pa/pa-linux.h gcc-6.1.0/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-6.1.0.orig/gcc/config/rs6000/linux64.h gcc-6.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 "/tools/lib/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:/tools/lib64/ld64.so.1;" \
     420":/tools/lib64/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:/tools/lib64/ld64.so.2;" \
     424":/tools/lib64/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"
    433 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
     432#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
     433#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
    434434#if DEFAULT_LIBC == LIBC_UCLIBC
    435435#define CHOOSE_DYNAMIC_LINKER(G, U, M) \
    436436  "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}"

  • gcc/config/rs6000/sysv4.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/rs6000/sysv4.h gcc-6.1.0/gcc/config/rs6000/sysv4.h
    old new  
    764764
    765765#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","")
    766766
    767 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
    768 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
     767#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
     768#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
    769769#define MUSL_DYNAMIC_LINKER \
    770770  "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1"
    771771#if DEFAULT_LIBC == LIBC_UCLIBC

  • gcc/config/s390/linux.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/s390/linux.h gcc-6.1.0/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/lib/ld.so.1"
     64#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64.so.1"
    6565
    6666#undef  LINK_SPEC
    6767#define LINK_SPEC \

  • gcc/config/sh/linux.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/sh/linux.h gcc-6.1.0/gcc/config/sh/linux.h
    old new  
    6464  "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \
    6565  "%{mfdpic:-fdpic}.so.1"
    6666
    67 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
     67#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
    6868
    6969#undef SUBTARGET_LINK_EMUL_SUFFIX
    7070#define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}"

  • gcc/config/sparc/linux64.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/sparc/linux64.h gcc-6.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 "/tools/lib/ld-linux.so.2"
     88#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld-linux.so.2"
    8989
    9090#ifdef SPARC_BI_ARCH
    9191
    … …  
    193193#else /* !SPARC_BI_ARCH */
    194194
    195195#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/tools/lib64 %{shared:-shared} \
    197197  %{!shared: \
    198198    %{!static: \
    199199      %{rdynamic:-export-dynamic} \

  • gcc/config/sparc/linux.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/sparc/linux.h gcc-6.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 "/tools/lib/ld-linux.so.2"
    8787
    8888#undef  LINK_SPEC
    8989#define LINK_SPEC "-m elf32_sparc %{shared:-shared} \

  • gcc/config/xtensa/linux.h 

    diff -Naur gcc-6.1.0.orig/gcc/config/xtensa/linux.h gcc-6.1.0/gcc/config/xtensa/linux.h
    old new  
    4646  %{mauto-litpools:--auto-litpools} \
    4747  %{mno-auto-litpools:--no-auto-litpools}"
    4848
    49 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     49#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    5050
    5151#undef LINK_SPEC
    5252#define LINK_SPEC \