justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Update to LLVM 8.0

Browse Source
This commit is contained in:
Justin C. Miller
2019-03-20 15:40:01 -07:00
parent 645938a194
commit 94c491d286
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/build_sysroot_clang.sh
View File

@@ -3,6 +3,7 @@
TARGET="x86_64-elf" TARGET="x86_64-elf"
NASM_VERSION="2.13.03" NASM_VERSION="2.13.03"
BINUTILS_VERSION="2.31.1" BINUTILS_VERSION="2.31.1"
LLVM_BRANCH="release_80"
TOOLS="clang" # lld libunwind libcxxabi libcxx" TOOLS="clang" # lld libunwind libcxxabi libcxx"
PROJECTS="compiler-rt libcxxabi libcxx libunwind" PROJECTS="compiler-rt libcxxabi libcxx libunwind"
@@ -77,7 +78,7 @@ function build_llvm() {
if [[ ! -d "${WORK}/llvm" ]]; then if [[ ! -d "${WORK}/llvm" ]]; then
echo "Downloading LLVM..." echo "Downloading LLVM..."
git clone -q \ git clone -q \
--branch release_70 \ --branch "${LLVM_BRANCH}" \
--depth 1 \ --depth 1 \
"https://git.llvm.org/git/llvm.git" "${WORK}/llvm" "https://git.llvm.org/git/llvm.git" "${WORK}/llvm"
fi fi
@@ -86,7 +87,7 @@ function build_llvm() {
if [[ ! -d "${WORK}/llvm/tools/${tool}" ]]; then if [[ ! -d "${WORK}/llvm/tools/${tool}" ]]; then
echo "Downloading ${tool}..." echo "Downloading ${tool}..."
git clone -q \ git clone -q \
--branch release_70 \ --branch "${LLVM_BRANCH}" \
--depth 1 \ --depth 1 \
"https://git.llvm.org/git/${tool}.git" "${WORK}/llvm/tools/${tool}" "https://git.llvm.org/git/${tool}.git" "${WORK}/llvm/tools/${tool}"
fi fi
@@ -95,7 +96,7 @@ function build_llvm() {
if [[ ! -d "${WORK}/llvm/tools/clang/tools/extra" ]]; then if [[ ! -d "${WORK}/llvm/tools/clang/tools/extra" ]]; then
echo "Downloading clang-tools-extra..." echo "Downloading clang-tools-extra..."
git clone -q \ git clone -q \
--branch release_70 \ --branch "${LLVM_BRANCH}" \
--depth 1 \ --depth 1 \
"https://git.llvm.org/git/clang-tools-extra.git" "${WORK}/llvm/tools/clang/tools/extra" "https://git.llvm.org/git/clang-tools-extra.git" "${WORK}/llvm/tools/clang/tools/extra"
fi fi
@@ -104,7 +105,7 @@ function build_llvm() {
if [[ ! -d "${WORK}/llvm/projects/${proj}" ]]; then if [[ ! -d "${WORK}/llvm/projects/${proj}" ]]; then
echo "Downloading ${proj}..." echo "Downloading ${proj}..."
git clone -q \ git clone -q \
--branch release_70 \ --branch "${LLVM_BRANCH}" \
--depth 1 \ --depth 1 \
"https://git.llvm.org/git/${proj}.git" "${WORK}/llvm/projects/${proj}" "https://git.llvm.org/git/${proj}.git" "${WORK}/llvm/projects/${proj}"
fi fi
@@ -114,7 +115,7 @@ function build_llvm() {
if [[ ! -d "${WORK}/llvm/runtimes/${proj}" ]]; then if [[ ! -d "${WORK}/llvm/runtimes/${proj}" ]]; then
echo "Downloading ${proj}..." echo "Downloading ${proj}..."
git clone -q \ git clone -q \
--branch release_70 \ --branch "${LLVM_BRANCH}" \
--depth 1 \ --depth 1 \
"https://git.llvm.org/git/${proj}.git" "${WORK}/llvm/runtime/${proj}" "https://git.llvm.org/git/${proj}.git" "${WORK}/llvm/runtime/${proj}"
fi fi

2
src/kernel/assert.cpp
View File

@@ -16,6 +16,6 @@ __kernel_assert(const char *file, unsigned line, const char *message)
cons->puts("\n"); cons->puts("\n");
} }
__asm__ ( "int $0e4h" ); __asm__ ( "int $0xe4" );
while (1) __asm__ ("hlt"); while (1) __asm__ ("hlt");
} }