[Mesa-dev] [PATCH] gallivm: Fix build with llvm-3.1svn.

[Brian Paul]

On 12/12/2011 07:01 PM, Vinson Lee wrote:
> llvm-3.1svn r145714 moved global variables into a new TargetOptions
> class. TargetMachine constructor now needs a TargetOptions object as
> well.
>
> Signed-off-by: Vinson Lee<vlee at vmware.com>
> ---
>   src/gallium/auxiliary/gallivm/lp_bld_debug.cpp |   14 +++++++++++++-
>   src/gallium/auxiliary/gallivm/lp_bld_misc.cpp  |    2 ++
>   2 files changed, 15 insertions(+), 1 deletions(-)
>
> diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> index 62825a2..a50a51d 100644
> --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> @@ -250,7 +250,19 @@ lp_disassemble(const void* func)
>         return;
>      }
>
> -#if HAVE_LLVM>= 0x0300
> +#if HAVE_LLVM>= 0x0301
> +   TargetOptions options;
> +#if defined(DEBUG)
> +   options.JITEmitDebugInfo = true;
> +#endif
> +#if defined(PIPE_ARCH_X86)
> +   options.StackAlignmentOverride = 4;
> +#endif
> +#if defined(DEBUG) || defined(PROFILE)
> +   options.NoFramePointerElim = true;
> +#endif
> +   TargetMachine *TM = T->createTargetMachine(Triple, sys::getHostCPUName(), "", options);
> +#elif HAVE_LLVM == 0x0300
>      TargetMachine *TM = T->createTargetMachine(Triple, sys::getHostCPUName(), "");
>   #else
>      TargetMachine *TM = T->createTargetMachine(Triple, "");
> diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> index 222241a..fe7616b 100644
> --- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> +++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
> @@ -69,6 +69,7 @@ lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
>   extern "C" void
>   lp_set_target_options(void)
>   {
> +#if HAVE_LLVM<= 0x0300
>   #if defined(DEBUG)
>   #if HAVE_LLVM>= 0x0207
>      llvm::JITEmitDebugInfo = true;
> @@ -102,6 +103,7 @@ lp_set_target_options(void)
>   #if 0
>      llvm::UnsafeFPMath = true;
>   #endif
> +#endif  /* HAVE_LLVM<= 0x0300 */
>
>   #if HAVE_LLVM<  0x0209
>      /*

I haven't looked at LLVM 3.1-svn yet, but this seems OK to me.

Reviewed-by: Brian Paul <brianp at vmware.com>