* [Buildroot] [PATCH 1/2] gcc: add support for MIPS R6 Musl
@ 2016-10-15 13:36 Vicente Olivert Riera
2016-10-15 13:36 ` [Buildroot] [PATCH 2/2] toolchain-buildroot: enable Musl for MIPS R6 Vicente Olivert Riera
2016-10-15 14:38 ` [Buildroot] [PATCH 1/2] gcc: add support for MIPS R6 Musl Peter Korsgaard
0 siblings, 2 replies; 4+ messages in thread
From: Vicente Olivert Riera @ 2016-10-15 13:36 UTC (permalink / raw)
To: buildroot
Backport upstream patch to add support for MIPS R6 Musl:
https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=83717065090bb8b954556d1216dd9dc397dc0243
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
.../941-mips-Add-support-for-mips-r6-musl.patch | 43 ++++++++++++++++++++++
.../941-mips-Add-support-for-mips-r6-musl.patch | 43 ++++++++++++++++++++++
2 files changed, 86 insertions(+)
create mode 100644 package/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch
create mode 100644 package/gcc/6.2.0/941-mips-Add-support-for-mips-r6-musl.patch
diff --git a/package/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch b/package/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch
new file mode 100644
index 0000000..337d376
--- /dev/null
+++ b/package/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch
@@ -0,0 +1,43 @@
+From 83717065090bb8b954556d1216dd9dc397dc0243 Mon Sep 17 00:00:00 2001
+From: nsz <nsz@138bc75d-0d04-0410-961f-82ee72b054a4>
+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 at 239760 138bc75d-0d04-0410-961f-82ee72b054a4
+
+[Vincent: tweak to not patch ChangeLog]
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+---
+ 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
+
diff --git a/package/gcc/6.2.0/941-mips-Add-support-for-mips-r6-musl.patch b/package/gcc/6.2.0/941-mips-Add-support-for-mips-r6-musl.patch
new file mode 100644
index 0000000..337d376
--- /dev/null
+++ b/package/gcc/6.2.0/941-mips-Add-support-for-mips-r6-musl.patch
@@ -0,0 +1,43 @@
+From 83717065090bb8b954556d1216dd9dc397dc0243 Mon Sep 17 00:00:00 2001
+From: nsz <nsz@138bc75d-0d04-0410-961f-82ee72b054a4>
+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 at 239760 138bc75d-0d04-0410-961f-82ee72b054a4
+
+[Vincent: tweak to not patch ChangeLog]
+
+Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
+---
+ 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
+
--
2.10.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] toolchain-buildroot: enable Musl for MIPS R6
2016-10-15 13:36 [Buildroot] [PATCH 1/2] gcc: add support for MIPS R6 Musl Vicente Olivert Riera
@ 2016-10-15 13:36 ` Vicente Olivert Riera
2016-10-15 14:38 ` Peter Korsgaard
2016-10-15 14:38 ` [Buildroot] [PATCH 1/2] gcc: add support for MIPS R6 Musl Peter Korsgaard
1 sibling, 1 reply; 4+ messages in thread
From: Vicente Olivert Riera @ 2016-10-15 13:36 UTC (permalink / raw)
To: buildroot
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
---
toolchain/toolchain-buildroot/Config.in | 2 --
1 file changed, 2 deletions(-)
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 310572e..c89e181 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -73,8 +73,6 @@ config BR2_TOOLCHAIN_BUILDROOT_MUSL
BR2_mips64el || BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \
BR2_sh || BR2_x86_64
depends on !BR2_powerpc_SPE # not supported, build breaks
- # Unsupported for MIPS R6
- depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6
# sh2 nommu is supported by musl, but we don't have support
# for it in Buildroot.
depends on BR2_USE_MMU
--
2.10.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/2] gcc: add support for MIPS R6 Musl
2016-10-15 13:36 [Buildroot] [PATCH 1/2] gcc: add support for MIPS R6 Musl Vicente Olivert Riera
2016-10-15 13:36 ` [Buildroot] [PATCH 2/2] toolchain-buildroot: enable Musl for MIPS R6 Vicente Olivert Riera
@ 2016-10-15 14:38 ` Peter Korsgaard
1 sibling, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2016-10-15 14:38 UTC (permalink / raw)
To: buildroot
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
> Backport upstream patch to add support for MIPS R6 Musl:
> https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=83717065090bb8b954556d1216dd9dc397dc0243
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 2/2] toolchain-buildroot: enable Musl for MIPS R6
2016-10-15 13:36 ` [Buildroot] [PATCH 2/2] toolchain-buildroot: enable Musl for MIPS R6 Vicente Olivert Riera
@ 2016-10-15 14:38 ` Peter Korsgaard
0 siblings, 0 replies; 4+ messages in thread
From: Peter Korsgaard @ 2016-10-15 14:38 UTC (permalink / raw)
To: buildroot
>>>>> "Vicente" == Vicente Olivert Riera <Vincent.Riera@imgtec.com> writes:
> Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Committed, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-10-15 14:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-15 13:36 [Buildroot] [PATCH 1/2] gcc: add support for MIPS R6 Musl Vicente Olivert Riera
2016-10-15 13:36 ` [Buildroot] [PATCH 2/2] toolchain-buildroot: enable Musl for MIPS R6 Vicente Olivert Riera
2016-10-15 14:38 ` Peter Korsgaard
2016-10-15 14:38 ` [Buildroot] [PATCH 1/2] gcc: add support for MIPS R6 Musl Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox