[llvm-commits] CVS: llvm/lib/Target/X86/X86JITInfo.cpp

[Chris Lattner]

Changes in directory llvm/lib/Target/X86:

X86JITInfo.cpp updated: 1.14 -> 1.15
---
Log message:

Improve compatibility with VC2005, patch by Morten Ofstad!


---
Diffs of the changes:  (+5 -3)

 X86JITInfo.cpp |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)


Index: llvm/lib/Target/X86/X86JITInfo.cpp
diff -u llvm/lib/Target/X86/X86JITInfo.cpp:1.14 llvm/lib/Target/X86/X86JITInfo.cpp:1.15
--- llvm/lib/Target/X86/X86JITInfo.cpp:1.14	Fri Jul 22 15:49:37 2005
+++ llvm/lib/Target/X86/X86JITInfo.cpp	Thu Jan 26 13:55:20 2006
@@ -20,6 +20,11 @@
 #include <iostream>
 using namespace llvm;
 
+#ifdef _MSC_VER
+  extern "C" void *_AddressOfReturnAddress(void);
+  #pragma intrinsic(_AddressOfReturnAddress)
+#endif
+
 void X86JITInfo::replaceMachineCodeForFunction(void *Old, void *New) {
   unsigned char *OldByte = (unsigned char *)Old;
   *OldByte++ = 0xE9;                // Emit JMP opcode.
@@ -64,9 +69,6 @@
     "popl    %ebp\n"
     "ret\n");
 #else
-  extern "C" void *_AddressOfReturnAddress(void);
-  #pragma intrinsic(_AddressOfReturnAddress)
-
   void X86CompilationCallback2(void);
 
   _declspec(naked) void X86CompilationCallback(void) {