diff options
| author | Timo Teräs <timo.teras@iki.fi> | 2015-06-02 08:56:31 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-06-05 13:47:16 +0000 |
| commit | 6e1b72b5cd3e62bb418efaae68bd0f50d7391700 (patch) | |
| tree | 8f802657da946121b31af0df7f917e365afc8a4e /main/gcc/201-libitm.patch | |
| parent | 6dd6cf5392171bfaaf099e04f774373ff9f486d9 (diff) | |
| download | aports-6e1b72b5cd3e62bb418efaae68bd0f50d7391700.tar.bz2 aports-6e1b72b5cd3e62bb418efaae68bd0f50d7391700.tar.xz | |
main/gcc: upgrade to gcc 5.1.0
Diffstat (limited to 'main/gcc/201-libitm.patch')
| -rw-r--r-- | main/gcc/201-libitm.patch | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/main/gcc/201-libitm.patch b/main/gcc/201-libitm.patch new file mode 100644 index 0000000000..78396056bc --- /dev/null +++ b/main/gcc/201-libitm.patch @@ -0,0 +1,46 @@ +diff --git a/libitm/config/arm/hwcap.cc b/libitm/config/arm/hwcap.cc +index a1c2cfd..ea8f023 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 e731ab7..54ad8b6 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 |