From 96ce40cbce449cb5f434425d148a9bcf02270c96 Mon Sep 17 00:00:00 2001 From: Gregor Richards Date: Wed, 22 Apr 2015 14:11:25 +0000 Subject: [PATCH] libitm fixes for musl support On behalf of Szabolcs.Nagy@arm.com 2015-04-22 Gregor Richards * config/arm/hwcap.cc: Use fcntl.h instead of sys/fcntl.h. * config/linux/x86/tls.h: Only use __GLIBC_PREREQ if defined. From-SVN: r222325 --- libitm/ChangeLog | 5 +++++ libitm/config/arm/hwcap.cc | 2 +- libitm/config/linux/x86/tls.h | 8 ++++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/libitm/ChangeLog b/libitm/ChangeLog index e46819cf3af..78b2de05f6d 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,8 @@ +2015-04-22 Gregor Richards + + * config/arm/hwcap.cc: Use fcntl.h instead of sys/fcntl.h. + * config/linux/x86/tls.h: Only use __GLIBC_PREREQ if defined. + 2015-01-15 H.J. Lu PR libitm/64360 diff --git a/libitm/config/arm/hwcap.cc b/libitm/config/arm/hwcap.cc index a1c2cfd41f7..ea8f023c93b 100644 --- a/libitm/config/arm/hwcap.cc +++ b/libitm/config/arm/hwcap.cc @@ -40,7 +40,7 @@ int GTM_hwcap HIDDEN = 0 #ifdef __linux__ #include -#include +#include #include static void __attribute__((constructor)) diff --git a/libitm/config/linux/x86/tls.h b/libitm/config/linux/x86/tls.h index e731ab7e015..54ad8b67bb5 100644 --- 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 abi_dispatch *x) } // namespace GTM #endif /* >= GLIBC 2.10 */ +#endif #endif // LIBITM_X86_TLS_H -- 2.30.2