toolchain/gcc/patches/4.9-linaro/205-musl_x86.patch

   1 --- a/gcc/config/i386/linux.h
   2 +++ b/gcc/config/i386/linux.h
   3 @@ -21,3 +21,4 @@ along with GCC; see the file COPYING3.
   4
   5  #define GNU_USER_LINK_EMULATION "elf_i386"
   6  #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2"
   7 +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1"
   8 --- a/gcc/config/i386/linux64.h
   9 +++ b/gcc/config/i386/linux64.h
  10 @@ -30,3 +30,7 @@ see the files COPYING3 and COPYING.RUNTI
  11  #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
  12  #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
  13  #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
  14 +
  15 +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1"
  16 +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1"
  17 +#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1"
  18 --- a/libitm/config/linux/x86/tls.h
  19 +++ b/libitm/config/linux/x86/tls.h
  20 @@ -25,16 +25,19 @@
  21  #ifndef LIBITM_X86_TLS_H
  22  #define LIBITM_X86_TLS_H 1
  23
  24 -#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
  25 +#if defined(__GLIBC_PREREQ)
  26 +#if __GLIBC_PREREQ(2, 10)
  27  /* Use slots in the TCB head rather than __thread lookups.
  28     GLIBC has reserved words 10 through 13 for TM.  */
  29  #define HAVE_ARCH_GTM_THREAD 1
  30  #define HAVE_ARCH_GTM_THREAD_DISP 1
  31  #endif
  32 +#endif
  33
  34  #include "config/generic/tls.h"
  35
  36 -#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
  37 +#if defined(__GLIBC_PREREQ)
  38 +#if __GLIBC_PREREQ(2, 10)
  39  namespace GTM HIDDEN {
  40
  41  #ifdef __x86_64__
  42 @@ -101,5 +104,6 @@ static inline void set_abi_disp(struct a
  43
  44  } // namespace GTM
  45  #endif /* >= GLIBC 2.10 */
  46 +#endif
  47
  48  #endif // LIBITM_X86_TLS_H