KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

toolchain/gcc: fix the mips64 linker path to be more musl conforming

Browse source 
musl libc does not use /lib32 or /lib64 directories, just /lib

Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 35406
This commit is contained in:
Florian Fainelli 2013-01-29 23:05:46 +00:00
parent 8b895d1703
commit fe766227a2
5 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
toolchain/gcc/patches/4.6-linaro/200-musl.patch
View file

@ -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 GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
+#define MUSL_DYNAMIC_LINKERN32 "/lib32/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
+#define MUSL_DYNAMIC_LINKER32 "/lib32/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
+#define MUSL_DYNAMIC_LINKER64 "/lib64/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
#define LINUX_DYNAMIC_LINKERN32 \ #define LINUX_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32) - BIONIC_DYNAMIC_LINKERN32)

6
toolchain/gcc/patches/4.6.2/200-musl.patch
View file

@ -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 GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
+#define MUSL_DYNAMIC_LINKERN32 "/lib32/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
+#define MUSL_DYNAMIC_LINKER32 "/lib32/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
+#define MUSL_DYNAMIC_LINKER64 "/lib64/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
#define LINUX_DYNAMIC_LINKERN32 \ #define LINUX_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32) - BIONIC_DYNAMIC_LINKERN32)

6
toolchain/gcc/patches/4.6.3/200-musl.patch
View file

@ -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 GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
+#define MUSL_DYNAMIC_LINKERN32 "/lib32/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
+#define MUSL_DYNAMIC_LINKER32 "/lib32/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
+#define MUSL_DYNAMIC_LINKER64 "/lib64/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
#define LINUX_DYNAMIC_LINKERN32 \ #define LINUX_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32) - BIONIC_DYNAMIC_LINKERN32)

6
toolchain/gcc/patches/4.7-linaro/200-musl.patch
View file

@ -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 GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
+#define MUSL_DYNAMIC_LINKERN32 "/lib32/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
+#define MUSL_DYNAMIC_LINKER32 "/lib32/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
+#define MUSL_DYNAMIC_LINKER64 "/lib64/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
#define GNU_USER_DYNAMIC_LINKERN32 \ #define GNU_USER_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32) - BIONIC_DYNAMIC_LINKERN32)

6
toolchain/gcc/patches/4.7.2/200-musl.patch
View file

@ -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 GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1"
#define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0"
#define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32"
+#define MUSL_DYNAMIC_LINKERN32 "/lib32/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1"
+#define MUSL_DYNAMIC_LINKER32 "/lib32/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1"
+#define MUSL_DYNAMIC_LINKER64 "/lib64/ld-musl-mips.so.1" +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1"
#define GNU_USER_DYNAMIC_LINKERN32 \ #define GNU_USER_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32) - BIONIC_DYNAMIC_LINKERN32)