diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-09-11 17:57:39 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-09-11 17:57:39 +0000 |
| commit | 0fdb4a458b08a802302801915801685b62c16f10 (patch) | |
| tree | d788c39e9a92da680dbf143255260093cfe7a4f0 /toolchain/gcc/patches/5.2.0/205-musl_x86.patch | |
| parent | 5caee877dc2a7e848b2edf68f7f34e9e9163d228 (diff) | |
| download | upstream-0fdb4a458b08a802302801915801685b62c16f10.tar.gz upstream-0fdb4a458b08a802302801915801685b62c16f10.tar.bz2 upstream-0fdb4a458b08a802302801915801685b62c16f10.zip | |
gcc: update gcc 5.x musl patches
This replaces the musl patches for gcc with the versions which are in
gcc trunk.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 46873
Diffstat (limited to 'toolchain/gcc/patches/5.2.0/205-musl_x86.patch')
| -rw-r--r-- | toolchain/gcc/patches/5.2.0/205-musl_x86.patch | 43 |
1 files changed, 6 insertions, 37 deletions
diff --git a/toolchain/gcc/patches/5.2.0/205-musl_x86.patch b/toolchain/gcc/patches/5.2.0/205-musl_x86.patch index a18bdccb10..8772328d64 100644 --- a/toolchain/gcc/patches/5.2.0/205-musl_x86.patch +++ b/toolchain/gcc/patches/5.2.0/205-musl_x86.patch @@ -1,7 +1,9 @@ -From 606b5b76926d42d26c08c7400c38afe07e18e3cd Mon Sep 17 00:00:00 2001 From: ktkachov <ktkachov@138bc75d-0d04-0410-961f-82ee72b054a4> -Date: Fri, 15 May 2015 13:20:01 +0000 -Subject: [PATCH 10/12] [PATCH 9/13] x86 musl support +Date: Fri, 15 May 2015 13:20:01 +0000 (+0000) +Subject: [PATCH 9/13] x86 musl support +X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=5551c8d927c17f60837f15f8dfe46f945ba3fa9c + +[PATCH 9/13] x86 musl support On behalf of Szabolcs Nagy. @@ -11,11 +13,9 @@ On behalf of Szabolcs Nagy. * config/i386/linux64.h (MUSL_DYNAMIC_LINKER32): Define. (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32): Define. + git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223218 138bc75d-0d04-0410-961f-82ee72b054a4 --- - gcc/config/i386/linux.h | 3 +++ - gcc/config/i386/linux64.h | 7 +++++++ - 2 files changed, 10 insertions(+) --- a/gcc/config/i386/linux.h +++ b/gcc/config/i386/linux.h @@ -39,34 +39,3 @@ git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223218 138bc75d-0d04-0410-961f-8 +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" +#undef MUSL_DYNAMIC_LINKERX32 +#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" ---- 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 a - - } // namespace GTM - #endif /* >= GLIBC 2.10 */ -+#endif - - #endif // LIBITM_X86_TLS_H |