summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-11-06 15:08:05 +0000
committerJosé Fonseca <jfonseca@vmware.com>2009-11-06 15:08:05 +0000
commit96e938f62c729fab74601627d54c9c4cf499ebdf (patch)
tree98f4c4c47d05d1099433e71418398916caea47ee /src
parent38d3c156dc64679e5602816070a0bac4f1f39302 (diff)
llvmpipe: Fix build with llvm 2.6.
Fixes bug 24949.
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/llvmpipe/lp_bld_misc.cpp7
-rw-r--r--src/gallium/drivers/llvmpipe/lp_bld_misc.h8
2 files changed, 10 insertions, 5 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_bld_misc.cpp b/src/gallium/drivers/llvmpipe/lp_bld_misc.cpp
index c9acaf1f16..d3f78c06d9 100644
--- a/src/gallium/drivers/llvmpipe/lp_bld_misc.cpp
+++ b/src/gallium/drivers/llvmpipe/lp_bld_misc.cpp
@@ -26,8 +26,6 @@
**************************************************************************/
-#include "llvm/Config/config.h"
-
#include "pipe/p_config.h"
#include "lp_bld_misc.h"
@@ -50,12 +48,13 @@ LLVMLinkInJIT(void)
extern "C" int X86TargetMachineModule;
-void
+int
LLVMInitializeNativeTarget(void)
{
#if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)
- X86TargetMachineModule = 1;
+ X86TargetMachineModule = 1;
#endif
+ return 0;
}
diff --git a/src/gallium/drivers/llvmpipe/lp_bld_misc.h b/src/gallium/drivers/llvmpipe/lp_bld_misc.h
index 51a84c5e25..0e787e0b9c 100644
--- a/src/gallium/drivers/llvmpipe/lp_bld_misc.h
+++ b/src/gallium/drivers/llvmpipe/lp_bld_misc.h
@@ -30,17 +30,23 @@
#define LP_BLD_MISC_H
+#include "llvm/Config/config.h"
+
#ifdef __cplusplus
extern "C" {
#endif
+#ifndef LLVM_NATIVE_ARCH
+
void
LLVMLinkInJIT(void);
-void
+int
LLVMInitializeNativeTarget(void);
+#endif /* !LLVM_NATIVE_ARCH */
+
#ifdef __cplusplus
}