[Mesa-dev] [PATCH] gallivm: Fix build against LLVM 3.7 SVN r235265

[Aaron Watry]

On Sun, Apr 19, 2015 at 1:15 PM, Nick Sarnie <commendsarnex at gmail.com>
wrote:

> LLVM removed JITEmitDebugInfo from TargetOptions since they weren't used
>
> Signed-off-by: Nick Sarnie <commendsarnex at gmail.com>
> ---
>  src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 2 +-
>  src/gallium/auxiliary/gallivm/lp_bld_misc.cpp  | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> index 65d2896..381e1fa 100644
> --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> @@ -270,7 +270,7 @@ disassemble(const void* func, llvm::raw_ostream & Out)
>     }
>
>     TargetOptions options;
> -#if defined(DEBUG)
> +#if defined(DEBUG) && HAVE_LLVM < 0x307
>

This patch works just fine for me (didn't build before, does now).

The only thing that stuck out is that we're being inconsistent in this
patch about how we check the LLVM version.  This one uses 0x307, the next
one uses 0x0307.

We should probably be consistent, even if the leading zero gets dropped
anyway.

--Aaron


>     options.JITEmitDebugInfo = true;
>  #endif
>  #if defined(PIPE_ARCH_X86)
>
> diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> index 4ede90b..5e8a634 100644
> --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> @@ -429,7 +429,7 @@
> lp_build_create_jit_compiler_for_module(LLVMExecutionEngineRef *OutJIT,
>  #endif
>  #endif
>
> -#if defined(DEBUG)
> +#if defined(DEBUG) && HAVE_LLVM < 0x0307
>     options.JITEmitDebugInfo = true;
>  #endif
>
> --
> 2.3.5
>
>
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/mesa-dev/attachments/20150419/e0be8015/attachment.html>