| Message ID | 1423233944-1722-1-git-send-email-thomas.petazzoni@free-electrons.com |
|---|---|
| State | Accepted |
| Commit | 3398f29da053a972b074c4e70a869853071dcca5 |
| Headers | show |
Dear Thomas Petazzoni, Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Tested-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> I did a build test for MIPS and I confirm this patch fixes the problem. $ file output/target/usr/bin/mono-sgen output/target/usr/bin/mono-sgen: ELF 32-bit MSB executable, MIPS, MIPS32 rel2 version 1 (SYSV), dynamically linked (uses shared libs), for GNU/Linux 2.6.32, with unknown capability 0x41000000 = 0xf676e75, with unknown capability 0x10000 = 0x70403, stripped Thanks. -- Vincent
Hello, On Fri, 6 Feb 2015 15:45:44 +0100, Thomas Petazzoni wrote: > Since the bump to version 3.12 of Mono, it fails to build on MIPS. The > patch added by this commit fixes this build failure, simply caused by > a missing include. > > Fixes: > > http://autobuild.buildroot.org/results/6f5/6f5e20a4a99eb0db650430bf6285c844fd940711/ > > Submitted upstream at https://github.com/mono/mono/pull/1550. The patch has been merged upstream. Thomas
Hi Thomas, Thank you very much for solving this, I had no time to look at the issue. A really big thanks! Sincerely, Angelo 2015-02-06 16:21 GMT+01:00 Thomas Petazzoni <thomas.petazzoni@free-electrons.com>: > Hello, > > On Fri, 6 Feb 2015 15:45:44 +0100, Thomas Petazzoni wrote: >> Since the bump to version 3.12 of Mono, it fails to build on MIPS. The >> patch added by this commit fixes this build failure, simply caused by >> a missing include. >> >> Fixes: >> >> http://autobuild.buildroot.org/results/6f5/6f5e20a4a99eb0db650430bf6285c844fd940711/ >> >> Submitted upstream at https://github.com/mono/mono/pull/1550. > > The patch has been merged upstream. > > Thomas > -- > Thomas Petazzoni, CTO, Free Electrons > Embedded Linux, Kernel and Android engineering > http://free-electrons.com > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@free-electrons.com> writes: > Since the bump to version 3.12 of Mono, it fails to build on MIPS. The > patch added by this commit fixes this build failure, simply caused by > a missing include. > Fixes: > http://autobuild.buildroot.org/results/6f5/6f5e20a4a99eb0db650430bf6285c844fd940711/ > Submitted upstream at https://github.com/mono/mono/pull/1550. > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Committed, thanks.
diff --git a/package/mono/0003-mono-context.h-fix-build-on-MIPS.patch b/package/mono/0003-mono-context.h-fix-build-on-MIPS.patch new file mode 100644 index 0000000..dab22ce --- /dev/null +++ b/package/mono/0003-mono-context.h-fix-build-on-MIPS.patch @@ -0,0 +1,33 @@ +From 8f489c24e1770c2852efcaff9419d54bfadf0854 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Fri, 6 Feb 2015 14:56:10 +0100 +Subject: [PATCH] mono-context.h: fix build on MIPS + +The mono-context.h file uses definitions such as mips_fp and mips_sp, +which are defined in <mono/arch/mips/mips-codegen.h>, but this file is +not included, leading to build failures. + +This fix is similar to 4437ecea91bab3fe68ba1c30521acf75052662cd (for +ARM). + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +--- + mono/utils/mono-context.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/mono/utils/mono-context.h b/mono/utils/mono-context.h +index d96eb75..ad56e2c 100755 +--- a/mono/utils/mono-context.h ++++ b/mono/utils/mono-context.h +@@ -464,6 +464,8 @@ mono_ia64_context_get_fp (MonoContext *ctx) + + #elif ((defined(__mips__) && !defined(MONO_CROSS_COMPILE)) || (defined(TARGET_MIPS))) && SIZEOF_REGISTER == 4 /* defined(__ia64__) */ + ++#include <mono/arch/mips/mips-codegen.h> ++ + typedef struct { + mgreg_t sc_pc; + mgreg_t sc_regs [32]; +-- +2.1.0 +
Since the bump to version 3.12 of Mono, it fails to build on MIPS. The patch added by this commit fixes this build failure, simply caused by a missing include. Fixes: http://autobuild.buildroot.org/results/6f5/6f5e20a4a99eb0db650430bf6285c844fd940711/ Submitted upstream at https://github.com/mono/mono/pull/1550. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- .../0003-mono-context.h-fix-build-on-MIPS.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/mono/0003-mono-context.h-fix-build-on-MIPS.patch