Travis: add binutils 2.26 for a few more LLVM 3.9 builds
Otherwise we error out at link stage as follows: /usr/lib/llvm-3.9/lib/libLLVMAMDGPUCodeGen.a(R600OptimizeVectorRegisters.cpp.o): unrecognized relocation (0x2a) in section `.text._ZNK12_GLOBAL__N_119R600VectorRegMerger16getAnalysisUsageERN4llvm13AnalysisUsageE' /usr/bin/ld: final link failed: Bad value Cc: mesa-stable@lists.freedesktop.org Cc: Jan Vesely <jan.vesely@rutgers.edu Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:

committed by
Emil Velikov

parent
13a53c4f5c
commit
a7ecf7b86f
@@ -62,6 +62,8 @@ matrix:
|
|||||||
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
|
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
|
||||||
- OVERRIDE_CC="gcc-4.8"
|
- OVERRIDE_CC="gcc-4.8"
|
||||||
- OVERRIDE_CXX="g++-4.8"
|
- OVERRIDE_CXX="g++-4.8"
|
||||||
|
# New binutils linker is required for llvm-3.9
|
||||||
|
- OVERRIDE_PATH=/usr/lib/binutils-2.26/bin
|
||||||
- DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
|
- DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
|
||||||
- DRI_DRIVERS=""
|
- DRI_DRIVERS=""
|
||||||
- GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
|
- GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
|
||||||
@@ -73,6 +75,7 @@ matrix:
|
|||||||
sources:
|
sources:
|
||||||
- llvm-toolchain-trusty-3.9
|
- llvm-toolchain-trusty-3.9
|
||||||
packages:
|
packages:
|
||||||
|
- binutils-2.26
|
||||||
# LLVM packaging is broken and misses these dependencies
|
# LLVM packaging is broken and misses these dependencies
|
||||||
- libedit-dev
|
- libedit-dev
|
||||||
# From sources above
|
# From sources above
|
||||||
@@ -91,6 +94,8 @@ matrix:
|
|||||||
- MAKE_CHECK_COMMAND="true"
|
- MAKE_CHECK_COMMAND="true"
|
||||||
- LLVM_VERSION=3.9
|
- LLVM_VERSION=3.9
|
||||||
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
|
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
|
||||||
|
# New binutils linker is required for llvm-3.9
|
||||||
|
- OVERRIDE_PATH=/usr/lib/binutils-2.26/bin
|
||||||
- DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
|
- DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
|
||||||
- DRI_DRIVERS=""
|
- DRI_DRIVERS=""
|
||||||
- GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
|
- GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
|
||||||
@@ -102,6 +107,7 @@ matrix:
|
|||||||
sources:
|
sources:
|
||||||
- llvm-toolchain-trusty-3.9
|
- llvm-toolchain-trusty-3.9
|
||||||
packages:
|
packages:
|
||||||
|
- binutils-2.26
|
||||||
# LLVM packaging is broken and misses these dependencies
|
# LLVM packaging is broken and misses these dependencies
|
||||||
- libedit-dev
|
- libedit-dev
|
||||||
# From sources above
|
# From sources above
|
||||||
@@ -267,6 +273,8 @@ matrix:
|
|||||||
- MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check"
|
- MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check"
|
||||||
- LLVM_VERSION=3.9
|
- LLVM_VERSION=3.9
|
||||||
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
|
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
|
||||||
|
# New binutils linker is required for llvm-3.9
|
||||||
|
- OVERRIDE_PATH=/usr/lib/binutils-2.26/bin
|
||||||
- DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland"
|
- DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland"
|
||||||
- DRI_DRIVERS=""
|
- DRI_DRIVERS=""
|
||||||
- GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
|
- GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx-bellagio --disable-gallium-osmesa"
|
||||||
@@ -278,6 +286,7 @@ matrix:
|
|||||||
sources:
|
sources:
|
||||||
- llvm-toolchain-trusty-3.9
|
- llvm-toolchain-trusty-3.9
|
||||||
packages:
|
packages:
|
||||||
|
- binutils-2.26
|
||||||
# LLVM packaging is broken and misses these dependencies
|
# LLVM packaging is broken and misses these dependencies
|
||||||
- libedit-dev
|
- libedit-dev
|
||||||
# From sources above
|
# From sources above
|
||||||
|
Reference in New Issue
Block a user