diff options
| author | Florian Fainelli <florian@openwrt.org> | 2014-10-24 00:15:58 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2014-10-24 00:15:58 +0000 |
| commit | c70b0ac77b5596ebeb47d4e1ab6e350c54b59a6d (patch) | |
| tree | 23edafd2c0f53382747f73895ed569e1cf113fec | |
| parent | 9fd987781d3d2456b0ddf4bdce669a92895ca573 (diff) | |
| download | upstream-c70b0ac77b5596ebeb47d4e1ab6e350c54b59a6d.tar.gz upstream-c70b0ac77b5596ebeb47d4e1ab6e350c54b59a6d.tar.bz2 upstream-c70b0ac77b5596ebeb47d4e1ab6e350c54b59a6d.zip | |
toolchain: fix mips64 musl linker names
Signed-off-by: Florian Fainelli <florian@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43035 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | toolchain/gcc/patches/4.8-linaro/221-musl_mips64.patch | 22 | ||||
| -rw-r--r-- | toolchain/gcc/patches/4.9-linaro/221-musl_mips64.patch | 22 |
2 files changed, 44 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/4.8-linaro/221-musl_mips64.patch b/toolchain/gcc/patches/4.8-linaro/221-musl_mips64.patch new file mode 100644 index 0000000000..7447dbd307 --- /dev/null +++ b/toolchain/gcc/patches/4.8-linaro/221-musl_mips64.patch @@ -0,0 +1,22 @@ +Index: gcc-linaro-4.8-2014.04/gcc/config/mips/linux64.h +=================================================================== +--- gcc-linaro-4.8-2014.04.orig/gcc/config/mips/linux64.h 2014-10-23 15:52:48.999134219 -0700 ++++ gcc-linaro-4.8-2014.04/gcc/config/mips/linux64.h 2014-10-23 15:59:19.815116979 -0700 +@@ -27,6 +27,16 @@ + #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" ++ ++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ ++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" ++#endif ++ ++#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" + #define GNU_USER_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +- BIONIC_DYNAMIC_LINKERN32) ++ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) diff --git a/toolchain/gcc/patches/4.9-linaro/221-musl_mips64.patch b/toolchain/gcc/patches/4.9-linaro/221-musl_mips64.patch new file mode 100644 index 0000000000..7447dbd307 --- /dev/null +++ b/toolchain/gcc/patches/4.9-linaro/221-musl_mips64.patch @@ -0,0 +1,22 @@ +Index: gcc-linaro-4.8-2014.04/gcc/config/mips/linux64.h +=================================================================== +--- gcc-linaro-4.8-2014.04.orig/gcc/config/mips/linux64.h 2014-10-23 15:52:48.999134219 -0700 ++++ gcc-linaro-4.8-2014.04/gcc/config/mips/linux64.h 2014-10-23 15:59:19.815116979 -0700 +@@ -27,6 +27,16 @@ + #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" + #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" + #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" ++ ++#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ ++#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" ++#else ++#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" ++#endif ++ ++#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" ++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" ++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" + #define GNU_USER_DYNAMIC_LINKERN32 \ + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ +- BIONIC_DYNAMIC_LINKERN32) ++ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) |