source: patches/gcc-4.6.2-pure64-1.patch@ 6203ba8

clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since 6203ba8 was f1873f3, checked in by Jonathan Norman <jon@…>, 13 years ago

Remove gcc branch patch
  • Property mode set to 100644
File size: 8.6 KB

  • gcc/config/i386/linux64.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: This patch 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/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 "/lib32/ld-linux.so.2"
     66#define GLIBC_DYNAMIC_LINKER64 "/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/linux.h 

    diff -Naur gcc-4.6.0.orig/gcc/config/linux.h gcc-4.6.0/gcc/config/linux.h
    old new  
    7575   GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets
    7676   supporting both 32-bit and 64-bit compilation.  */
    7777#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0"
    78 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
     78#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
    7979#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    8080#define BIONIC_DYNAMIC_LINKER "/system/bin/linker"
    8181#define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker"

  • 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 "/lib32/ld.so.1"
     39#define GLIBC_DYNAMIC_LINKER64 "/lib/ld.so.1"
     40#define GLIBC_DYNAMIC_LINKERN32 "/lib64/ld.so.1"
     41#define UCLIBC_DYNAMIC_LINKERN32 "/lib64/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/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"
     375#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
     376#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
     377#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0"
    378378#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    379379#if DEFAULT_LIBC == LIBC_UCLIBC
    380380#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}"

  • 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"
     75#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
    7676#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
    7777
    7878#undef  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/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  
    7474#define GLIBC_DYNAMIC_LINKER "/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,/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 "/lib32/ld-linux.so.2"
     105#define GLIBC_DYNAMIC_LINKER64 "/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/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/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/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 ../lib64
    3030
    3131LIBGCC = stmp-multilib
    3232INSTALL_LIBGCC = install-multilib
Note: See TracBrowser for help on using the repository browser.