Patrick Georgi submitted this change.

View Change

Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved
crossgcc: Upgrade LLVM to version 10.0.1

Change-Id: I1d96654fd66a5972c6c5cc24311ca2d889866331
Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39921
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M util/crossgcc/buildgcc
D util/crossgcc/sum/cfe-9.0.0.src.tar.xz.cksum
A util/crossgcc/sum/clang-10.0.1.src.tar.xz.cksum
A util/crossgcc/sum/clang-tools-extra-10.0.1.src.tar.xz.cksum
D util/crossgcc/sum/clang-tools-extra-9.0.0.src.tar.xz.cksum
A util/crossgcc/sum/compiler-rt-10.0.1.src.tar.xz.cksum
D util/crossgcc/sum/compiler-rt-9.0.0.src.tar.xz.cksum
A util/crossgcc/sum/llvm-10.0.1.src.tar.xz.cksum
D util/crossgcc/sum/llvm-9.0.0.src.tar.xz.cksum
9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc
index 548bb53..cb0f0ed 100755
--- a/util/crossgcc/buildgcc
+++ b/util/crossgcc/buildgcc
@@ -44,7 +44,7 @@
PYTHON_VERSION=3.8.5
EXPAT_VERSION=2.2.9
# CLANG version number
-CLANG_VERSION=9.0.0
+CLANG_VERSION=10.0.1
CMAKE_VERSION=3.18.1
NASM_VERSION=2.15.03

@@ -62,16 +62,16 @@
PYTHON_ARCHIVE="https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz"
EXPAT_ARCHIVE="https://downloads.sourceforge.net/sourceforge/expat/expat-${EXPAT_VERSION}.tar.bz2"
# CLANG toolchain archive locations
-LLVM_ARCHIVE="https://releases.llvm.org/${CLANG_VERSION}/llvm-${CLANG_VERSION}.src.tar.xz"
-CFE_ARCHIVE="https://releases.llvm.org/${CLANG_VERSION}/cfe-${CLANG_VERSION}.src.tar.xz"
-CRT_ARCHIVE="https://releases.llvm.org/${CLANG_VERSION}/compiler-rt-${CLANG_VERSION}.src.tar.xz"
-CTE_ARCHIVE="https://releases.llvm.org/${CLANG_VERSION}/clang-tools-extra-${CLANG_VERSION}.src.tar.xz"
+LLVM_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/llvm-${CLANG_VERSION}.src.tar.xz"
+CLANG_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-${CLANG_VERSION}.src.tar.xz"
+CRT_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/compiler-rt-${CLANG_VERSION}.src.tar.xz"
+CTE_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-tools-extra-${CLANG_VERSION}.src.tar.xz"
CMAKE_ARCHIVE="https://cmake.org/files/v3.18/cmake-${CMAKE_VERSION}.tar.gz"
NASM_ARCHIVE="https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2"

ALL_ARCHIVES="$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE \
$GCC_ARCHIVE $BINUTILS_ARCHIVE $GDB_ARCHIVE $IASL_ARCHIVE \
- $PYTHON_ARCHIVE $EXPAT_ARCHIVE $LLVM_ARCHIVE $CFE_ARCHIVE \
+ $PYTHON_ARCHIVE $EXPAT_ARCHIVE $LLVM_ARCHIVE $CLANG_ARCHIVE \
$CRT_ARCHIVE $CTE_ARCHIVE $CMAKE_ARCHIVE $NASM_ARCHIVE"

# GCC toolchain directories
@@ -88,7 +88,7 @@
EXPAT_DIR="expat-${EXPAT_VERSION}"
# CLANG toolchain directories
LLVM_DIR="llvm-${CLANG_VERSION}.src"
-CFE_DIR="cfe-${CLANG_VERSION}.src"
+CLANG_DIR="clang-${CLANG_VERSION}.src"
CRT_DIR="compiler-rt-${CLANG_VERSION}.src"
CTE_DIR="clang-tools-extra-${CLANG_VERSION}.src"
CMAKE_DIR="cmake-${CMAKE_VERSION}"
@@ -851,7 +851,7 @@
build_LLVM() {

cd .. || exit 1
- ln -sf "$PWD/$CFE_DIR" "$LLVM_DIR/tools/clang"
+ ln -sf "$PWD/$CLANG_DIR" "$LLVM_DIR/tools/clang"
ln -sf "$PWD/$CTE_DIR" "$LLVM_DIR/tools/clang/tools/extra"
ln -sf "$PWD/$CRT_DIR" "$LLVM_DIR/projects/compiler-rt"
cd - || exit 1
@@ -863,8 +863,8 @@
$MAKE $JOBS || touch .failed
$MAKE install || touch .failed

- cp -a ../$CFE_DIR/tools/scan-build/* "$DESTDIR$TARGETDIR/bin"
- cp -a ../$CFE_DIR/tools/scan-view/* "$DESTDIR$TARGETDIR/bin"
+ cp -a ../$CLANG_DIR/tools/scan-build/* "$DESTDIR$TARGETDIR/bin"
+ cp -a ../$CLANG_DIR/tools/scan-view/* "$DESTDIR$TARGETDIR/bin"

# create symlinks to work around broken --print-librt-file-name
# when used with -target.
@@ -1014,7 +1014,7 @@
CLANG|clang)
NAME="LLVM clang"
LLVM_VERSION=${CLANG_VERSION}
- PACKAGES="CMAKE LLVM CFE CRT CTE"
+ PACKAGES="CMAKE LLVM CLANG CRT CTE"
CMAKE=${DESTDIR}${TARGETDIR}/bin/cmake
;;
IASL|iasl)
diff --git a/util/crossgcc/sum/cfe-9.0.0.src.tar.xz.cksum b/util/crossgcc/sum/cfe-9.0.0.src.tar.xz.cksum
deleted file mode 100644
index e39bea1..0000000
--- a/util/crossgcc/sum/cfe-9.0.0.src.tar.xz.cksum
+++ /dev/null
@@ -1 +0,0 @@
-6977cf7a802a053c57fa74138d3648b563e71e88 tarballs/cfe-9.0.0.src.tar.xz
diff --git a/util/crossgcc/sum/clang-10.0.1.src.tar.xz.cksum b/util/crossgcc/sum/clang-10.0.1.src.tar.xz.cksum
new file mode 100644
index 0000000..6e0d863
--- /dev/null
+++ b/util/crossgcc/sum/clang-10.0.1.src.tar.xz.cksum
@@ -0,0 +1 @@
+0e61e92b22a620fe7f833fa8b2a56f2db96f7335 tarballs/clang-10.0.1.src.tar.xz
diff --git a/util/crossgcc/sum/clang-tools-extra-10.0.1.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-10.0.1.src.tar.xz.cksum
new file mode 100644
index 0000000..1b880c7
--- /dev/null
+++ b/util/crossgcc/sum/clang-tools-extra-10.0.1.src.tar.xz.cksum
@@ -0,0 +1 @@
+26c996da082677aca1016bcf2141dbff01dc7300 tarballs/clang-tools-extra-10.0.1.src.tar.xz
diff --git a/util/crossgcc/sum/clang-tools-extra-9.0.0.src.tar.xz.cksum b/util/crossgcc/sum/clang-tools-extra-9.0.0.src.tar.xz.cksum
deleted file mode 100644
index 47eba2c..0000000
--- a/util/crossgcc/sum/clang-tools-extra-9.0.0.src.tar.xz.cksum
+++ /dev/null
@@ -1 +0,0 @@
-ac64403321d8486699d8bea5376b2438663dbb41 tarballs/clang-tools-extra-9.0.0.src.tar.xz
diff --git a/util/crossgcc/sum/compiler-rt-10.0.1.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-10.0.1.src.tar.xz.cksum
new file mode 100644
index 0000000..2efb413
--- /dev/null
+++ b/util/crossgcc/sum/compiler-rt-10.0.1.src.tar.xz.cksum
@@ -0,0 +1 @@
+ee6077b4728b3c750e476938cead11cea45b49ff tarballs/compiler-rt-10.0.1.src.tar.xz
diff --git a/util/crossgcc/sum/compiler-rt-9.0.0.src.tar.xz.cksum b/util/crossgcc/sum/compiler-rt-9.0.0.src.tar.xz.cksum
deleted file mode 100644
index 15f1a61..0000000
--- a/util/crossgcc/sum/compiler-rt-9.0.0.src.tar.xz.cksum
+++ /dev/null
@@ -1 +0,0 @@
-4e00cb231ff87fd4f970f35b2da86185a612e0e2 tarballs/compiler-rt-9.0.0.src.tar.xz
diff --git a/util/crossgcc/sum/llvm-10.0.1.src.tar.xz.cksum b/util/crossgcc/sum/llvm-10.0.1.src.tar.xz.cksum
new file mode 100644
index 0000000..a6919e8
--- /dev/null
+++ b/util/crossgcc/sum/llvm-10.0.1.src.tar.xz.cksum
@@ -0,0 +1 @@
+25d07260f3b7bf4f647e115c4a663fdeda130fbd tarballs/llvm-10.0.1.src.tar.xz
diff --git a/util/crossgcc/sum/llvm-9.0.0.src.tar.xz.cksum b/util/crossgcc/sum/llvm-9.0.0.src.tar.xz.cksum
deleted file mode 100644
index 4fb1c2d..0000000
--- a/util/crossgcc/sum/llvm-9.0.0.src.tar.xz.cksum
+++ /dev/null
@@ -1 +0,0 @@
-7ef2527ba3da7603a41ce3592a8cd890f8d27ffa tarballs/llvm-9.0.0.src.tar.xz

To view, visit change 39921. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: coreboot
Gerrit-Branch: master
Gerrit-Change-Id: I1d96654fd66a5972c6c5cc24311ca2d889866331
Gerrit-Change-Number: 39921
Gerrit-PatchSet: 8
Gerrit-Owner: HAOUAS Elyes <ehaouas@noos.fr>
Gerrit-Reviewer: Patrick Georgi <pgeorgi@google.com>
Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org>
Gerrit-CC: Paul Menzel <paulepanter@users.sourceforge.net>
Gerrit-MessageType: merged