On Mon, Jan 06, 2014 at 04:50:03PM -0500, Brad Smith wrote: > Here is an update to LLVM 3.4. > > Any additional testing welcome. > > OK? >
Here is a diff that lets xenocara build with XENOCARA_BUILD_GALLIUM=llvm using a commit from mesa git that doesn't seem to be in the 9.2 branch yet: http://cgit.freedesktop.org/mesa/mesa/commit/?id=749cb8909714fed57b0213f4ad92def3bb24f153 I have only built this on amd64 so far, not yet tested that swrast (LLVMpipe) and the llvm enabled radeon drivers work. Index: lib/libGL/gallium/Makefile.inc =================================================================== RCS file: /cvs/xenocara/lib/libGL/gallium/Makefile.inc,v retrieving revision 1.4 diff -u -p -r1.4 Makefile.inc --- lib/libGL/gallium/Makefile.inc 5 Sep 2013 15:11:59 -0000 1.4 +++ lib/libGL/gallium/Makefile.inc 11 Jan 2014 01:43:54 -0000 @@ -32,7 +32,7 @@ lib${LIB}_pic.a: ${OBJS} ${DPADD} .if ${XENOCARA_BUILD_GALLIUM} == "llvm" # Remember to keep in sync with LLVM port's version. -LLVM_VERSION= 0x303 # 3.3 +LLVM_VERSION= 0x304 # 3.4 LLVM_CONFIG?= /usr/local/bin/llvm-config # ugh... Index: dist/Mesa/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp =================================================================== RCS file: /cvs/xenocara/dist/Mesa/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp,v retrieving revision 1.4 diff -u -p -r1.4 lp_bld_misc.cpp --- dist/Mesa/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp 5 Sep 2013 13:59:36 -0000 1.4 +++ dist/Mesa/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp 11 Jan 2014 02:00:58 -0000 @@ -174,12 +174,14 @@ lp_set_target_options(void) } #endif +#if HAVE_LLVM < 0x0304 /* * By default LLVM adds a signal handler to output a pretty stack trace. * This signal handler is never removed, causing problems when unloading the * shared object where the gallium driver resides. */ llvm::DisablePrettyStackTrace = true; +#endif // If we have a native target, initialize it to ensure it is linked in and // usable by the JIT.
