summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Richards <gregor.richards@uwaterloo.ca>2015-04-22 14:11:25 +0000
committerKyrylo Tkachov <ktkachov@gcc.gnu.org>2015-04-22 14:11:25 +0000
commit96ce40cbce449cb5f434425d148a9bcf02270c96 (patch)
tree96d201371102f590af8100ee8b32f2f9bda608e7
parent04934297b8b00232358a54205a53f55f9e292c89 (diff)
downloadgcc-96ce40cbce449cb5f434425d148a9bcf02270c96.tar.gz
libitm fixes for musl support
On behalf of Szabolcs.Nagy@arm.com 2015-04-22 Gregor Richards <gregor.richards@uwaterloo.ca> * 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
-rw-r--r--libitm/ChangeLog5
-rw-r--r--libitm/config/arm/hwcap.cc2
-rw-r--r--libitm/config/linux/x86/tls.h8
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 <gregor.richards@uwaterloo.ca>
+
+ * 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 <hongjiu.lu@intel.com>
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 <unistd.h>
-#include <sys/fcntl.h>
+#include <fcntl.h>
#include <elf.h>
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