diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-21 20:47:17 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-21 20:47:17 +0000 |
| commit | 4ab6db5717ef23f29320d4c6fb9ebdb8dec1f193 (patch) | |
| tree | f7640b8b96a04499f1ce44a2cad122d45a8373bd /dev-lang/mono/files/mono-5.0.1.1-x86_32.patch | |
| parent | 48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 (diff) | |
gentoo resync : 21.12.2017
Diffstat (limited to 'dev-lang/mono/files/mono-5.0.1.1-x86_32.patch')
| -rw-r--r-- | dev-lang/mono/files/mono-5.0.1.1-x86_32.patch | 21 |
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 + |