aboutsummaryrefslogtreecommitdiffstats
path: root/toolchain
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2013-01-29 23:05:46 +0000
committerFlorian Fainelli <florian@openwrt.org>2013-01-29 23:05:46 +0000
commitb9da555e2072d67264a2bd120594f19900d6d8f4 (patch)
tree695c39219170c73b6af3c7a147ce3f816ba1ec9d /toolchain
parent07714a8422d1dd155849d14f6f9e22df0650419b (diff)
downloadmaster-187ad058-b9da555e2072d67264a2bd120594f19900d6d8f4.tar.gz
master-187ad058-b9da555e2072d67264a2bd120594f19900d6d8f4.tar.bz2
master-187ad058-b9da555e2072d67264a2bd120594f19900d6d8f4.zip
toolchain/gcc: fix the mips64 linker path to be more musl conforming
musl libc does not use /lib32 or /lib64 directories, just /lib Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35406 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/gcc/patches/4.6-linaro/200-musl.patch6
-rw-r--r--toolchain/gcc/patches/4.6.2/200-musl.patch6
-rw-r--r--toolchain/gcc/patches/4.6.3/200-musl.patch6
-rw-r--r--toolchain/gcc/patches/4.7-linaro/200-musl.patch6
-rw-r--r--toolchain/gcc/patches/4.7.2/200-musl.patch6
5 files changed, 15 insertions, 15 deletions
diff --git a/toolchain/gcc/patches/4.6-linaro/200-musl.patch b/toolchain/gcc/patches/4.6-linaro/200-musl.patch
index 2604def4a9..86a225cf97 100644
--- a/toolchain/gcc/patches/4.6-linaro/200-musl.patch
+++ b/toolchain/gcc/patches/4.6-linaro/200-musl.patch
@@ -236,9 +236,9 @@ diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
#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 MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
#define LINUX_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32)
diff --git a/toolchain/gcc/patches/4.6.2/200-musl.patch b/toolchain/gcc/patches/4.6.2/200-musl.patch
index 2604def4a9..86a225cf97 100644
--- a/toolchain/gcc/patches/4.6.2/200-musl.patch
+++ b/toolchain/gcc/patches/4.6.2/200-musl.patch
@@ -236,9 +236,9 @@ diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
#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 MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
#define LINUX_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32)
diff --git a/toolchain/gcc/patches/4.6.3/200-musl.patch b/toolchain/gcc/patches/4.6.3/200-musl.patch
index 2604def4a9..86a225cf97 100644
--- a/toolchain/gcc/patches/4.6.3/200-musl.patch
+++ b/toolchain/gcc/patches/4.6.3/200-musl.patch
@@ -236,9 +236,9 @@ diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
#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 MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
#define LINUX_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32)
diff --git a/toolchain/gcc/patches/4.7-linaro/200-musl.patch b/toolchain/gcc/patches/4.7-linaro/200-musl.patch
index 491f8c85f3..55c6fd1495 100644
--- a/toolchain/gcc/patches/4.7-linaro/200-musl.patch
+++ b/toolchain/gcc/patches/4.7-linaro/200-musl.patch
@@ -322,9 +322,9 @@ diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
#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 MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
#define GNU_USER_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32)
diff --git a/toolchain/gcc/patches/4.7.2/200-musl.patch b/toolchain/gcc/patches/4.7.2/200-musl.patch
index df34a09cce..40348ac647 100644
--- a/toolchain/gcc/patches/4.7.2/200-musl.patch
+++ b/toolchain/gcc/patches/4.7.2/200-musl.patch
@@ -341,9 +341,9 @@ diff --git a/gcc/config/mips/linux64.h b/gcc/config/mips/linux64.h
#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 MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
++#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
#define GNU_USER_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32)