On Tue, 2017-10-03 at 17:51 +0100, Emil Velikov wrote: > From: Emil Velikov <emil.veli...@collabora.com> > > The only driver that utilises Clover already depends on LLVM 3.9. > Additionally close to every supported distribution has said version. > > Additionally libclc requires LLVM 4.0 these days.
support for llvm-3.9 has been restored to libclc since our discussion.
sorry, I should have mentioned that.
Jan
>
> With this in mind, there a handful of dead code that we could remove.
> That will come with later commits.
>
> Note: this drops the LLVM 3.6 build from the Travis build. LLVM 3.9 (and
> later) are already covered in there.
>
> Cc: Vedran Miletić <ved...@miletic.net>
> Cc: Jan Vesely <jan.ves...@rutgers.edu>
> Cc: Aaron Watry <awa...@gmail.com>
> Cc: Francisco Jerez <curroje...@riseup.net>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
> ---
> Vedran can we volunteer you for the cleanup ;-)
> ---
> .travis.yml | 38 --------------------------------------
> configure.ac | 2 +-
> 2 files changed, 1 insertion(+), 39 deletions(-)
>
> diff --git a/.travis.yml b/.travis.yml
> index d9a8bf5a9d4..1e5f6bcb702 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -113,44 +113,6 @@ matrix:
> - libx11-xcb-dev
> - libelf-dev
> - libunwind8-dev
> - - env:
> - # NOTE: Analogous to SWR above, building Clover is quite slow.
> - - LABEL="make Gallium ST Clover"
> - - BUILD=make
> - - MAKEFLAGS="-j4"
> - - MAKE_CHECK_COMMAND="true"
> - - LLVM_VERSION=3.6
> - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
> - - OVERRIDE_CC=gcc-4.7
> - - OVERRIDE_CXX=g++-4.7
> - - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
> - - DRI_DRIVERS=""
> - - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd
> --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau
> --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
> - # i915 most likely doesn't work with OpenCL.
> - # Regardless - we're doing a quick build test here.
> - - GALLIUM_DRIVERS="i915"
> - - VULKAN_DRIVERS=""
> - - LIBUNWIND_FLAGS="--enable-libunwind"
> - addons:
> - apt:
> - sources:
> - - llvm-toolchain-trusty-3.6
> - packages:
> - - libclc-dev
> - # LLVM packaging is broken and misses these dependencies
> - - libedit-dev
> - - g++-4.7
> - # From sources above
> - - llvm-3.6-dev
> - - clang-3.6
> - - libclang-3.6-dev
> - # Common
> - - xz-utils
> - - x11proto-xf86vidmode-dev
> - - libexpat1-dev
> - - libx11-xcb-dev
> - - libelf-dev
> - - libunwind8-dev
> - env:
> # NOTE: Analogous to SWR above, building Clover is quite slow.
> - LABEL="make Gallium ST Clover LLVM-3.9"
> diff --git a/configure.ac b/configure.ac
> index cfc97d9f061..d62570fb14d 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -101,7 +101,7 @@ ZLIB_REQUIRED=1.2.3
>
> dnl LLVM versions
> LLVM_REQUIRED_GALLIUM=3.3.0
> -LLVM_REQUIRED_OPENCL=3.6.0
> +LLVM_REQUIRED_OPENCL=3.9.0
> LLVM_REQUIRED_R600=3.9.0
> LLVM_REQUIRED_RADEONSI=3.9.0
> LLVM_REQUIRED_RADV=3.9.0
--
Jan Vesely <jan.ves...@rutgers.edu>
signature.asc
Description: This is a digitally signed message part
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
