source: patches/gcc-4.6.0-pure64_specs-1.patch@ cfb2026a

clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since cfb2026a was d3cbdd9, checked in by Joe Ciccone <jciccone@…>, 14 years ago

Updated GCC to 4.6.0.
  • Property mode set to 100644
File size: 22.0 KB

  • gcc/config/alpha/gnu.h 

    Submitted By: Joe Ciccone <jciccone@gmail.com>
Date: 04-16-2011
Initial Package Version: 3.4.6
Origin: Idea originally developed by Ryan Oliver and Greg Schafer for
        the Pure LFS project.
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.

    Rediffed Against 4.5.2 By Pontus Carlsson <PontusCarlsson at live dot se>
    Rediffed Against 4.6.0 By Joe Ciccone <jciccone@gmail.com>

diff -Naur gcc-4.6.0.orig/gcc/config/alpha/gnu.h gcc-4.6.0/gcc/config/alpha/gnu.h
    old new  
    3434    } while (0)
    3535
    3636#undef ELF_DYNAMIC_LINKER
    37 #define ELF_DYNAMIC_LINKER      "/lib/ld.so"
     37#define ELF_DYNAMIC_LINKER      "/tools/lib/ld.so"
    3838
    3939#undef  STARTFILE_SPEC
    4040#define STARTFILE_SPEC \

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

    diff -Naur gcc-4.6.0.orig/gcc/config/alpha/linux-elf.h gcc-4.6.0/gcc/config/alpha/linux-elf.h
    old new  
    2727#define EXTRA_SPECS \
    2828{ "elf_dynamic_linker", ELF_DYNAMIC_LINKER },
    2929
    30 #define GLIBC_DYNAMIC_LINKER    "/lib/ld-linux.so.2"
    31 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
     30#define GLIBC_DYNAMIC_LINKER    "/tools/lib/ld-linux.so.2"
     31#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
    3232#if DEFAULT_LIBC == LIBC_UCLIBC
    3333#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
    3434#elif DEFAULT_LIBC == LIBC_GLIBC

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

    diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-eabi.h gcc-4.6.0/gcc/config/arm/linux-eabi.h
    old new  
    6262/* Use ld-linux.so.3 so that it will be possible to run "classic"
    6363   GNU/Linux binaries on an EABI system.  */
    6464#undef  GLIBC_DYNAMIC_LINKER
    65 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.3"
     65#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.3"
    6666
    6767/* At this point, bpabi.h will have clobbered LINK_SPEC.  We want to
    6868   use the GNU/Linux version, not the generic BPABI version.  */

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

    diff -Naur gcc-4.6.0.orig/gcc/config/arm/linux-elf.h gcc-4.6.0/gcc/config/arm/linux-elf.h
    old new  
    6262
    6363#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{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-4.6.0.orig/gcc/config/bfin/linux.h gcc-4.6.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#define MD_UNWIND_SUPPORT "config/bfin/linux-unwind.h"

  • gcc/config/cris/linux.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/cris/linux.h gcc-4.6.0/gcc/config/cris/linux.h
    old new  
    103103#undef CRIS_DEFAULT_CPU_VERSION
    104104#define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
    105105
    106 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     106#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    107107
    108108#undef CRIS_LINK_SUBTARGET_SPEC
    109109#define CRIS_LINK_SUBTARGET_SPEC \

  • gcc/config/freebsd-spec.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/freebsd-spec.h gcc-4.6.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#if defined(HAVE_LD_EH_FRAME_HDR)

  • gcc/config/frv/linux.h 

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

  • gcc/config/i386/gnu.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/i386/gnu.h gcc-4.6.0/gcc/config/i386/gnu.h
    old new  
    2121*/
    2222
    2323#undef GLIBC_DYNAMIC_LINKER
    24 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so"
     24#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so"
    2525
    2626#undef TARGET_VERSION
    2727#define TARGET_VERSION fprintf (stderr, " (i386 GNU)");

  • gcc/config/i386/linux.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux.h gcc-4.6.0/gcc/config/i386/linux.h
    old new  
    9292
    9393/* These macros may be overridden in k*bsd-gnu.h and i386/k*bsd-gnu.h. */
    9494#define LINK_EMULATION "elf_i386"
    95 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
     95#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
    9696
    9797#undef  ASM_SPEC
    9898#define ASM_SPEC \

  • gcc/config/i386/linux64.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/i386/linux64.h gcc-4.6.0/gcc/config/i386/linux64.h
    old new  
    6262   When the -shared link option is used a final link is not being
    6363   done.  */
    6464
    65 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
    66 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
     65#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
     66#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux-x86-64.so.2"
    6767
    6868#if TARGET_64BIT_DEFAULT
    6969#define SPEC_32 "m32"

  • gcc/config/i386/t-linux64 

    diff -Naur gcc-4.6.0.orig/gcc/config/i386/t-linux64 gcc-4.6.0/gcc/config/i386/t-linux64
    old new  
    2525
    2626MULTILIB_OPTIONS = m64/m32
    2727MULTILIB_DIRNAMES = 64 32
    28 MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
     28MULTILIB_OSDIRNAMES = ../lib ../lib32
    2929
    3030LIBGCC = stmp-multilib
    3131INSTALL_LIBGCC = install-multilib

  • gcc/config/ia64/linux.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/ia64/linux.h gcc-4.6.0/gcc/config/ia64/linux.h
    old new  
    6161/* Define this for shared library support because it isn't in the main
    6262   linux.h file.  */
    6363
    64 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2"
     64#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux-ia64.so.2"
    6565
    6666#undef LINK_SPEC
    6767#define LINK_SPEC "\

  • gcc/config/kfreebsd-gnu.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/kfreebsd-gnu.h gcc-4.6.0/gcc/config/kfreebsd-gnu.h
    old new  
    3333
    3434#ifdef GLIBC_DYNAMIC_LINKER
    3535#undef GLIBC_DYNAMIC_LINKER
    36 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     36#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    3737#endif

  • gcc/config/knetbsd-gnu.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/knetbsd-gnu.h gcc-4.6.0/gcc/config/knetbsd-gnu.h
    old new  
    3434
    3535#ifdef GLIBC_DYNAMIC_LINKER
    3636#undef GLIBC_DYNAMIC_LINKER
    37 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     37#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    3838#endif

  • gcc/config/kopensolaris-gnu.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/kopensolaris-gnu.h gcc-4.6.0/gcc/config/kopensolaris-gnu.h
    old new  
    3333
    3434#ifdef GLIBC_DYNAMIC_LINKER
    3535#undef GLIBC_DYNAMIC_LINKER
    36 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     36#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    3737#endif

  • gcc/config/linux.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/linux.h gcc-4.6.0/gcc/config/linux.h
    old new  
    7474   GLIBC_DYNAMIC_LINKER must be defined for each target using them, or
    7575   GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
    7676   supporting both 32-bit and 64-bit compilation.  */
    77 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
    78 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
    79 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
     77#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
     78#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
     79#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-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.6.0.orig/gcc/config/lm32/uclinux-elf.h gcc-4.6.0/gcc/config/lm32/uclinux-elf.h
    old new  
    7272   %{shared:-shared} \
    7373   %{symbolic:-Bsymbolic} \
    7474   %{rdynamic:-export-dynamic} \
    75    -dynamic-linker /lib/ld-linux.so.2"
     75   -dynamic-linker /tools/lib/ld-linux.so.2"
    7676
    7777#define TARGET_OS_CPP_BUILTINS() LINUX_TARGET_OS_CPP_BUILTINS()
    7878

  • gcc/config/m32r/linux.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/m32r/linux.h gcc-4.6.0/gcc/config/m32r/linux.h
    old new  
    4747   When the -shared link option is used a final link is not being
    4848   done.  */
    4949
    50 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
     50#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
    5151
    5252#undef  LINK_SPEC
    5353#if TARGET_LITTLE_ENDIAN

  • gcc/config/m68k/linux.h 

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

  • gcc/config/microblaze/linux.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/microblaze/linux.h gcc-4.6.0/gcc/config/microblaze/linux.h
    old new  
    2020   <http://www.gnu.org/licenses/>.  */
    2121
    2222
    23 #define DYNAMIC_LINKER "/lib/ld.so.1"
     23#define DYNAMIC_LINKER "/tools/lib/ld.so.1"
    2424#undef  SUBTARGET_EXTRA_SPECS
    2525#define SUBTARGET_EXTRA_SPECS \
    2626  { "dynamic_linker", DYNAMIC_LINKER }

  • gcc/config/mips/linux.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux.h gcc-4.6.0/gcc/config/mips/linux.h
    old new  
    6161#undef MIPS_DEFAULT_GVALUE
    6262#define MIPS_DEFAULT_GVALUE 0
    6363
    64 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
     64#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
    6565
    6666/* Borrowed from sparc/linux.h */
    6767#undef LINK_SPEC

  • gcc/config/mips/linux64.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/mips/linux64.h gcc-4.6.0/gcc/config/mips/linux64.h
    old new  
    3535%{!shared: \
    3636  %{profile:-lc_p} %{!profile:-lc}}"
    3737
    38 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
    39 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld.so.1"
    40 #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
    41 #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
     38#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
     39#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld.so.1"
     40#define GLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld.so.1"
     41#define UCLIBC_DYNAMIC_LINKERN32 "/tools/lib32/ld-uClibc.so.0"
    4242#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
    4343#define LINUX_DYNAMIC_LINKERN32 \
    4444  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \

  • gcc/config/mips/t-linux64 

    diff -Naur gcc-4.6.0.orig/gcc/config/mips/t-linux64 gcc-4.6.0/gcc/config/mips/t-linux64
    old new  
    1818
    1919MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
    2020MULTILIB_DIRNAMES = n32 32 64
    21 MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
     21MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
    2222
    2323EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
    2424

  • gcc/config/mn10300/linux.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/mn10300/linux.h gcc-4.6.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/pa/pa-linux.h 

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

  • gcc/config/rs6000/linux64.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/linux64.h gcc-4.6.0/gcc/config/rs6000/linux64.h
    old new  
    372372#undef  LINK_OS_DEFAULT_SPEC
    373373#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
    374374
    375 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
    376 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
    377 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
    378 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
     375#define GLIBC_DYNAMIC_LINKER32 "/tools/lib/ld.so.1"
     376#define GLIBC_DYNAMIC_LINKER64 "/tools/lib64/ld64.so.1"
     377#define UCLIBC_DYNAMIC_LINKER32 "/tools/lib/ld-uClibc.so.0"
     378#define UCLIBC_DYNAMIC_LINKER64 "/tools/lib/ld64-uClibc.so.0"
    379379#if DEFAULT_LIBC == LIBC_UCLIBC
    380380#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
    381381#elif DEFAULT_LIBC == LIBC_GLIBC

  • gcc/config/rs6000/sysv4.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/sysv4.h gcc-4.6.0/gcc/config/rs6000/sysv4.h
    old new  
    818818
    819819#define LINK_START_LINUX_SPEC ""
    820820
    821 #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
    822 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
     821#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld.so.1"
     822#define UCLIBC_DYNAMIC_LINKER "/tools/lib/ld-uClibc.so.0"
    823823#if DEFAULT_LIBC == LIBC_UCLIBC
    824824#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"
    825825#elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC
    … …  
    863863
    864864#define LINK_OS_GNU_SPEC "-m elf32ppclinux %{!shared: %{!static: \
    865865  %{rdynamic:-export-dynamic} \
    866   -dynamic-linker /lib/ld.so.1}}"
     866  -dynamic-linker /tools/lib/ld.so.1}}"
    867867
    868868#define CPP_OS_GNU_SPEC "-D__unix__ -D__gnu_hurd__ -D__GNU__    \
    869869%{!undef:                                                       \

  • gcc/config/rs6000/t-linux64 

    diff -Naur gcc-4.6.0.orig/gcc/config/rs6000/t-linux64 gcc-4.6.0/gcc/config/rs6000/t-linux64
    old new  
    3636MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
    3737MULTILIB_EXCEPTIONS     = m64/msoft-float
    3838MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
    39 MULTILIB_OSDIRNAMES     = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
     39MULTILIB_OSDIRNAMES     = ../lib ../lib32 nof
    4040MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
    4141
    4242softfp_wrap_start := '\#ifndef __powerpc64__'

  • gcc/config/s390/linux.h 

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

  • gcc/config/s390/t-linux64 

    diff -Naur gcc-4.6.0.orig/gcc/config/s390/t-linux64 gcc-4.6.0/gcc/config/s390/t-linux64
    old new  
    77
    88MULTILIB_OPTIONS = m64/m31
    99MULTILIB_DIRNAMES = 64 32
    10 MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
     10MULTILIB_OSDIRNAMES = ../lib ../lib32

  • gcc/config/sh/linux.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/sh/linux.h gcc-4.6.0/gcc/config/sh/linux.h
    old new  
    4747
    4848#define TARGET_ASM_FILE_END file_end_indicate_exec_stack
    4949
    50 #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
     50#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
    5151
    5252#undef SUBTARGET_LINK_EMUL_SUFFIX
    5353#define SUBTARGET_LINK_EMUL_SUFFIX "_linux"

  • gcc/config/sparc/linux.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux.h gcc-4.6.0/gcc/config/sparc/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-linux.so.2"
     74#define GLIBC_DYNAMIC_LINKER "/tools/lib/ld-linux.so.2"
    7575
    7676#undef  LINK_SPEC
    77 #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
     77#define LINK_SPEC "-m elf32_sparc -Y P,/tools/lib32 %{shared:-shared} \
    7878  %{!mno-relax:%{!r:-relax}} \
    7979  %{!shared: \
    8080    %{!static: \

  • gcc/config/sparc/linux64.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/sparc/linux64.h gcc-4.6.0/gcc/config/sparc/linux64.h
    old new  
    101101   When the -shared link option is used a final link is not being
    102102   done.  */
    103103
    104 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
    105 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
     104#define GLIBC_DYNAMIC_LINKER32 "/tools/lib32/ld-linux.so.2"
     105#define GLIBC_DYNAMIC_LINKER64 "/tools/lib/ld-linux.so.2"
    106106
    107107#ifdef SPARC_BI_ARCH
    108108
    … …  
    113113  { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },        \
    114114  { "link_arch",         LINK_ARCH_SPEC },
    115115
    116 #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/usr/lib %{shared:-shared} \
     116#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,%R/tools/lib32 %{shared:-shared} \
    117117  %{!shared: \
    118118    %{!static: \
    119119      %{rdynamic:-export-dynamic} \
    … …  
    121121      %{static:-static}} \
    122122"
    123123
    124 #define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/usr/lib64 %{shared:-shared} \
     124#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,%R/tools/lib %{shared:-shared} \
    125125  %{!shared: \
    126126    %{!static: \
    127127      %{rdynamic:-export-dynamic} \
    … …  
    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/lib %{shared:-shared} \
    197197  %{!shared: \
    198198    %{!static: \
    199199      %{rdynamic:-export-dynamic} \

  • gcc/config/sparc/t-linux64 

    diff -Naur gcc-4.6.0.orig/gcc/config/sparc/t-linux64 gcc-4.6.0/gcc/config/sparc/t-linux64
    old new  
    2626
    2727MULTILIB_OPTIONS = m64/m32
    2828MULTILIB_DIRNAMES = 64 32
    29 MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
     29MULTILIB_OSDIRNAMES = ../lib ../lib32
    3030
    3131LIBGCC = stmp-multilib
    3232INSTALL_LIBGCC = install-multilib

  • gcc/config/vax/linux.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/vax/linux.h gcc-4.6.0/gcc/config/vax/linux.h
    old new  
    4444  %{!shared: \
    4545    %{!static: \
    4646      %{rdynamic:-export-dynamic} \
    47       -dynamic-linker /lib/ld.so.1} \
     47      -dynamic-linker /tools/lib/ld.so.1} \
    4848    %{static:-static}}"
    4949
    5050#undef  WCHAR_TYPE

  • gcc/config/xtensa/linux.h 

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