diff options
author | José Fonseca <jfonseca@vmware.com> | 2009-09-26 09:33:32 +0100 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2009-09-26 09:37:43 +0100 |
commit | 1df539ce87ab38ebae67d63a353b01f4cf5edc79 (patch) | |
tree | 65d1c818cf60cdb98fd5dbdb0df6a42eb8a237a2 | |
parent | 28f531e3fe95c9fad2bf2f09aef0343ab079bff2 (diff) |
llvmpipe: Allow building with LLVM 2.6 too.
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_jit.c | 5 | ||||
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_test_format.c | 5 | ||||
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_test_main.c | 5 |
3 files changed, 15 insertions, 0 deletions
diff --git a/src/gallium/drivers/llvmpipe/lp_jit.c b/src/gallium/drivers/llvmpipe/lp_jit.c index b4a22ff4a97..f7111c1e5cf 100644 --- a/src/gallium/drivers/llvmpipe/lp_jit.c +++ b/src/gallium/drivers/llvmpipe/lp_jit.c @@ -147,6 +147,11 @@ lp_jit_screen_init(struct llvmpipe_screen *screen) { char *error = NULL; +#ifdef LLVM_NATIVE_ARCH + LLVMLinkInJIT(); + LLVMInitializeNativeTarget(); +#endif + screen->module = LLVMModuleCreateWithName("llvmpipe"); screen->provider = LLVMCreateModuleProviderForExistingModule(screen->module); diff --git a/src/gallium/drivers/llvmpipe/lp_test_format.c b/src/gallium/drivers/llvmpipe/lp_test_format.c index d8455e56490..7d83f899e6a 100644 --- a/src/gallium/drivers/llvmpipe/lp_test_format.c +++ b/src/gallium/drivers/llvmpipe/lp_test_format.c @@ -264,6 +264,11 @@ int main(int argc, char **argv) unsigned i; int ret; +#ifdef LLVM_NATIVE_ARCH + LLVMLinkInJIT(); + LLVMInitializeNativeTarget(); +#endif + for (i = 0; i < sizeof(test_cases)/sizeof(test_cases[0]); ++i) if(!test_format(&test_cases[i])) ret = 1; diff --git a/src/gallium/drivers/llvmpipe/lp_test_main.c b/src/gallium/drivers/llvmpipe/lp_test_main.c index 4592dc0b2d0..f07fa256f16 100644 --- a/src/gallium/drivers/llvmpipe/lp_test_main.c +++ b/src/gallium/drivers/llvmpipe/lp_test_main.c @@ -365,6 +365,11 @@ int main(int argc, char **argv) n = atoi(argv[i]); } +#ifdef LLVM_NATIVE_ARCH + LLVMLinkInJIT(); + LLVMInitializeNativeTarget(); +#endif + if(fp) { /* Warm up the caches */ test_some(0, NULL, 100); |