diff options
| author |   Peter Johanson <latexer@gentoo.org> | 2005-04-14 23:34:13 +0000 |
|---|---|---|
| committer | Peter Johanson <latexer@gentoo.org> | 2005-04-14 23:34:13 +0000 |
| commit | acb37c4fb1ddf77232010caa090b19b0bc6bc5cb (patch) | |
| tree | 271409184f42fbce4165e982ff5cfb54c6ca6c7f /dev-lang/mono/files | |
| parent | bumped to nvu-1.0PR (diff) | |
| download | gentoo-2-acb37c4fb1ddf77232010caa090b19b0bc6bc5cb.tar.gz gentoo-2-acb37c4fb1ddf77232010caa090b19b0bc6bc5cb.tar.bz2 gentoo-2-acb37c4fb1ddf77232010caa090b19b0bc6bc5cb.zip | |
Add a fix for amd64 as exposed by muine. See bug #88041.
(Portage version: 2.0.51.19)
Diffstat (limited to 'dev-lang/mono/files')
| -rw-r--r-- | dev-lang/mono/files/digest-mono-1.1.6-r1 | 1 | ||||
| -rw-r--r-- | dev-lang/mono/files/mono-1.1.6-r42300.diff | 36 |
2 files changed, 37 insertions, 0 deletions
diff --git a/dev-lang/mono/files/digest-mono-1.1.6-r1 b/dev-lang/mono/files/digest-mono-1.1.6-r1 new file mode 100644 index 000000000000..d5d81037e76d --- /dev/null +++ b/dev-lang/mono/files/digest-mono-1.1.6-r1 @@ -0,0 +1 @@ +MD5 d5097b149effa0b248a4398fe630bd30 mono-1.1.6.tar.gz 13752717 diff --git a/dev-lang/mono/files/mono-1.1.6-r42300.diff b/dev-lang/mono/files/mono-1.1.6-r42300.diff new file mode 100644 index 000000000000..8688bb0fb8ac --- /dev/null +++ b/dev-lang/mono/files/mono-1.1.6-r42300.diff @@ -0,0 +1,36 @@ +diff -aur mono-1.1.6-orig/mono/mini/cpu-amd64.md mono-1.1.6/mono/mini/cpu-amd64.md +--- mono-1.1.6-orig/mono/mini/cpu-amd64.md 2005-03-30 16:26:18.000000000 -0500 ++++ mono-1.1.6/mono/mini/cpu-amd64.md 2005-04-11 23:12:10.000000000 -0400 +@@ -289,8 +289,8 @@ + storei4_membase_imm: dest:b len:13 + storei4_membase_reg: dest:b src1:i len:9 + storei8_membase_imm: dest:b len:18 +-storer4_membase_reg: dest:b src1:f len:14 +-storer8_membase_reg: dest:b src1:f len:9 ++storer4_membase_reg: dest:b src1:f len:15 ++storer8_membase_reg: dest:b src1:f len:10 + load_membase: dest:i src1:b len:15 + loadi1_membase: dest:i src1:b len:9 + loadu1_membase: dest:i src1:b len:9 +diff -aur mono-1.1.6-orig/mono/mini/mini-amd64.c mono-1.1.6/mono/mini/mini-amd64.c +--- mono-1.1.6-orig/mono/mini/mini-amd64.c 2005-03-30 16:26:18.000000000 -0500 ++++ mono-1.1.6/mono/mini/mini-amd64.c 2005-04-11 23:12:10.000000000 -0400 +@@ -5383,11 +5383,13 @@ + patch_info->type = MONO_PATCH_INFO_INTERNAL_METHOD; + patch_info->ip.i = code - cfg->native_code; + +- if (mono_compile_aot) ++ if (mono_compile_aot) { + amd64_mov_reg_membase (code, GP_SCRATCH_REG, AMD64_RIP, 0, 8); +- else +- amd64_set_reg_template (code, GP_SCRATCH_REG); +- amd64_call_reg (code, GP_SCRATCH_REG); ++ amd64_call_reg (code, GP_SCRATCH_REG); ++ } else { ++ /* The callee is in memory allocated using the code manager */ ++ amd64_call_code (code, 0); ++ } + + amd64_mov_reg_imm (buf, AMD64_RSI, (code - cfg->native_code) - throw_ip); + while (buf < buf2) +Only in mono-1.1.6/mono/mini: mini-amd64.c.orig |