git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Gregor Richards 2015-04-22 14:11:25 +00:00 committed by Kyrylo Tkachov
parent 04934297b8
commit 96ce40cbce
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libitm/ChangeLog
View File

@ -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

2
libitm/config/arm/hwcap.cc
View File

@ -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))

8
libitm/config/linux/x86/tls.h
View File

@ -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