summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikhail Pukhlikov <cynede@gentoo.org>2017-12-20 14:48:33 +0400
committerMikhail Pukhlikov <cynede@gentoo.org>2017-12-20 14:48:55 +0400
commitb01d2822b5096e05c6cc7b27c97eb9d47997751b (patch)
tree7cb20a70a9b4be7d55068adee741c4c7e8bc5799 /dev-lang/mono/files
parentwww-client/vivaldi: Drop RDEPEND on net-misc/curl. (diff)
downloadgentoo-b01d2822b5096e05c6cc7b27c97eb9d47997751b.tar.gz
gentoo-b01d2822b5096e05c6cc7b27c97eb9d47997751b.tar.bz2
gentoo-b01d2822b5096e05c6cc7b27c97eb9d47997751b.zip
dev-lang/mono: version bump to 5.4.1.6
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'dev-lang/mono/files')
-rw-r--r--dev-lang/mono/files/mono-5.0.1.1-x86_32.patch21
1 files changed, 21 insertions, 0 deletions
diff --git a/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch b/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch
new file mode 100644
index 000000000000..08d443a22038
--- /dev/null
+++ b/dev-lang/mono/files/mono-5.0.1.1-x86_32.patch
@@ -0,0 +1,21 @@
+Native toolchain can default to different ABI (amd64 in bug case).
+Set target to i386.
+https://bugs.gentoo.org/600664
+diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c
+index 0656a57..690c96b 100644
+--- a/mono/mini/aot-compiler.c
++++ b/mono/mini/aot-compiler.c
+@@ -9926,4 +9926,6 @@ compile_asm (MonoAotCompile *acfg)
+ #ifdef TARGET_WIN32_MSVC
+ #define AS_OPTIONS "-c -x assembler"
++#elif defined(TARGET_X86) && !defined(TARGET_MACH)
++#define AS_OPTIONS "--32"
+ #elif defined(TARGET_AMD64) && !defined(TARGET_MACH)
+ #define AS_OPTIONS "--64"
+@@ -9981,4 +9983,6 @@ compile_asm (MonoAotCompile *acfg)
+ #elif defined(TARGET_POWERPC64)
+ #define LD_OPTIONS "-m elf64ppc"
++#elif defined(TARGET_X86)
++#define LD_OPTIONS "-m elf_i386"
+ #endif
+