Merge pull request #2612 from redstar/llvm6

[ltsmaster] Update to LLVM 6 release version.

.travis.yml

@@ -5,7 +5,7 @@ sudo: false
 matrix:
   include:
     - os: linux
-      env: LLVM_VERSION=6.0.0-rc3
+      env: LLVM_VERSION=6.0.0
     - os: linux
       env: LLVM_VERSION=5.0.1
     - os: linux
@@ -25,10 +25,9 @@ matrix:
 
 cache:
   directories:
-    - llvm-6.0.0-rc3
+    - llvm-6.0.0
     - llvm-5.0.1
     - llvm-4.0.1
-    - llvm-4.0.0
     - llvm-3.9.1
     - llvm-3.8.1
     - llvm-3.7.1
@@ -47,9 +46,7 @@ addons:
 before_install:
   -
     if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-      if [ "${LLVM_VERSION}" = "5.0.0" ]; then
-        export LLVM_ARCH="linux-x86_64-ubuntu14.04";
-      elif [ "${LLVM_VERSION}" = "4.0.1" ]; then
+      if [ "${LLVM_VERSION}" = "4.0.1" ]; then
         export LLVM_ARCH="x86_64-linux-gnu-debian8";
       else
         export LLVM_ARCH="x86_64-linux-gnu-ubuntu-14.04";
@@ -58,11 +55,7 @@ before_install:
       export LLVM_ARCH="x86_64-apple-darwin";
     fi;
     if [ -z "$(ls -A llvm-$LLVM_VERSION)" ]; then
-      if [ "${LLVM_VERSION}" = "6.0.0-rc3" ]; then
-        wget -O llvm-$LLVM_VERSION.tar.xz http://prereleases.llvm.org/6.0.0/rc3/clang+llvm-6.0.0-rc3-x86_64-linux-gnu-debian8.tar.xz;
-      else
-        wget -O llvm-$LLVM_VERSION.tar.xz http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-${LLVM_ARCH}.tar.xz;
-      fi;
+      wget -O llvm-$LLVM_VERSION.tar.xz http://llvm.org/releases/$LLVM_VERSION/clang+llvm-$LLVM_VERSION-${LLVM_ARCH}.tar.xz;
       mkdir llvm-$LLVM_VERSION;
       tar -xf llvm-$LLVM_VERSION.tar.xz --strip 1 -C llvm-$LLVM_VERSION;
     fi;
@@ -73,7 +66,7 @@ before_install:
 install:
   -
     if [ "${TRAVIS_OS_NAME}" = "linux" ]; then
-      if [ "${LLVM_VERSION}" = "6.0.0-rc3" ]; then
+      if [ "${LLVM_VERSION}" = "6.0.0" ]; then
         export CC="$PWD/llvm-$LLVM_VERSION/bin/clang"; export CXX="$PWD/llvm-$LLVM_VERSION/bin/clang++";
       else
         export CC="gcc-4.9"; export CXX="g++-4.9";