49 lines
1.5 KiB
Diff
49 lines
1.5 KiB
Diff
|
--- a/gcc/config/i386/linux.h
|
||
|
|
+++ b/gcc/config/i386/linux.h
|
||
|
|
@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3.
|
||
|
|
|
||
|
|
#define GNU_USER_LINK_EMULATION "elf_i386"
|
||
|
|
#define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
|
||
|
|
+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
|
||
|
|
--- a/gcc/config/i386/linux64.h
|
||
|
|
+++ b/gcc/config/i386/linux64.h
|
||
|
|
@@ -30,3 +30,7 @@ see the files COPYING3 and COPYING.RUNTI
|
||
|
|
#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"
|
||
|
|
+
|
||
|
|
+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
|
||
|
|
+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
|
||
|
|
+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
|
||
|
|
--- a/libitm/config/linux/x86/tls.h
|
||
|
|
+++ b/libitm/config/linux/x86/tls.h
|
||
|
|
@@ -25,16 +25,19 @@
|
||
|
|
#ifndef LIBITM_X86_TLS_H
|
||
|
|
#define LIBITM_X86_TLS_H 1
|
||
|
|
|
||
|
|
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
|
||
|
|
+#if defined(__GLIBC_PREREQ)
|
||
|
|
+#if __GLIBC_PREREQ(2, 10)
|
||
|
|
/* Use slots in the TCB head rather than __thread lookups.
|
||
|
|
GLIBC has reserved words 10 through 13 for TM. */
|
||
|
|
#define HAVE_ARCH_GTM_THREAD 1
|
||
|
|
#define HAVE_ARCH_GTM_THREAD_DISP 1
|
||
|
|
#endif
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#include "config/generic/tls.h"
|
||
|
|
|
||
|
|
-#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
|
||
|
|
+#if defined(__GLIBC_PREREQ)
|
||
|
|
+#if __GLIBC_PREREQ(2, 10)
|
||
|
|
namespace GTM HIDDEN {
|
||
|
|
|
||
|
|
#ifdef __x86_64__
|
||
|
|
@@ -101,5 +104,6 @@ static inline void set_abi_disp(struct a
|
||
|
|
|
||
|
|
} // namespace GTM
|
||
|
|
#endif /* >= GLIBC 2.10 */
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
#endif // LIBITM_X86_TLS_H
|