Skip to content

Commit 2be7a28

Browse files
authored
wavm: update to nightly/2021-12-15 with LLVM 12.0.1. (#206)
Signed-off-by: Piotr Sikora <[email protected]>
1 parent aa7216a commit 2be7a28

File tree

3 files changed

+47
-41
lines changed

3 files changed

+47
-41
lines changed

bazel/external/llvm.BUILD

Lines changed: 40 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,13 @@ cmake(
2929
"LLVM_INCLUDE_TOOLS": "off",
3030
"LLVM_BUILD_UTILS": "off",
3131
"LLVM_INCLUDE_UTILS": "off",
32+
"LLVM_ENABLE_IDE": "off",
3233
"LLVM_ENABLE_LIBEDIT": "off",
3334
"LLVM_ENABLE_LIBXML2": "off",
3435
"LLVM_ENABLE_TERMINFO": "off",
3536
"LLVM_ENABLE_ZLIB": "off",
3637
"LLVM_TARGETS_TO_BUILD": "X86",
37-
# Workaround for the issue with statically linked libstdc++
38-
# using -l:libstdc++.a.
39-
"CMAKE_CXX_FLAGS": "-lstdc++",
38+
"CMAKE_CXX_FLAGS": "-Wno-unused-command-line-argument",
4039
},
4140
env_vars = {
4241
# Workaround for the -DDEBUG flag added in fastbuild on macOS,
@@ -48,63 +47,72 @@ cmake(
4847
generate_args = ["-GNinja"],
4948
lib_source = ":srcs",
5049
out_static_libs = [
51-
"libLLVMInterpreter.a",
5250
"libLLVMWindowsManifest.a",
51+
"libLLVMXRay.a",
5352
"libLLVMLibDriver.a",
54-
"libLLVMObjectYAML.a",
53+
"libLLVMDlltoolDriver.a",
5554
"libLLVMCoverage.a",
5655
"libLLVMLineEditor.a",
57-
"libLLVMDlltoolDriver.a",
58-
"libLLVMOption.a",
59-
"libLLVMTableGen.a",
60-
"libLLVMFuzzMutate.a",
56+
"libLLVMX86Disassembler.a",
57+
"libLLVMX86AsmParser.a",
58+
"libLLVMX86CodeGen.a",
59+
"libLLVMX86Desc.a",
60+
"libLLVMX86Info.a",
61+
"libLLVMOrcJIT.a",
62+
"libLLVMMCJIT.a",
63+
"libLLVMJITLink.a",
64+
"libLLVMOrcTargetProcess.a",
65+
"libLLVMOrcShared.a",
66+
"libLLVMInterpreter.a",
67+
"libLLVMExecutionEngine.a",
68+
"libLLVMRuntimeDyld.a",
6169
"libLLVMSymbolize.a",
62-
"libLLVMCoroutines.a",
6370
"libLLVMDebugInfoPDB.a",
71+
"libLLVMDebugInfoGSYM.a",
72+
"libLLVMOption.a",
73+
"libLLVMObjectYAML.a",
74+
"libLLVMMCA.a",
75+
"libLLVMMCDisassembler.a",
6476
"libLLVMLTO.a",
65-
"libLLVMObjCARCOpts.a",
66-
"libLLVMMIRParser.a",
67-
"libLLVMOrcJIT.a",
68-
"libLLVMOrcError.a",
69-
"libLLVMJITLink.a",
7077
"libLLVMPasses.a",
78+
"libLLVMCFGuard.a",
79+
"libLLVMCoroutines.a",
80+
"libLLVMObjCARCOpts.a",
81+
"libLLVMHelloNew.a",
7182
"libLLVMipo.a",
72-
"libLLVMInstrumentation.a",
7383
"libLLVMVectorize.a",
7484
"libLLVMLinker.a",
75-
"libLLVMIRReader.a",
76-
"libLLVMAsmParser.a",
77-
"libLLVMX86Disassembler.a",
78-
"libLLVMX86AsmParser.a",
79-
"libLLVMX86CodeGen.a",
80-
"libLLVMCFGuard.a",
85+
"libLLVMInstrumentation.a",
86+
"libLLVMFrontendOpenMP.a",
87+
"libLLVMFrontendOpenACC.a",
88+
"libLLVMExtensions.a",
89+
"libLLVMDWARFLinker.a",
8190
"libLLVMGlobalISel.a",
82-
"libLLVMSelectionDAG.a",
91+
"libLLVMMIRParser.a",
8392
"libLLVMAsmPrinter.a",
8493
"libLLVMDebugInfoDWARF.a",
94+
"libLLVMSelectionDAG.a",
8595
"libLLVMCodeGen.a",
96+
"libLLVMIRReader.a",
97+
"libLLVMAsmParser.a",
98+
"libLLVMInterfaceStub.a",
99+
"libLLVMFileCheck.a",
100+
"libLLVMFuzzMutate.a",
101+
"libLLVMTarget.a",
86102
"libLLVMScalarOpts.a",
87103
"libLLVMInstCombine.a",
88104
"libLLVMAggressiveInstCombine.a",
89105
"libLLVMTransformUtils.a",
90106
"libLLVMBitWriter.a",
91-
"libLLVMX86Desc.a",
92-
"libLLVMMCDisassembler.a",
93-
"libLLVMX86Utils.a",
94-
"libLLVMX86Info.a",
95-
"libLLVMMCJIT.a",
96-
"libLLVMExecutionEngine.a",
97-
"libLLVMTarget.a",
98107
"libLLVMAnalysis.a",
99108
"libLLVMProfileData.a",
100-
"libLLVMRuntimeDyld.a",
101109
"libLLVMObject.a",
102110
"libLLVMTextAPI.a",
103111
"libLLVMMCParser.a",
104-
"libLLVMBitReader.a",
105112
"libLLVMMC.a",
106113
"libLLVMDebugInfoCodeView.a",
107114
"libLLVMDebugInfoMSF.a",
115+
"libLLVMBitReader.a",
108116
"libLLVMCore.a",
109117
"libLLVMRemarks.a",
110118
"libLLVMBitstreamReader.a",

bazel/external/wavm.BUILD

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ cmake(
1616
"WAVM_ENABLE_STATIC_LINKING": "on",
1717
"WAVM_ENABLE_RELEASE_ASSERTS": "on",
1818
"WAVM_ENABLE_UNWIND": "on",
19-
# Workaround for the issue with statically linked libstdc++
20-
# using -l:libstdc++.a.
21-
"CMAKE_CXX_FLAGS": "-lstdc++ -Wno-unused-command-line-argument",
19+
"CMAKE_CXX_FLAGS": "-Wno-unused-command-line-argument",
2220
},
2321
env_vars = {
2422
# Workaround for the -DDEBUG flag added in fastbuild on macOS,

bazel/repositories.bzl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,17 @@ def proxy_wasm_cpp_host_repositories():
9494
http_archive(
9595
name = "llvm",
9696
build_file = "@proxy_wasm_cpp_host//bazel/external:llvm.BUILD",
97-
sha256 = "df83a44b3a9a71029049ec101fb0077ecbbdf5fe41e395215025779099a98fdf",
98-
strip_prefix = "llvm-10.0.0.src",
99-
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/llvm-10.0.0.src.tar.xz",
97+
sha256 = "7d9a8405f557cefc5a21bf5672af73903b64749d9bc3a50322239f56f34ffddf",
98+
strip_prefix = "llvm-12.0.1.src",
99+
url = "https://github.com/llvm/llvm-project/releases/download/llvmorg-12.0.1/llvm-12.0.1.src.tar.xz",
100100
)
101101

102102
http_archive(
103103
name = "com_github_wavm_wavm",
104104
build_file = "@proxy_wasm_cpp_host//bazel/external:wavm.BUILD",
105-
sha256 = "fa9a8dece0f1a51f8789c07f7f0c1f817ceee54c57d85f22ab958e43cde648d3",
106-
strip_prefix = "WAVM-93c3ad73e2938f19c8bb26d4f456b39d6bc4ca01",
107-
url = "https://github.com/WAVM/WAVM/archive/93c3ad73e2938f19c8bb26d4f456b39d6bc4ca01.tar.gz",
105+
sha256 = "bf2b2aec8a4c6a5413081c0527cb40dd16cb67e9c74a91f8a82fe1cf27a3c5d5",
106+
strip_prefix = "WAVM-c8997ebf154f3b42e688e670a7d0fa045b7a32a0",
107+
url = "https://github.com/WAVM/WAVM/archive/c8997ebf154f3b42e688e670a7d0fa045b7a32a0.tar.gz",
108108
)
109109

110110
native.bind(

0 commit comments

Comments
 (0)