Changeset 0804c00 for patches/gcc-4.3.3-pure64-1.patch
- Timestamp:
- Jan 25, 2009, 1:06:18 AM (15 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 49073ef
- Parents:
- 5ec7db05
- File:
-
- 1 moved
-
patches/gcc-4.3.3-pure64-1.patch (moved) (moved from patches/gcc-4.3.2-pure64-1.patch) (12 diffs)
Legend:
- Unmodified
- Added
- Removed
-
patches/gcc-4.3.3-pure64-1.patch
r5ec7db05 r0804c00 1 diff -Naur gcc-4.3.1.orig/gcc/config/i386/linux64.h gcc-4.3.1/gcc/config/i386/linux64.h 2 --- gcc-4.3.1.orig/gcc/config/i386/linux64.h 2007-08-02 06:49:31.000000000 -0400 3 +++ gcc-4.3.1/gcc/config/i386/linux64.h 2008-08-24 13:43:19.000000000 -0400 1 Submitted By: Jim Gifford (jim at cross-lfs dot org) 2 Date: 01-25-2009 3 Initial Package Version: 4.3.3 4 Origin: Idea originally developed by Ryan Oliver and Greg Schafer for 5 the Pure LFS project. 6 Upstream Status: Not Applied 7 Description: This patch modifies the location of the dynamic linker for gcc-4.3.3. 8 9 diff -Naur gcc-4.3.3.orig/gcc/config/i386/linux64.h gcc-4.3.3/gcc/config/i386/linux64.h 10 --- gcc-4.3.3.orig/gcc/config/i386/linux64.h 2007-08-02 03:49:31.000000000 -0700 11 +++ gcc-4.3.3/gcc/config/i386/linux64.h 2009-01-25 00:49:04.956938399 -0800 4 12 @@ -53,8 +53,8 @@ 5 13 When the -shared link option is used a final link is not being … … 13 21 #if TARGET_64BIT_DEFAULT 14 22 #define SPEC_32 "m32" 15 diff -Naur gcc-4.3. 1.orig/gcc/config/i386/t-linux64 gcc-4.3.1/gcc/config/i386/t-linux6416 --- gcc-4.3. 1.orig/gcc/config/i386/t-linux64 2007-09-27 15:56:06.000000000 -040017 +++ gcc-4.3. 1/gcc/config/i386/t-linux64 2008-08-24 13:43:19.000000000 -040023 diff -Naur gcc-4.3.3.orig/gcc/config/i386/t-linux64 gcc-4.3.3/gcc/config/i386/t-linux64 24 --- gcc-4.3.3.orig/gcc/config/i386/t-linux64 2007-09-27 12:56:06.000000000 -0700 25 +++ gcc-4.3.3/gcc/config/i386/t-linux64 2009-01-25 00:49:11.211799413 -0800 18 26 @@ -13,7 +13,7 @@ 19 27 … … 21 29 MULTILIB_DIRNAMES = 64 32 22 30 -MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) 23 +MULTILIB_OSDIRNAMES 31 +MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) 24 32 25 33 LIBGCC = stmp-multilib 26 34 INSTALL_LIBGCC = install-multilib 27 diff -Naur gcc-4.3.1.orig/gcc/config/mips/linux64.h gcc-4.3.1/gcc/config/mips/linux64.h 28 --- gcc-4.3.1.orig/gcc/config/mips/linux64.h 2007-08-02 06:49:31.000000000 -0400 29 +++ gcc-4.3.1/gcc/config/mips/linux64.h 2008-08-24 13:43:19.000000000 -0400 35 diff -Naur gcc-4.3.3.orig/gcc/config/linux.h gcc-4.3.3/gcc/config/linux.h 36 --- gcc-4.3.3.orig/gcc/config/linux.h 2007-08-02 03:49:31.000000000 -0700 37 +++ gcc-4.3.3/gcc/config/linux.h 2009-01-25 00:49:09.037979047 -0800 38 @@ -113,7 +113,7 @@ 39 GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets 40 supporting both 32-bit and 64-bit compilation. */ 41 #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" 42 -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" 43 +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" 44 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 45 #define LINUX_DYNAMIC_LINKER \ 46 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) 47 diff -Naur gcc-4.3.3.orig/gcc/config/mips/linux64.h gcc-4.3.3/gcc/config/mips/linux64.h 48 --- gcc-4.3.3.orig/gcc/config/mips/linux64.h 2007-08-02 03:49:31.000000000 -0700 49 +++ gcc-4.3.3/gcc/config/mips/linux64.h 2009-01-25 00:49:09.124111188 -0800 30 50 @@ -38,10 +38,10 @@ 31 51 %{!shared: \ … … 43 63 CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32) 44 64 45 diff -Naur gcc-4.3. 1.orig/gcc/config/mips/t-linux64 gcc-4.3.1/gcc/config/mips/t-linux6446 --- gcc-4.3. 1.orig/gcc/config/mips/t-linux64 2006-06-06 08:51:24.000000000 -040047 +++ gcc-4.3. 1/gcc/config/mips/t-linux64 2008-08-24 13:43:19.000000000 -040065 diff -Naur gcc-4.3.3.orig/gcc/config/mips/t-linux64 gcc-4.3.3/gcc/config/mips/t-linux64 66 --- gcc-4.3.3.orig/gcc/config/mips/t-linux64 2006-06-06 05:51:24.000000000 -0700 67 +++ gcc-4.3.3/gcc/config/mips/t-linux64 2009-01-25 00:49:11.265119430 -0800 48 68 @@ -1,6 +1,6 @@ 49 69 MULTILIB_OPTIONS = mabi=n32/mabi=32/mabi=64 … … 54 74 EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o 55 75 56 diff -Naur gcc-4.3. 1.orig/gcc/config/rs6000/linux64.h gcc-4.3.1/gcc/config/rs6000/linux64.h57 --- gcc-4.3. 1.orig/gcc/config/rs6000/linux64.h 2007-08-02 06:49:31.000000000 -040058 +++ gcc-4.3. 1/gcc/config/rs6000/linux64.h 2008-08-24 13:43:19.000000000 -040059 @@ -339, 8 +339,8@@76 diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/linux64.h gcc-4.3.3/gcc/config/rs6000/linux64.h 77 --- gcc-4.3.3.orig/gcc/config/rs6000/linux64.h 2007-08-02 03:49:31.000000000 -0700 78 +++ gcc-4.3.3/gcc/config/rs6000/linux64.h 2009-01-25 00:49:01.265542673 -0800 79 @@ -339,9 +339,9 @@ 60 80 #undef LINK_OS_DEFAULT_SPEC 61 81 #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" … … 63 83 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" 64 84 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" 85 -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" 65 86 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" 66 87 +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" 67 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"88 +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" 68 89 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 69 90 #if UCLIBC_DEFAULT 70 diff -Naur gcc-4.3.1.orig/gcc/config/rs6000/t-linux64 gcc-4.3.1/gcc/config/rs6000/t-linux64 71 --- gcc-4.3.1.orig/gcc/config/rs6000/t-linux64 2007-09-27 15:56:06.000000000 -0400 72 +++ gcc-4.3.1/gcc/config/rs6000/t-linux64 2008-08-24 13:43:19.000000000 -0400 91 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" 92 diff -Naur gcc-4.3.3.orig/gcc/config/rs6000/t-linux64 gcc-4.3.3/gcc/config/rs6000/t-linux64 93 --- gcc-4.3.3.orig/gcc/config/rs6000/t-linux64 2007-09-27 12:56:06.000000000 -0700 94 +++ gcc-4.3.3/gcc/config/rs6000/t-linux64 2009-01-25 00:49:11.137970107 -0800 73 95 @@ -19,7 +19,7 @@ 74 96 MULTILIB_EXTRA_OPTS = fPIC mstrict-align … … 80 102 81 103 softfp_wrap_start := '\#ifndef __powerpc64__' 82 diff -Naur gcc-4.3.1.orig/gcc/config/s390/t-linux64 gcc-4.3.1/gcc/config/s390/t-linux64 83 --- gcc-4.3.1.orig/gcc/config/s390/t-linux64 2006-02-06 12:41:54.000000000 -0500 84 +++ gcc-4.3.1/gcc/config/s390/t-linux64 2008-08-24 13:43:19.000000000 -0400 104 diff -Naur gcc-4.3.3.orig/gcc/config/s390/linux.h gcc-4.3.3/gcc/config/s390/linux.h 105 --- gcc-4.3.3.orig/gcc/config/s390/linux.h 2007-08-02 03:49:31.000000000 -0700 106 +++ gcc-4.3.3/gcc/config/s390/linux.h 2009-01-25 00:49:04.058697303 -0800 107 @@ -72,7 +72,7 @@ 108 #define MULTILIB_DEFAULTS { "m31" } 109 #endif 110 111 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld.so.1" 112 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld.so.1" 113 #define GLIBC_DYNAMIC_LINKER64 "/lib/ld64.so.1" 114 115 #undef LINK_SPEC 116 diff -Naur gcc-4.3.3.orig/gcc/config/s390/t-linux64 gcc-4.3.3/gcc/config/s390/t-linux64 117 --- gcc-4.3.3.orig/gcc/config/s390/t-linux64 2006-02-06 09:41:54.000000000 -0800 118 +++ gcc-4.3.3/gcc/config/s390/t-linux64 2009-01-25 00:49:11.178985891 -0800 85 119 @@ -1,6 +1,6 @@ 86 120 MULTILIB_OPTIONS = m64/m31 … … 91 125 LIBGCC = stmp-multilib 92 126 INSTALL_LIBGCC = install-multilib 93 diff -Naur gcc-4.3. 1.orig/gcc/config/sparc/linux64.h gcc-4.3.1/gcc/config/sparc/linux64.h94 --- gcc-4.3. 1.orig/gcc/config/sparc/linux64.h 2007-10-19 00:29:38.000000000 -040095 +++ gcc-4.3. 1/gcc/config/sparc/linux64.h 2008-08-24 13:43:19.000000000 -040096 @@ -144, 8 +144,8@@127 diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux64.h gcc-4.3.3/gcc/config/sparc/linux64.h 128 --- gcc-4.3.3.orig/gcc/config/sparc/linux64.h 2007-10-18 21:29:38.000000000 -0700 129 +++ gcc-4.3.3/gcc/config/sparc/linux64.h 2009-01-25 00:49:10.604768822 -0800 130 @@ -144,9 +144,9 @@ 97 131 98 132 /* If ELF is the default format, we should not use /lib/elf. */ … … 100 134 -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" 101 135 -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" 136 -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" 102 137 +#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2" 103 138 +#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux.so.2" 104 #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0"139 +#define UCLIBC_DYNAMIC_LINKER32 "/lib32/ld-uClibc.so.0" 105 140 #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" 106 141 #if UCLIBC_DEFAULT 142 #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:%{muclibc:%e-mglibc and -muclibc used together}" G ";:" U "}" 107 143 @@ -167,7 +167,7 @@ 108 144 { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ … … 132 168 %{!ibcs: \ 133 169 %{!static: \ 134 diff -Naur gcc-4.3. 1.orig/gcc/config/sparc/linux.h gcc-4.3.1/gcc/config/sparc/linux.h135 --- gcc-4.3. 1.orig/gcc/config/sparc/linux.h 2007-08-02 06:49:31.000000000 -0400136 +++ gcc-4.3. 1/gcc/config/sparc/linux.h 2008-08-24 13:43:19.000000000 -0400170 diff -Naur gcc-4.3.3.orig/gcc/config/sparc/linux.h gcc-4.3.3/gcc/config/sparc/linux.h 171 --- gcc-4.3.3.orig/gcc/config/sparc/linux.h 2007-08-02 03:49:31.000000000 -0700 172 +++ gcc-4.3.3/gcc/config/sparc/linux.h 2009-01-25 00:49:10.863168878 -0800 137 173 @@ -132,7 +132,7 @@ 138 174 … … 144 180 %{!shared: \ 145 181 %{!ibcs: \ 146 diff -Naur gcc-4.3. 1.orig/gcc/config/sparc/t-linux64 gcc-4.3.1/gcc/config/sparc/t-linux64147 --- gcc-4.3. 1.orig/gcc/config/sparc/t-linux64 2006-02-08 02:19:43.000000000 -0500148 +++ gcc-4.3. 1/gcc/config/sparc/t-linux64 2008-08-24 13:43:19.000000000 -0400182 diff -Naur gcc-4.3.3.orig/gcc/config/sparc/t-linux64 gcc-4.3.3/gcc/config/sparc/t-linux64 183 --- gcc-4.3.3.orig/gcc/config/sparc/t-linux64 2006-02-07 23:19:43.000000000 -0800 184 +++ gcc-4.3.3/gcc/config/sparc/t-linux64 2009-01-25 00:49:11.314338874 -0800 149 185 @@ -1,6 +1,6 @@ 150 186 MULTILIB_OPTIONS = m64/m32 … … 155 191 LIBGCC = stmp-multilib 156 192 INSTALL_LIBGCC = install-multilib 157 @@ -10,4 +10,4 @@158 159 CRTSTUFF_T_CFLAGS = `if test x$$($(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) \160 -print-multi-os-directory) \161 - = x../lib64; then echo -mcmodel=medany; fi`162 + = x../lib; then echo -mcmodel=medany; fi`
Note: See TracChangeset
for help on using the changeset viewer.
