From 83717065090bb8b954556d1216dd9dc397dc0243 Mon Sep 17 00:00:00 2001 From: nsz Date: Thu, 25 Aug 2016 14:13:02 +0000 Subject: [PATCH] [mips] Add support for mips*r6-*-musl gcc/ * config/mips/linux.h (MUSL_DYNAMIC_LINKER32): Update. (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERN32): Update. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239760 138bc75d-0d04-0410-961f-82ee72b054a4 [Vincent: tweak to not patch ChangeLog] Signed-off-by: Vicente Olivert Riera --- gcc/config/mips/linux.h | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h index fa253b6..dc51c45 100644 --- a/gcc/config/mips/linux.h +++ b/gcc/config/mips/linux.h @@ -38,10 +38,13 @@ along with GCC; see the file COPYING3. If not see "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" #undef MUSL_DYNAMIC_LINKER32 -#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1" +#define MUSL_DYNAMIC_LINKER32 \ + "/lib/ld-musl-mips%{mips32r6|mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" #undef MUSL_DYNAMIC_LINKER64 -#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1" -#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1" +#define MUSL_DYNAMIC_LINKER64 \ + "/lib/ld-musl-mips64%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" +#define MUSL_DYNAMIC_LINKERN32 \ + "/lib/ld-musl-mipsn32%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" #define GNU_USER_DYNAMIC_LINKERN32 \ -- 2.10.0