Skip to content

Commit f8a3f32

Browse files
authored
Upgrade WAMR LLVM from 15.0.7 to 19.1.0 and add AArch64 target support
1 parent 017da1b commit f8a3f32

File tree

3 files changed

+13
-7
lines changed

3 files changed

+13
-7
lines changed

bazel/external/wamr.BUILD

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ cmake(
4747
"-GNinja",
4848
] + select({
4949
"@proxy_wasm_cpp_host//bazel:engine_wamr_jit": [
50-
"-DLLVM_DIR=$EXT_BUILD_DEPS/copy_llvm-15_0_7/llvm/lib/cmake/llvm",
50+
"-DLLVM_DIR=$EXT_BUILD_DEPS/copy_llvm-19_1_0/llvm/lib/cmake/llvm",
5151
"-DWAMR_BUILD_AOT=1",
5252
"-DWAMR_BUILD_FAST_INTERP=0",
5353
"-DWAMR_BUILD_INTERP=0",
@@ -71,7 +71,7 @@ cmake(
7171
}),
7272
out_static_libs = ["libiwasm.a"],
7373
deps = select({
74-
"@proxy_wasm_cpp_host//bazel:engine_wamr_jit": ["@llvm-15_0_7//:llvm_wamr_lib"],
74+
"@proxy_wasm_cpp_host//bazel:engine_wamr_jit": ["@llvm-19_1_0//:llvm_wamr_lib"],
7575
"//conditions:default": [],
7676
}),
7777
)

bazel/external/wamr_llvm.BUILD

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ cmake(
4444
"LLVM_ENABLE_TERMINFO": "off",
4545
"LLVM_ENABLE_ZLIB": "off",
4646
"LLVM_ENABLE_ZSTD": "off",
47-
"LLVM_TARGETS_TO_BUILD": "X86",
47+
"LLVM_TARGETS_TO_BUILD": "X86;AArch64",
4848
"CMAKE_CXX_FLAGS": "-Wno-unused-command-line-argument",
4949
},
5050
# `lld` doesn't work on MacOS
@@ -72,6 +72,12 @@ cmake(
7272
"libLLVMDlltoolDriver.a",
7373
"libLLVMCoverage.a",
7474
"libLLVMLineEditor.a",
75+
"libLLVMAArch64Disassembler.a",
76+
"libLLVMAArch64AsmParser.a",
77+
"libLLVMAArch64CodeGen.a",
78+
"libLLVMAArch64Desc.a",
79+
"libLLVMAArch64Info.a",
80+
"libLLVMAArch64Utils.a",
7581
"libLLVMX86Disassembler.a",
7682
"libLLVMX86AsmParser.a",
7783
"libLLVMX86CodeGen.a",

bazel/repositories.bzl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -312,11 +312,11 @@ def proxy_wasm_cpp_host_repositories():
312312

313313
maybe(
314314
http_archive,
315-
name = "llvm-15_0_7",
315+
name = "llvm-19_1_0",
316316
build_file = "@proxy_wasm_cpp_host//bazel/external:wamr_llvm.BUILD",
317-
sha256 = "8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6",
318-
strip_prefix = "llvm-project-15.0.7.src",
319-
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz",
317+
sha256 = "5042522b49945bc560ff9206f25fb87980a9b89b914193ca00d961511ff0673c",
318+
strip_prefix = "llvm-project-19.1.0.src",
319+
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-19.1.0/llvm-project-19.1.0.src.tar.xz",
320320
)
321321

322322
# WasmEdge with dependencies.

0 commit comments

Comments
 (0)