diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-10-19 21:45:36 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-10-19 21:45:36 +0000 |
| commit | 1f854974239a8f5b42e19c23a1a7e72b55ff81b5 (patch) | |
| tree | 5c48838628ac099907cfcb0a17d6a68561c903d6 /toolchain/gcc/patches/4.9-linaro/205-musl_x86.patch | |
| parent | 69c1568779e2b960230ab246d35466b353f7f764 (diff) | |
| download | upstream-1f854974239a8f5b42e19c23a1a7e72b55ff81b5.tar.gz upstream-1f854974239a8f5b42e19c23a1a7e72b55ff81b5.tar.bz2 upstream-1f854974239a8f5b42e19c23a1a7e72b55ff81b5.zip | |
gcc: update, split and rework 4.9 musl patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 42970
Diffstat (limited to 'toolchain/gcc/patches/4.9-linaro/205-musl_x86.patch')
| -rw-r--r-- | toolchain/gcc/patches/4.9-linaro/205-musl_x86.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/4.9-linaro/205-musl_x86.patch b/toolchain/gcc/patches/4.9-linaro/205-musl_x86.patch new file mode 100644 index 0000000000..9a25113319 --- /dev/null +++ b/toolchain/gcc/patches/4.9-linaro/205-musl_x86.patch @@ -0,0 +1,48 @@ +--- a/gcc/config/i386/linux.h ++++ b/gcc/config/i386/linux.h +@@ -21,3 +21,4 @@ along with GCC; see the file COPYING3. + + #define GNU_USER_LINK_EMULATION "elf_i386" + #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" ++#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" +--- a/gcc/config/i386/linux64.h ++++ b/gcc/config/i386/linux64.h +@@ -30,3 +30,7 @@ see the files COPYING3 and COPYING.RUNTI + #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" + #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" + #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" ++ ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" ++#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 |