Skip to content

Commit

Permalink
llvm: bump to version 18 rc2 to fix the frontend bug with openmp
Browse files Browse the repository at this point in the history
  • Loading branch information
csegarragonz committed Feb 20, 2024
1 parent ca0d78e commit 2ca4ee6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
1 change: 1 addition & 0 deletions LLVM.makefile
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ LIBCXX_CMAKE_FLAGS = \
-DLIBCXXABI_HAS_EXTERNAL_THREAD_API:BOOL=OFF \
-DLIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY:BOOL=OFF \
-DLIBCXXABI_HAS_WIN32_THREAD_API:BOOL=OFF \
-DLIBCXXABI_USE_LLVM_UNWINDER=OFF \
-DLIBCXX_ENABLE_PIC:BOOL=$(2) \
-DUNIX:BOOL=ON \
--debug-trycompile
Expand Down
6 changes: 4 additions & 2 deletions docker/llvm.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,10 @@ RUN apt update \
&& apt install -y \
autoconf \
build-essential \
# This clang version is needed to help us build LLVM from source below
clang-${LLVM_VERSION_MAJOR} \
# This clang version is needed to help us build LLVM from source below.
# Pin it to one number as it can drift away from the WASM-compiling
# LLVM version
clang-17 \
curl \
git \
gpg \
Expand Down
3 changes: 2 additions & 1 deletion faasmtools/env.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@
VERSION_FILE = join(PROJ_ROOT, "VERSION")

# LLVM variables
LLVM_VERSION = "17.0.6"
# LLVM_VERSION = "17.0.6"
LLVM_VERSION = "18.1.0-rc2"
LLVM_DIR = join("/opt", "llvm-project")
LLVM_MAKEFILE = join(PROJ_ROOT, "LLVM.makefile")
WASI_LIBC_DIR = join(THIRD_PARTY_DIR, "wasi-libc")
Expand Down
6 changes: 0 additions & 6 deletions tasks/llvm.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,6 @@ def do_llvm_clone():
git_cmd = " ".join(git_cmd)
run(git_cmd, shell=True, check=True)

# TODO: do we even need this patch anymore?
# llvm_patches_dir = join(PATCHES_DIR, "llvm-project")
# for patch in listdir(llvm_patches_dir):
# git_cmd = "git apply {}".format(join(llvm_patches_dir, patch))
# run(git_cmd, shell=True, check=True, cwd=LLVM_DIR)


def do_llvm_build(target, clean_target=None):
build_env = environ.copy()
Expand Down

0 comments on commit 2ca4ee6

Please sign in to comment.