Skip to content
Snippets Groups Projects
Commit fe766227 authored by Florian Fainelli's avatar Florian Fainelli
Browse files

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: default avatarFlorian Fainelli <florian@openwrt.org>

SVN-Revision: 35406
parent 8b895d17
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
......@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment