[Mesa-dev] [Mesa-stable] [PATCH] swr: [rasterizer jitter] fix llvm >= 7 build break

[Dylan Baker]

Quoting Chuck Atkins (2018-09-20 11:22:05)
> Signed-off-by: Chuck Atkins <chuck.atkins at kitware.com>
> CC: <mesa-stable at lists.freedesktop.org>
> CC: Bruce Cherniak <bruce.cherniak at intel.com>
> CC: George Kyriazis <george.kyriazis at intel.com>
> CC: Tim Rowley <timothy.o.rowley at intel.com>
> ---
>  configure.ac                                                       | 7 ++++++-
>  src/gallium/drivers/swr/rasterizer/jitter/blend_jit.cpp            | 4 ++++
>  src/gallium/drivers/swr/rasterizer/jitter/fetch_jit.cpp            | 4 ++++
>  .../drivers/swr/rasterizer/jitter/functionpasses/lower_x86.cpp     | 4 ++++
>  src/gallium/drivers/swr/rasterizer/jitter/jit_pch.hpp              | 1 +
>  src/gallium/drivers/swr/rasterizer/jitter/streamout_jit.cpp        | 6 +++++-
>  6 files changed, 24 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index 864dcae8e3..9a47ca4797 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1010,7 +1010,7 @@ if test "x$have_libelf" = xno; then
>     AC_SUBST([LIBELF_CFLAGS])
>  fi
>  
> -if test -z "$LLVM_CONFIG"; then
> +if test -z "$LLM_CONFIG"; then
>      if test -n "$llvm_prefix"; then
>          AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no], ["$llvm_prefix/bin"])
>      else
> @@ -2719,6 +2719,11 @@ if test -n "$with_gallium_drivers"; then
>              ;;
>          xswr)
>              llvm_require_version $LLVM_REQUIRED_SWR "swr"
> +            llvm_add_default_components "swr"
> +            if test $LLVM_VERSION_MAJOR -ge 7; then
> +                llvm_add_component "ipo" "swr"
> +                llvm_add_component "ObjCARCOpts" "swr"

Presumably this should be added to the meson build as well? There's an
"llvm_modules" array around line 1170.

Dylan
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 228 bytes
Desc: signature
URL: <https://lists.freedesktop.org/archives/mesa-dev/attachments/20180920/523fb573/attachment-0001.sig>