| Message ID | 553E4D2C.80400@arm.com |
|---|---|
| State | New |
| Headers | show |
On 27/04/15 15:52, Szabolcs Nagy wrote: > On 20/04/15 19:57, Szabolcs Nagy wrote: >> Set up dynamic linker name for x86. >> > Patch v2. > > (undef MUSL_DYNAMIC_LINKER* before defining it). ping (now with maintainers in cc) > gcc/Changelog: > > 2015-04-27 Gregor Richards <gregor.richards@uwaterloo.ca> > > * config/i386/linux.h (MUSL_DYNAMIC_LINKER): Define. > * config/i386/linux64.h (MUSL_DYNAMIC_LINKER32): Define. > (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32): Define. >
diff --git a/gcc/config/i386/linux.h b/gcc/config/i386/linux.h index a100963..9c47fcb 100644 --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h @@ -21,3 +21,5 @@ along with GCC; see the file COPYING3. If not see #define GNU_USER_LINK_EMULATION "elf_i386" #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" +#undef MUSL_DYNAMIC_LINKER +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h index a27d3be..e300480 100644 --- a/gcc/config/i386/linux64.h +++ b/gcc/config/i386/linux64.h @@ -30,3 +30,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" + +#undef MUSL_DYNAMIC_LINKER32 +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" +#undef MUSL_DYNAMIC_LINKER64 +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" +#undef MUSL_DYNAMIC_LINKERX32 +#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"