source: patches/gcc-4.2.4-pure64-1.patch@ 42546b79

Last change on this file since 42546b79 was 67300de, checked in by Joe Ciccone <jciccone@…>, 16 years ago

Create a clfs-1.1 branch in preperation for a RC.
  • Property mode set to 100644
File size: 7.4 KB

  • gcc/config/i386/linux64.h 

    Submitted By: Jim Gifford (patches at jg555 dot com)
Date: 2005-08-27
Initial Package Version: 4.x
Origin: Ken Moffat and Jim Gifford
        Rediffed against 4.1.0 by Chris Staub
	Changes for 4.2.{0,1,2} not noted
	Rediffed against 4.2.4 and header reinstated by Ken Moffat
Upstream Status: CLFS Specific
Description: Make LIB64 builds in /lib instead of /lib64 

diff -Naur gcc-4.2.4.orig/gcc/config/i386/linux64.h gcc-4.2.4/gcc/config/i386/linux64.h
    old new  
    4848   When the -shared link option is used a final link is not being
    4949   done.  */
    5050
    51 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
    52 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
     51#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
     52#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
    5353
    5454#undef  LINK_SPEC
    5555#define LINK_SPEC "%{!m32:-m elf_x86_64} %{m32:-m elf_i386} \

  • gcc/config/i386/t-linux64 

    diff -Naur gcc-4.2.4.orig/gcc/config/i386/t-linux64 gcc-4.2.4/gcc/config/i386/t-linux64
    old new  
    1313
    1414MULTILIB_OPTIONS = m64/m32
    1515MULTILIB_DIRNAMES = 64 32
    16 MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
     16MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
    1717
    1818LIBGCC = stmp-multilib
    1919INSTALL_LIBGCC = install-multilib

  • gcc/config/mips/linux64.h 

    diff -Naur gcc-4.2.4.orig/gcc/config/mips/linux64.h gcc-4.2.4/gcc/config/mips/linux64.h
    old new  
    3535%{!shared: %{pthread:-lpthread} \
    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 LINUX_DYNAMIC_LINKERN32 \
    4343  CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32)
    4444

  • gcc/config/mips/t-linux64 

    diff -Naur gcc-4.2.4.orig/gcc/config/mips/t-linux64 gcc-4.2.4/gcc/config/mips/t-linux64
    old new  
    11MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64
    22MULTILIB_DIRNAMES = n32 32 64
    3 MULTILIB_OSDIRNAMES = ../lib32 ../lib ../lib64
     3MULTILIB_OSDIRNAMES = ../lib64 ../lib32 ../lib
    44
    55EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
    66

  • gcc/config/rs6000/linux64.h 

    diff -Naur gcc-4.2.4.orig/gcc/config/rs6000/linux64.h gcc-4.2.4/gcc/config/rs6000/linux64.h
    old new  
    335335#undef  LINK_OS_DEFAULT_SPEC
    336336#define LINK_OS_DEFAULT_SPEC "%(link_os_linux)"
    337337
    338 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1"
    339 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1"
     338#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1"
     339#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1"
    340340#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
    341341#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    342342#if UCLIBC_DEFAULT

  • gcc/config/rs6000/t-linux64 

    diff -Naur gcc-4.2.4.orig/gcc/config/rs6000/t-linux64 gcc-4.2.4/gcc/config/rs6000/t-linux64
    old new  
    1919MULTILIB_EXTRA_OPTS     = fPIC mstrict-align
    2020MULTILIB_EXCEPTIONS     = m64/msoft-float
    2121MULTILIB_EXCLUSIONS     = m64/!m32/msoft-float
    22 MULTILIB_OSDIRNAMES     = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
     22MULTILIB_OSDIRNAMES     = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof
    2323MULTILIB_MATCHES        = $(MULTILIB_MATCHES_FLOAT)
    2424
    2525softfp_wrap_start := '\#ifndef __powerpc64__'

  • gcc/config/s390/t-linux64 

    diff -Naur gcc-4.2.4.orig/gcc/config/s390/t-linux64 gcc-4.2.4/gcc/config/s390/t-linux64
    old new  
    11MULTILIB_OPTIONS = m64/m31
    22MULTILIB_DIRNAMES = 64 32
    3 MULTILIB_OSDIRNAMES = ../lib64 ../lib
     3MULTILIB_OSDIRNAMES = ../lib ../lib32
    44
    55LIBGCC = stmp-multilib
    66INSTALL_LIBGCC = install-multilib

  • gcc/config/sparc/linux64.h 

    diff -Naur gcc-4.2.4.orig/gcc/config/sparc/linux64.h gcc-4.2.4/gcc/config/sparc/linux64.h
    old new  
    143143
    144144/* If ELF is the default format, we should not use /lib/elf.  */
    145145
    146 #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
    147 #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2"
     146#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
     147#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2"
    148148#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"
    149149#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0"
    150150#if UCLIBC_DEFAULT
    … …  
    166166  { "link_arch_default", LINK_ARCH_DEFAULT_SPEC },        \
    167167  { "link_arch",         LINK_ARCH_SPEC },
    168168
    169 #define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
     169#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
    170170  %{!shared: \
    171171    %{!ibcs: \
    172172      %{!static: \
    … …  
    175175        %{static:-static}}} \
    176176"
    177177
    178 #define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
     178#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
    179179  %{!shared: \
    180180    %{!ibcs: \
    181181      %{!static: \
    … …  
    256256#else /* !SPARC_BI_ARCH */
    257257
    258258#undef LINK_SPEC
    259 #define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \
     259#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib %{shared:-shared} \
    260260  %{!shared: \
    261261    %{!ibcs: \
    262262      %{!static: \

  • gcc/config/sparc/linux.h 

    diff -Naur gcc-4.2.4.orig/gcc/config/sparc/linux.h gcc-4.2.4/gcc/config/sparc/linux.h
    old new  
    132132
    133133
    134134#undef  LINK_SPEC
    135 #define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \
     135#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib32 %{shared:-shared} \
    136136  %{!mno-relax:%{!r:-relax}} \
    137137  %{!shared: \
    138138    %{!ibcs: \

  • gcc/config/sparc/t-linux64 

    diff -Naur gcc-4.2.4.orig/gcc/config/sparc/t-linux64 gcc-4.2.4/gcc/config/sparc/t-linux64
    old new  
    11MULTILIB_OPTIONS = m64/m32
    22MULTILIB_DIRNAMES = 64 32
    3 MULTILIB_OSDIRNAMES = ../lib64 ../lib
     3MULTILIB_OSDIRNAMES = ../lib ../lib32
    44
    55LIBGCC = stmp-multilib
    66INSTALL_LIBGCC = install-multilib
    … …  
    1010
    1111CRTSTUFF_T_CFLAGS = `if test x$$($(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) \
    1212                                 -print-multi-os-directory) \
    13                         = x../lib64; then echo -mcmodel=medany; fi`
     13                        = x../lib; then echo -mcmodel=medany; fi`
Note: See TracBrowser for help on using the repository browser.