Mesa (master): llvmpipe: Centralize LLVM initialization.

[Jose Fonseca]

Module: Mesa
Branch: master
Commit: 9f9b44222f45a4548070c1019674abe173e2f253
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9f9b44222f45a4548070c1019674abe173e2f253

Author: José Fonseca <jfonseca at vmware.com>
Date:   Wed Mar  3 12:00:25 2010 +0000

llvmpipe: Centralize LLVM initialization.

---

 src/gallium/drivers/llvmpipe/lp_jit.c       |    4 ++--
 src/gallium/drivers/llvmpipe/lp_test_main.c |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/llvmpipe/lp_jit.c b/src/gallium/drivers/llvmpipe/lp_jit.c
index d3d7e26..b666ffc 100644
--- a/src/gallium/drivers/llvmpipe/lp_jit.c
+++ b/src/gallium/drivers/llvmpipe/lp_jit.c
@@ -37,6 +37,7 @@
 
 #include "util/u_memory.h"
 #include "util/u_cpu_detect.h"
+#include "gallivm/lp_bld_init.h"
 #include "lp_debug.h"
 #include "lp_screen.h"
 #include "gallivm/lp_bld_intr.h"
@@ -148,8 +149,7 @@ lp_jit_screen_init(struct llvmpipe_screen *screen)
    util_cpu_caps.has_sse4_1 = 0;
 #endif
 
-   LLVMLinkInJIT();
-   LLVMInitializeNativeTarget();
+   lp_build_init();
 
    screen->module = LLVMModuleCreateWithName("llvmpipe");
 
diff --git a/src/gallium/drivers/llvmpipe/lp_test_main.c b/src/gallium/drivers/llvmpipe/lp_test_main.c
index b08872b..f9dce8b 100644
--- a/src/gallium/drivers/llvmpipe/lp_test_main.c
+++ b/src/gallium/drivers/llvmpipe/lp_test_main.c
@@ -380,8 +380,7 @@ int main(int argc, char **argv)
          n = atoi(argv[i]);
    }
 
-   LLVMLinkInJIT();
-   LLVMInitializeNativeTarget();
+   lp_build_init();
 
    util_cpu_detect();