logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

0001-libitm-fixes-for-musl-support.patch (1606B)

    

  1. SPDX-FileCopyrightText: 2022 Dor Askayo <dor.askayo@gmail.com>
  2. SPDX-FileCopyrightText: 2015 Gregor Richards <gregor.richards@uwaterloo.ca>
  4. SPDX-License-Identifier: GPL-2.0-or-later
  6. Backported from upstream commit 96ce40cbce449cb5f434425d148a9bcf02270c96
  8. libitm fixes for musl support
  10. 2015-04-22  Gregor Richards  <gregor.richards@uwaterloo.ca>
  12.        * config/arm/hwcap.cc: Use fcntl.h instead of sys/fcntl.h.
  13.        * config/linux/x86/tls.h: Only use __GLIBC_PREREQ if defined.
  15. From-SVN: r222325
  17. --- gcc-4.7.4/libitm/config/arm/hwcap.cc
  18. +++ gcc-4.7.4/libitm/config/arm/hwcap.cc
  19. @@ -40,7 +40,7 @@ int GTM_hwcap HIDDEN = 0
  20.  
  21.  #ifdef __linux__
  22.  #include <unistd.h>
  23. -#include <sys/fcntl.h>
  24. +#include <fcntl.h>
  25.  #include <elf.h>
  26.  
  27.  static void __attribute__((constructor))
  28. --- gcc-4.7.4/libitm/config/linux/x86/tls.h
  29. +++ gcc-4.7.4/libitm/config/linux/x86/tls.h
  30. @@ -25,16 +25,19 @@
  31.  #ifndef LIBITM_X86_TLS_H
  32.  #define LIBITM_X86_TLS_H 1
  33.  
  34. -#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
  35. +#if defined(__GLIBC_PREREQ)
  36. +#if __GLIBC_PREREQ(2, 10)
  37.  /* Use slots in the TCB head rather than __thread lookups.
  38.     GLIBC has reserved words 10 through 13 for TM.  */
  39.  #define HAVE_ARCH_GTM_THREAD 1
  40.  #define HAVE_ARCH_GTM_THREAD_DISP 1
  41.  #endif
  42. +#endif
  43.  
  44.  #include "config/generic/tls.h"
  45.  
  46. -#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
  47. +#if defined(__GLIBC_PREREQ)
  48. +#if __GLIBC_PREREQ(2, 10)
  49.  namespace GTM HIDDEN {
  50.  
  51.  #ifdef __x86_64__
  52. @@ -101,5 +104,6 @@ static inline void set_abi_disp(struct abi_dispatch *x)
  53.  
  54.  } // namespace GTM
  55.  #endif /* >= GLIBC 2.10 */
  56. +#endif
  57.  
  58.  #endif // LIBITM_X86_TLS_H