buildroot
Public
Source
committed 1960ad837b1From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4>Date: Wed, 22 Apr 2015 14:11:25 +0000 (+0000)Subject: libitm fixes for musl supportX-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=e53a4d49c3d03ab8eaddb073cf972c1c46d75338libitm fixes for musl supportOn behalf of Szabolcs.Nagy@arm.com2015-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.git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222325 138bc75d-0d04-0410-961f-82ee72b054a4---Index: b/libitm/config/arm/hwcap.cc===================================================================--- a/libitm/config/arm/hwcap.cc+++ b/libitm/config/arm/hwcap.cc@@ -40,7 +40,7 @@ #ifdef __linux__ #include <unistd.h>-#include <sys/fcntl.h>+#include <fcntl.h> #include <elf.h> static void __attribute__((constructor))Index: b/libitm/config/linux/x86/tls.h===================================================================--- 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 @@ } // namespace GTM #endif /* >= GLIBC 2.10 */+#endif