aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2017-10-05 11:19:06 +0100
committerEmil Velikov <[email protected]>2017-10-13 12:56:13 +0100
commita7ecf7b86f4eae59f3ceac2125e5d1725c403c07 (patch)
tree6c2724d21dff23bdb988db2d53de2c4424389f55
parent13a53c4f5cdd664fd155c9e78fb46a4387af006c (diff)
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: [email protected] Cc: Jan Vesely <[email protected] Signed-off-by: Emil Velikov <[email protected]>
-rw-r--r--.travis.yml9
1 files changed, 9 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index b1ead14f49b..766ee158c70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,6 +62,8 @@ matrix:
- LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
- OVERRIDE_CC="gcc-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_DRIVERS=""
- 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:
- llvm-toolchain-trusty-3.9
packages:
+ - binutils-2.26
# LLVM packaging is broken and misses these dependencies
- libedit-dev
# From sources above
@@ -91,6 +94,8 @@ matrix:
- MAKE_CHECK_COMMAND="true"
- LLVM_VERSION=3.9
- 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_DRIVERS=""
- 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:
- llvm-toolchain-trusty-3.9
packages:
+ - binutils-2.26
# LLVM packaging is broken and misses these dependencies
- libedit-dev
# From sources above
@@ -267,6 +273,8 @@ matrix:
- MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check"
- LLVM_VERSION=3.9
- 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_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"
@@ -278,6 +286,7 @@ matrix:
sources:
- llvm-toolchain-trusty-3.9
packages:
+ - binutils-2.26
# LLVM packaging is broken and misses these dependencies
- libedit-dev
# From sources above