| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172 |
- From 606b5b76926d42d26c08c7400c38afe07e18e3cd Mon Sep 17 00:00:00 2001
- From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
- Date: Fri, 15 May 2015 13:20:01 +0000
- Subject: [PATCH 10/12] [PATCH 9/13] x86 musl support
- On behalf of Szabolcs Nagy.
- 2015-05-15 Gregor Richards <[email protected]>
- * config/i386/linux.h (MUSL_DYNAMIC_LINKER): Define.
- * config/i386/linux64.h (MUSL_DYNAMIC_LINKER32): Define.
- (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32): Define.
- git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223218 138bc75d-0d04-0410-961f-82ee72b054a4
- ---
- gcc/config/i386/linux.h | 3 +++
- gcc/config/i386/linux64.h | 7 +++++++
- 2 files changed, 10 insertions(+)
- --- a/gcc/config/i386/linux.h
- +++ b/gcc/config/i386/linux.h
- @@ -21,3 +21,6 @@ along with GCC; see the file COPYING3.
-
- #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"
- --- a/gcc/config/i386/linux64.h
- +++ b/gcc/config/i386/linux64.h
- @@ -30,3 +30,10 @@ 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"
- +
- +#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"
- --- 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
|
