package/gcc/5.4.0/900-libitm-fixes-for-musl-support.patch

   1 From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>
   2 Date: Wed, 22 Apr 2015 14:11:25 +0000 (+0000)
   3 Subject: libitm fixes for musl support
   4 X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=e53a4d49c3d03ab8eaddb073cf972c1c46d75338
   5
   6 libitm fixes for musl support
   7
   8 On behalf of Szabolcs.Nagy@arm.com
   9
  10 2015-04-22  Gregor Richards  <gregor.richards@uwaterloo.ca>
  11
  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.
  14
  15
  16
  17 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222325 138bc75d-0d04-0410-961f-82ee72b054a4
  18 ---
  19
  20 Index: b/libitm/config/arm/hwcap.cc
  21 ===================================================================
  22 --- a/libitm/config/arm/hwcap.cc
  23 +++ b/libitm/config/arm/hwcap.cc
  24 @@ -40,7 +40,7 @@
  25
  26  #ifdef __linux__
  27  #include <unistd.h>
  28 -#include <sys/fcntl.h>
  29 +#include <fcntl.h>
  30  #include <elf.h>
  31
  32  static void __attribute__((constructor))
  33 Index: b/libitm/config/linux/x86/tls.h
  34 ===================================================================
  35 --- a/libitm/config/linux/x86/tls.h
  36 +++ b/libitm/config/linux/x86/tls.h
  37 @@ -25,16 +25,19 @@
  38  #ifndef LIBITM_X86_TLS_H
  39  #define LIBITM_X86_TLS_H 1
  40
  41 -#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
  42 +#if defined(__GLIBC_PREREQ)
  43 +#if __GLIBC_PREREQ(2, 10)
  44  /* Use slots in the TCB head rather than __thread lookups.
  45     GLIBC has reserved words 10 through 13 for TM.  */
  46  #define HAVE_ARCH_GTM_THREAD 1
  47  #define HAVE_ARCH_GTM_THREAD_DISP 1
  48  #endif
  49 +#endif
  50
  51  #include "config/generic/tls.h"
  52
  53 -#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10)
  54 +#if defined(__GLIBC_PREREQ)
  55 +#if __GLIBC_PREREQ(2, 10)
  56  namespace GTM HIDDEN {
  57
  58  #ifdef __x86_64__
  59 @@ -101,5 +104,6 @@
  60
  61  } // namespace GTM
  62  #endif /* >= GLIBC 2.10 */
  63 +#endif
  64
  65  #endif // LIBITM_X86_TLS_H