diff options
| author | Alexey Neyman <stilor@att.net> | 2017-10-23 16:04:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-23 16:04:03 -0700 |
| commit | aec73d9cb8cb113c1726df0e24e3d2f46fa1350b (patch) | |
| tree | 021618d4d519d6ab2cc5e2909fd2a530397b2c44 /packages/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch | |
| parent | 6a8eb24df62ed45e175c10212b529134d3b7405e (diff) | |
| parent | 8e5de7fcbf123c52fe74666396cebbd21a9d34aa (diff) | |
| download | crosstool-ng-aec73d9cb8cb113c1726df0e24e3d2f46fa1350b.tar.gz crosstool-ng-aec73d9cb8cb113c1726df0e24e3d2f46fa1350b.tar.bz2 crosstool-ng-aec73d9cb8cb113c1726df0e24e3d2f46fa1350b.zip | |
Merge pull request #850 from stilor/upgrades
Upgrades: gcc 5.5, gdb 8.0.1, musl 1.1.17, Linux
Diffstat (limited to 'packages/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch')
| -rw-r--r-- | packages/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/packages/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch b/packages/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch new file mode 100644 index 00000000..fdf4ee72 --- /dev/null +++ b/packages/gcc/5.5.0/900-libitm-fixes-for-musl-support.patch @@ -0,0 +1,65 @@ +From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> +Date: Wed, 22 Apr 2015 14:11:25 +0000 (+0000) +Subject: libitm fixes for musl support +X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=e53a4d49c3d03ab8eaddb073cf972c1c46d75338 + +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. + + + +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 + + #endif // LIBITM_X86_TLS_H |