gcc: fix build for MIPS64 targets introduced by musl patch

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

SVN-Revision: 35046
v19.07.3_mercusys_ac12_duma
Florian Fainelli 12 years ago
parent 4ec57bdc06
commit 5ae9a4f830

@ -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 "\

@ -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 "\

@ -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 "\

@ -315,3 +315,17 @@ 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-13 12:42:00.000000000 +0100
+++ b/gcc/config/mips/linux64.h 2012-11-29 15:35:10.434361723 +0100
@@ -28,6 +28,9 @@
#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 GNU_USER_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32)
+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)

@ -334,3 +334,17 @@ 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-13 12:42:00.000000000 +0100
+++ n/gcc/config/mips/linux64.h 2012-11-29 15:35:10.434361723 +0100
@@ -28,6 +28,9 @@
#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 GNU_USER_DYNAMIC_LINKERN32 \
CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \
- BIONIC_DYNAMIC_LINKERN32)
+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32)

Loading…
Cancel
Save