From 94c491d286644059f1025ed55746df3d34326486 Mon Sep 17 00:00:00 2001
From: "Justin C. Miller" <justin@devjustinian.com>
Date: Wed, 20 Mar 2019 15:40:01 -0700
Subject: [PATCH] Update to LLVM 8.0

---
 scripts/build_sysroot_clang.sh | 11 ++++++-----
 src/kernel/assert.cpp          |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/build_sysroot_clang.sh b/scripts/build_sysroot_clang.sh
index 904de68..b3f4057 100755
--- a/scripts/build_sysroot_clang.sh
+++ b/scripts/build_sysroot_clang.sh
@@ -3,6 +3,7 @@
 TARGET="x86_64-elf"
 NASM_VERSION="2.13.03"
 BINUTILS_VERSION="2.31.1"
+LLVM_BRANCH="release_80"
 
 TOOLS="clang" # lld libunwind libcxxabi libcxx"
 PROJECTS="compiler-rt libcxxabi libcxx libunwind"
@@ -77,7 +78,7 @@ function build_llvm() {
 	if [[ ! -d "${WORK}/llvm" ]]; then
 		echo "Downloading LLVM..."
 		git clone -q \
-			--branch release_70 \
+			--branch "${LLVM_BRANCH}" \
 			--depth 1 \
 			"https://git.llvm.org/git/llvm.git" "${WORK}/llvm"
 	fi
@@ -86,7 +87,7 @@ function build_llvm() {
 		if [[ ! -d "${WORK}/llvm/tools/${tool}" ]]; then
 			echo "Downloading ${tool}..."
 			git clone -q \
-				--branch release_70 \
+				--branch "${LLVM_BRANCH}" \
 				--depth 1 \
 				"https://git.llvm.org/git/${tool}.git" "${WORK}/llvm/tools/${tool}"
 		fi
@@ -95,7 +96,7 @@ function build_llvm() {
 	if [[ ! -d "${WORK}/llvm/tools/clang/tools/extra" ]]; then
 		echo "Downloading clang-tools-extra..."
 		git clone -q \
-			--branch release_70 \
+			--branch "${LLVM_BRANCH}" \
 			--depth 1 \
 			"https://git.llvm.org/git/clang-tools-extra.git" "${WORK}/llvm/tools/clang/tools/extra"
 	fi
@@ -104,7 +105,7 @@ function build_llvm() {
 		if [[ ! -d "${WORK}/llvm/projects/${proj}" ]]; then
 			echo "Downloading ${proj}..."
 			git clone -q \
-				--branch release_70 \
+				--branch "${LLVM_BRANCH}" \
 				--depth 1 \
 				"https://git.llvm.org/git/${proj}.git" "${WORK}/llvm/projects/${proj}"
 		fi
@@ -114,7 +115,7 @@ function build_llvm() {
 		if [[ ! -d "${WORK}/llvm/runtimes/${proj}" ]]; then
 			echo "Downloading ${proj}..."
 			git clone -q \
-				--branch release_70 \
+				--branch "${LLVM_BRANCH}" \
 				--depth 1 \
 				"https://git.llvm.org/git/${proj}.git" "${WORK}/llvm/runtime/${proj}"
 		fi
diff --git a/src/kernel/assert.cpp b/src/kernel/assert.cpp
index 1292bb8..494ae1d 100644
--- a/src/kernel/assert.cpp
+++ b/src/kernel/assert.cpp
@@ -16,6 +16,6 @@ __kernel_assert(const char *file, unsigned line, const char *message)
 		cons->puts("\n");
 	}
 
-	__asm__ ( "int $0e4h" );
+	__asm__ ( "int $0xe4" );
 	while (1) __asm__ ("hlt");
 }