2009-05-06 Zoltan Varga <vargaz@gmail.com>

	* mini-llvm.c (mono_llvm_emit_method): Update the OP_TLS_GET implementation
	to the latest LLVM code.

svn path=/trunk/mono/; revision=133616

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 5a85175cb8dde427f4e76301d1a24d52de68ee1c..bcc8b9a7f3fee900aa6d5ef5c381505759f40582 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2009-05-06  Zoltan Varga  <vargaz@gmail.com>
+
+       * mini-llvm.c (mono_llvm_emit_method): Update the OP_TLS_GET implementation
+       to the latest LLVM code.
+
 2009-05-05  Zoltan Varga  <vargaz@gmail.com>
 
        * genmdesc.pl (load_opcodes): Fix this after the TARGET_... changes.

diff --git a/mono/mini/mini-llvm.c b/mono/mini/mini-llvm.c
index 922688ab3d8baaf3030f08ecf19cfd5a8bdbff3c..1f181a52f54fb183db484ba8e73046dd34f99672 100644 (file)
--- a/mono/mini/mini-llvm.c
+++ b/mono/mini/mini-llvm.c
@@ -2243,8 +2243,8 @@ mono_llvm_emit_method (MonoCompile *cfg)
                        case OP_TLS_GET: {
 #if defined(TARGET_AMD64) || defined(TARGET_X86)
 #ifdef TARGET_AMD64
-                               // 255 == FS segment register
-                               LLVMTypeRef ptrtype = LLVMPointerType (IntPtrType (), 255);
+                               // 257 == FS segment register
+                               LLVMTypeRef ptrtype = LLVMPointerType (IntPtrType (), 257);
 #else
                                // 256 == GS segment register
                                LLVMTypeRef ptrtype = LLVMPointerType (IntPtrType (), 256);
@@ -2256,8 +2256,6 @@ mono_llvm_emit_method (MonoCompile *cfg)
                                LLVM_FAILURE (ctx, "opcode tls-get");
 #endif
 
-                               /* This depends on uncomitted patches to LLVM */
-                               LLVM_FAILURE (ctx, "opcode tls-get");
                                break;
                        }