205-musl_x86.patch 1.5 KB

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