From 348b00dc49c71b1f8e830d14e8af53d0c0024678 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Mon, 16 Oct 2006 22:53:28 +0000 Subject: [PATCH] Unbreak x86-64 build. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@30990 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86JITInfo.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/Target/X86/X86JITInfo.cpp b/lib/Target/X86/X86JITInfo.cpp index 027c2e7a8cc..713579e6bb4 100644 --- a/lib/Target/X86/X86JITInfo.cpp +++ b/lib/Target/X86/X86JITInfo.cpp @@ -256,6 +256,7 @@ TargetJITInfo::LazyResolverFn X86JITInfo::getLazyResolverFunction(JITCompilerFn F) { JITCompilerFunction = F; +#if !defined(__x86_64__) unsigned EAX = 0, EBX = 0, ECX = 0, EDX = 0; union { unsigned u[3]; @@ -270,6 +271,7 @@ X86JITInfo::getLazyResolverFunction(JITCompilerFn F) { return X86CompilationCallback_SSE; } } +#endif return X86CompilationCallback; } @@ -277,8 +279,13 @@ X86JITInfo::getLazyResolverFunction(JITCompilerFn F) { 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 (Fn != (void*)(intptr_t)X86CompilationCallback && - Fn != (void*)(intptr_t)X86CompilationCallback_SSE) { +#if defined(__x86_64__) + bool NotCC = Fn != (void*)(intptr_t)X86CompilationCallback; +#else + bool NotCC = (Fn != (void*)(intptr_t)X86CompilationCallback && + Fn != (void*)(intptr_t)X86CompilationCallback_SSE); +#endif + if (NotCC) { MCE.startFunctionStub(5); MCE.emitByte(0xE9); MCE.emitWordLE((intptr_t)Fn-MCE.getCurrentPCValue()-4); -- 2.11.0