941-mips-Add-support-for-mips-r6-musl.patch 1.6 KB

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