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

[Evan Cheng]

Changes in directory llvm/lib/Target/X86:

X86JITInfo.cpp updated: 1.29 -> 1.30
---
Log message:

One more try.

---
Diffs of the changes:  (+6 -4)

 X86JITInfo.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


Index: llvm/lib/Target/X86/X86JITInfo.cpp
diff -u llvm/lib/Target/X86/X86JITInfo.cpp:1.29 llvm/lib/Target/X86/X86JITInfo.cpp:1.30
--- llvm/lib/Target/X86/X86JITInfo.cpp:1.29	Mon Oct 16 17:53:28 2006
+++ llvm/lib/Target/X86/X86JITInfo.cpp	Mon Oct 16 18:44:08 2006
@@ -256,7 +256,8 @@
 X86JITInfo::getLazyResolverFunction(JITCompilerFn F) {
   JITCompilerFunction = F;
 
-#if !defined(__x86_64__)
+#if (defined(__i386__) || defined(i386) || defined(_M_IX86)) && \
+  !defined(_MSC_VER) && !defined(__x86_64__)
   unsigned EAX = 0, EBX = 0, ECX = 0, EDX = 0;
   union {
     unsigned u[3];
@@ -279,11 +280,12 @@
 void *X86JITInfo::emitFunctionStub(void *Fn, MachineCodeEmitter &MCE) {
   // Note, we cast to intptr_t here to silence a -pedantic warning that 
   // complains about casting a function pointer to a normal pointer.
-#if defined(__x86_64__)
-  bool NotCC = Fn != (void*)(intptr_t)X86CompilationCallback;
-#else
+#if (defined(__i386__) || defined(i386) || defined(_M_IX86)) && \
+  !defined(_MSC_VER) && !defined(__x86_64__)
   bool NotCC = (Fn != (void*)(intptr_t)X86CompilationCallback &&
                 Fn != (void*)(intptr_t)X86CompilationCallback_SSE);
+#else
+  bool NotCC = Fn != (void*)(intptr_t)X86CompilationCallback;
 #endif
   if (NotCC) {
     MCE.startFunctionStub(5);