Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 53f1c382b1366c5621c8edead9c766950c290fd9 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 29 Mar 2013 09:24:50 +0400 |
| 4 | Subject: [PATCH 14/39] Define GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER |
| 5 | relative to SYSTEMLIBS_DIR |
| 6 | |
| 7 | This patch defines GLIBC_DYNAMIC_LINKER and UCLIBC_DYNAMIC_LINKER |
| 8 | relative to SYSTEMLIBS_DIR which can be set in generated headers |
| 9 | This breaks the assumption of hardcoded multilib in gcc |
| 10 | Change is only for the supported architectures in OE including |
| 11 | SH, sparc, alpha for possible future support (if any) |
| 12 | |
| 13 | Removes the do_headerfix task in metadata |
| 14 | |
| 15 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 16 | |
| 17 | Upstream-Status: Inappropriate [OE configuration] |
| 18 | --- |
| 19 | gcc/config/alpha/linux-elf.h | 4 ++-- |
| 20 | gcc/config/arm/linux-eabi.h | 4 ++-- |
| 21 | gcc/config/arm/linux-elf.h | 2 +- |
| 22 | gcc/config/i386/linux.h | 2 +- |
| 23 | gcc/config/i386/linux64.h | 6 +++--- |
| 24 | gcc/config/linux.h | 8 ++++---- |
| 25 | gcc/config/mips/linux.h | 12 ++++++------ |
| 26 | gcc/config/riscv/linux.h | 2 +- |
| 27 | gcc/config/rs6000/linux64.h | 16 ++++++---------- |
| 28 | gcc/config/sh/linux.h | 2 +- |
| 29 | gcc/config/sparc/linux.h | 2 +- |
| 30 | gcc/config/sparc/linux64.h | 4 ++-- |
| 31 | 12 files changed, 30 insertions(+), 34 deletions(-) |
| 32 | |
| 33 | diff --git a/gcc/config/alpha/linux-elf.h b/gcc/config/alpha/linux-elf.h |
| 34 | index 36b74dc1993..02373578af8 100644 |
| 35 | --- a/gcc/config/alpha/linux-elf.h |
| 36 | +++ b/gcc/config/alpha/linux-elf.h |
| 37 | @@ -23,8 +23,8 @@ along with GCC; see the file COPYING3. If not see |
| 38 | #define EXTRA_SPECS \ |
| 39 | { "elf_dynamic_linker", ELF_DYNAMIC_LINKER }, |
| 40 | |
| 41 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" |
| 42 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" |
| 43 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" |
| 44 | +#define UCLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-uClibc.so.0" |
| 45 | #if DEFAULT_LIBC == LIBC_UCLIBC |
| 46 | #define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" |
| 47 | #elif DEFAULT_LIBC == LIBC_GLIBC |
| 48 | diff --git a/gcc/config/arm/linux-eabi.h b/gcc/config/arm/linux-eabi.h |
| 49 | index 8585fde3d41..b3af68cac57 100644 |
| 50 | --- a/gcc/config/arm/linux-eabi.h |
| 51 | +++ b/gcc/config/arm/linux-eabi.h |
| 52 | @@ -62,8 +62,8 @@ |
| 53 | GLIBC_DYNAMIC_LINKER_DEFAULT and TARGET_DEFAULT_FLOAT_ABI. */ |
| 54 | |
| 55 | #undef GLIBC_DYNAMIC_LINKER |
| 56 | -#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "/lib/ld-linux.so.3" |
| 57 | -#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT "/lib/ld-linux-armhf.so.3" |
| 58 | +#define GLIBC_DYNAMIC_LINKER_SOFT_FLOAT SYSTEMLIBS_DIR "ld-linux.so.3" |
| 59 | +#define GLIBC_DYNAMIC_LINKER_HARD_FLOAT SYSTEMLIBS_DIR "ld-linux-armhf.so.3" |
| 60 | #define GLIBC_DYNAMIC_LINKER_DEFAULT GLIBC_DYNAMIC_LINKER_SOFT_FLOAT |
| 61 | |
| 62 | #define GLIBC_DYNAMIC_LINKER \ |
| 63 | diff --git a/gcc/config/arm/linux-elf.h b/gcc/config/arm/linux-elf.h |
| 64 | index cfcd9cb1a5c..a798e987ecb 100644 |
| 65 | --- a/gcc/config/arm/linux-elf.h |
| 66 | +++ b/gcc/config/arm/linux-elf.h |
| 67 | @@ -60,7 +60,7 @@ |
| 68 | |
| 69 | #define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" |
| 70 | |
| 71 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" |
| 72 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" |
| 73 | |
| 74 | #define LINUX_TARGET_LINK_SPEC "%{h*} \ |
| 75 | %{static:-Bstatic} \ |
| 76 | diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h |
| 77 | index 69f97f15b0d..71bc31d9231 100644 |
| 78 | --- a/gcc/config/i386/linux.h |
| 79 | +++ b/gcc/config/i386/linux.h |
| 80 | @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see |
| 81 | <http://www.gnu.org/licenses/>. */ |
| 82 | |
| 83 | #define GNU_USER_LINK_EMULATION "elf_i386" |
| 84 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" |
| 85 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" |
| 86 | |
| 87 | #undef MUSL_DYNAMIC_LINKER |
| 88 | #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" |
| 89 | diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h |
| 90 | index f2d913e30ac..8725f33d8a5 100644 |
| 91 | --- a/gcc/config/i386/linux64.h |
| 92 | +++ b/gcc/config/i386/linux64.h |
| 93 | @@ -27,9 +27,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
| 94 | #define GNU_USER_LINK_EMULATION64 "elf_x86_64" |
| 95 | #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64" |
| 96 | |
| 97 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" |
| 98 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" |
| 99 | -#define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" |
| 100 | +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" |
| 101 | +#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux-x86-64.so.2" |
| 102 | +#define GLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ld-linux-x32.so.2" |
| 103 | |
| 104 | #undef MUSL_DYNAMIC_LINKER32 |
| 105 | #define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" |
| 106 | diff --git a/gcc/config/linux.h b/gcc/config/linux.h |
| 107 | index 2ea4ff92c1d..487b0c0923b 100644 |
| 108 | --- a/gcc/config/linux.h |
| 109 | +++ b/gcc/config/linux.h |
| 110 | @@ -81,10 +81,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
| 111 | GLIBC_DYNAMIC_LINKER must be defined for each target using them, or |
| 112 | GLIBC_DYNAMIC_LINKER32 and GLIBC_DYNAMIC_LINKER64 for targets |
| 113 | supporting both 32-bit and 64-bit compilation. */ |
| 114 | -#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" |
| 115 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" |
| 116 | -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" |
| 117 | -#define UCLIBC_DYNAMIC_LINKERX32 "/lib/ldx32-uClibc.so.0" |
| 118 | +#define UCLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-uClibc.so.0" |
| 119 | +#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0" |
| 120 | +#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0" |
| 121 | +#define UCLIBC_DYNAMIC_LINKERX32 SYSTEMLIBS_DIR "ldx32-uClibc.so.0" |
| 122 | #define BIONIC_DYNAMIC_LINKER "/system/bin/linker" |
| 123 | #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" |
| 124 | #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" |
| 125 | diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h |
| 126 | index 2dfd0c18b90..12057c51b5e 100644 |
| 127 | --- a/gcc/config/mips/linux.h |
| 128 | +++ b/gcc/config/mips/linux.h |
| 129 | @@ -22,20 +22,20 @@ along with GCC; see the file COPYING3. If not see |
| 130 | #define GNU_USER_LINK_EMULATIONN32 "elf32%{EB:b}%{EL:l}tsmipn32" |
| 131 | |
| 132 | #define GLIBC_DYNAMIC_LINKER32 \ |
| 133 | - "%{mnan=2008:/lib/ld-linux-mipsn8.so.1;:/lib/ld.so.1}" |
| 134 | + "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}" |
| 135 | #define GLIBC_DYNAMIC_LINKER64 \ |
| 136 | - "%{mnan=2008:/lib64/ld-linux-mipsn8.so.1;:/lib64/ld.so.1}" |
| 137 | + "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}" |
| 138 | #define GLIBC_DYNAMIC_LINKERN32 \ |
| 139 | - "%{mnan=2008:/lib32/ld-linux-mipsn8.so.1;:/lib32/ld.so.1}" |
| 140 | + "%{mnan=2008:" SYSTEMLIBS_DIR "ld-linux-mipsn8.so.1;:" SYSTEMLIBS_DIR "ld.so.1}" |
| 141 | |
| 142 | #undef UCLIBC_DYNAMIC_LINKER32 |
| 143 | #define UCLIBC_DYNAMIC_LINKER32 \ |
| 144 | - "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}" |
| 145 | + "%{mnan=2008:" SYSTEMLIBS_DIR "ld-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld-uClibc.so.0}" |
| 146 | #undef UCLIBC_DYNAMIC_LINKER64 |
| 147 | #define UCLIBC_DYNAMIC_LINKER64 \ |
| 148 | - "%{mnan=2008:/lib/ld64-uClibc-mipsn8.so.0;:/lib/ld64-uClibc.so.0}" |
| 149 | + "%{mnan=2008:" SYSTEMLIBS_DIR "ld64-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld64-uClibc.so.0}" |
| 150 | #define UCLIBC_DYNAMIC_LINKERN32 \ |
| 151 | - "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" |
| 152 | + "%{mnan=2008:" SYSTEMLIBS_DIR "ld-uClibc-mipsn8.so.0;:" SYSTEMLIBS_DIR "ld-uClibc.so.0}" |
| 153 | |
| 154 | #undef MUSL_DYNAMIC_LINKER32 |
| 155 | #define MUSL_DYNAMIC_LINKER32 \ |
| 156 | diff --git a/gcc/config/riscv/linux.h b/gcc/config/riscv/linux.h |
| 157 | index aa8a28d5d..ebf9551c9 100644 |
| 158 | --- a/gcc/config/riscv/linux.h |
| 159 | +++ b/gcc/config/riscv/linux.h |
| 160 | @@ -22,7 +22,7 @@ along with GCC; see the file COPYING3. |
| 161 | GNU_USER_TARGET_OS_CPP_BUILTINS(); \ |
| 162 | } while (0) |
| 163 | |
| 164 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1" |
| 165 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux-riscv" XLEN_SPEC "-" ABI_SPEC ".so.1" |
| 166 | |
| 167 | #define MUSL_ABI_SUFFIX \ |
| 168 | "%{mabi=ilp32:-sf}" \ |
| 169 | diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h |
| 170 | index 90fe6566255..55695dadd91 100644 |
| 171 | --- a/gcc/config/rs6000/linux64.h |
| 172 | +++ b/gcc/config/rs6000/linux64.h |
| 173 | @@ -420,16 +420,11 @@ extern int dot_symbols; |
| 174 | #undef LINK_OS_DEFAULT_SPEC |
| 175 | #define LINK_OS_DEFAULT_SPEC "%(link_os_linux)" |
| 176 | |
| 177 | -#define GLIBC_DYNAMIC_LINKER32 "%(dynamic_linker_prefix)/lib/ld.so.1" |
| 178 | - |
| 179 | +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld.so.1" |
| 180 | #ifdef LINUX64_DEFAULT_ABI_ELFv2 |
| 181 | -#define GLIBC_DYNAMIC_LINKER64 \ |
| 182 | -"%{mabi=elfv1:%(dynamic_linker_prefix)/lib64/ld64.so.1;" \ |
| 183 | -":%(dynamic_linker_prefix)/lib64/ld64.so.2}" |
| 184 | +#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv1:" SYSTEMLIBS_DIR "ld64.so.1;:" SYSTEMLIBS_DIR "ld64.so.2}" |
| 185 | #else |
| 186 | -#define GLIBC_DYNAMIC_LINKER64 \ |
| 187 | -"%{mabi=elfv2:%(dynamic_linker_prefix)/lib64/ld64.so.2;" \ |
| 188 | -":%(dynamic_linker_prefix)/lib64/ld64.so.1}" |
| 189 | +#define GLIBC_DYNAMIC_LINKER64 "%{mabi=elfv2:" SYSTEMLIBS_DIR "ld64.so.2;:" SYSTEMLIBS_DIR "ld64.so.1}" |
| 190 | #endif |
| 191 | |
| 192 | #define MUSL_DYNAMIC_LINKER32 \ |
| 193 | @@ -437,8 +432,9 @@ extern int dot_symbols; |
| 194 | #define MUSL_DYNAMIC_LINKER64 \ |
| 195 | "/lib/ld-musl-powerpc64" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" |
| 196 | |
| 197 | -#define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" |
| 198 | -#define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" |
| 199 | +#define UCLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-uClibc.so.0" |
| 200 | +#define UCLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld64-uClibc.so.0" |
| 201 | + |
| 202 | #if DEFAULT_LIBC == LIBC_UCLIBC |
| 203 | #define CHOOSE_DYNAMIC_LINKER(G, U, M) \ |
| 204 | "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" |
| 205 | diff --git a/gcc/config/sh/linux.h b/gcc/config/sh/linux.h |
| 206 | index 6d2ccd012ba..ec78a89ce15 100644 |
| 207 | --- a/gcc/config/sh/linux.h |
| 208 | +++ b/gcc/config/sh/linux.h |
| 209 | @@ -64,7 +64,7 @@ along with GCC; see the file COPYING3. If not see |
| 210 | "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E MUSL_DYNAMIC_LINKER_FP \ |
| 211 | "%{mfdpic:-fdpic}.so.1" |
| 212 | |
| 213 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" |
| 214 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" |
| 215 | |
| 216 | #undef SUBTARGET_LINK_EMUL_SUFFIX |
| 217 | #define SUBTARGET_LINK_EMUL_SUFFIX "%{mfdpic:_fd;:_linux}" |
| 218 | diff --git a/gcc/config/sparc/linux.h b/gcc/config/sparc/linux.h |
| 219 | index 9fb03af0fe9..401fddbbb22 100644 |
| 220 | --- a/gcc/config/sparc/linux.h |
| 221 | +++ b/gcc/config/sparc/linux.h |
| 222 | @@ -83,7 +83,7 @@ extern const char *host_detect_local_cpu (int argc, const char **argv); |
| 223 | When the -shared link option is used a final link is not being |
| 224 | done. */ |
| 225 | |
| 226 | -#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" |
| 227 | +#define GLIBC_DYNAMIC_LINKER SYSTEMLIBS_DIR "ld-linux.so.2" |
| 228 | |
| 229 | #undef LINK_SPEC |
| 230 | #define LINK_SPEC "-m elf32_sparc %{shared:-shared} \ |
| 231 | diff --git a/gcc/config/sparc/linux64.h b/gcc/config/sparc/linux64.h |
| 232 | index c1fe42165b7..26a79bfa2e3 100644 |
| 233 | --- a/gcc/config/sparc/linux64.h |
| 234 | +++ b/gcc/config/sparc/linux64.h |
| 235 | @@ -84,8 +84,8 @@ along with GCC; see the file COPYING3. If not see |
| 236 | When the -shared link option is used a final link is not being |
| 237 | done. */ |
| 238 | |
| 239 | -#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" |
| 240 | -#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" |
| 241 | +#define GLIBC_DYNAMIC_LINKER32 SYSTEMLIBS_DIR "ld-linux.so.2" |
| 242 | +#define GLIBC_DYNAMIC_LINKER64 SYSTEMLIBS_DIR "ld-linux.so.2" |
| 243 | |
| 244 | #ifdef SPARC_BI_ARCH |
| 245 | |
| 246 | -- |
| 247 | 2.17.0 |
| 248 | |