summaryrefslogtreecommitdiff
path: root/toolchain/gcc/patches/4.6-linaro
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-07 18:16:40 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-07 18:16:40 +0000
commite90303c5603c9ade3287c624540cec278298f570 (patch)
treeffeebcd521d9fa5b5963feaea778a773d8206eff /toolchain/gcc/patches/4.6-linaro
parentdaaa8b5e735526b9f98dd2221a00f300a18638ab (diff)
[toolchain] gcc: fix build for MIPS64 targets introduced by musl patch
Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35046 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain/gcc/patches/4.6-linaro')
-rw-r--r--toolchain/gcc/patches/4.6-linaro/200-musl.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/toolchain/gcc/patches/4.6-linaro/200-musl.patch b/toolchain/gcc/patches/4.6-linaro/200-musl.patch
index cee994809c..2604def4a9 100644
--- a/toolchain/gcc/patches/4.6-linaro/200-musl.patch
+++ b/toolchain/gcc/patches/4.6-linaro/200-musl.patch
@@ -229,3 +229,20 @@ diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host
hpux*)
os_include_dir="os/hpux"
;;
+diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
+--- a/gcc/config/mips/linux64.h 2012-11-12 15:28:31.000000000 +0100
++++ b/gcc/config/mips/linux64.h 2012-11-29 15:11:14.006324944 +0100
+@@ -40,9 +40,12 @@
+ #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
+ #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
+ #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
++#define MUSL_DYNAMIC_LINKERN32 "/lib32/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib32/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib64/ld-musl-mips.so.1"
+ #define LINUX_DYNAMIC_LINKERN32 \
+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
+- BIONIC_DYNAMIC_LINKERN32)
++ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)
+
+ #undef LINK_SPEC
+ #define LINK_SPEC "\