authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-07-03 18:41:43-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-07-03 18:41:43-07:00
log15bdba410a37464f588f0ec1ddde2dfeb9694c16
tree3ce46860b866bb580a52ba52b71d1c24d08b8cac
parentd588f88b1a46fc3719db50ae81e2354461c1d0da

update build scripts to LLD and LLVM 14 libraries

4 files changed, 23 insertions(+), 22 deletions(-)

build.zig+9-13
......@@ -76,11 +76,6 @@ pub fn build(b: *Builder) !void {
7676 "llvm-has-csky",
7777 "Whether LLVM has the experimental target csky enabled",
7878 ) orelse false;
79 const llvm_has_ve = b.option(
80 bool,
81 "llvm-has-ve",
82 "Whether LLVM has the experimental target ve enabled",
83 ) orelse false;
8479 const llvm_has_arc = b.option(
8580 bool,
8681 "llvm-has-arc",
......@@ -172,7 +167,6 @@ pub fn build(b: *Builder) !void {
172167 exe_options.addOption(bool, "have_llvm", enable_llvm);
173168 exe_options.addOption(bool, "llvm_has_m68k", llvm_has_m68k);
174169 exe_options.addOption(bool, "llvm_has_csky", llvm_has_csky);
175 exe_options.addOption(bool, "llvm_has_ve", llvm_has_ve);
176170 exe_options.addOption(bool, "llvm_has_arc", llvm_has_arc);
177171 exe_options.addOption(bool, "force_gpa", force_gpa);
178172
......@@ -396,7 +390,6 @@ pub fn build(b: *Builder) !void {
396390 test_cases_options.addOption(bool, "have_llvm", enable_llvm);
397391 test_cases_options.addOption(bool, "llvm_has_m68k", llvm_has_m68k);
398392 test_cases_options.addOption(bool, "llvm_has_csky", llvm_has_csky);
399 test_cases_options.addOption(bool, "llvm_has_ve", llvm_has_ve);
400393 test_cases_options.addOption(bool, "llvm_has_arc", llvm_has_arc);
401394 test_cases_options.addOption(bool, "force_gpa", force_gpa);
402395 test_cases_options.addOption(bool, "enable_qemu", b.enable_qemu);
......@@ -997,15 +990,11 @@ const clang_libs = [_][]const u8{
997990 "clangToolingCore",
998991};
999992const lld_libs = [_][]const u8{
1000 "lldDriver",
1001993 "lldMinGW",
1002994 "lldELF",
1003995 "lldCOFF",
1004 "lldMachO",
1005996 "lldWasm",
1006 "lldReaderWriter",
1007 "lldCore",
1008 "lldYAML",
997 "lldMachO",
1009998 "lldCommon",
1010999};
10111000// This list can be re-generated with `llvm-config --libfiles` and then
......@@ -1023,6 +1012,7 @@ const llvm_libs = [_][]const u8{
10231012 "LLVMXCoreCodeGen",
10241013 "LLVMXCoreDesc",
10251014 "LLVMXCoreInfo",
1015 "LLVMX86TargetMCA",
10261016 "LLVMX86Disassembler",
10271017 "LLVMX86AsmParser",
10281018 "LLVMX86CodeGen",
......@@ -1034,6 +1024,11 @@ const llvm_libs = [_][]const u8{
10341024 "LLVMWebAssemblyDesc",
10351025 "LLVMWebAssemblyUtils",
10361026 "LLVMWebAssemblyInfo",
1027 "LLVMVEDisassembler",
1028 "LLVMVEAsmParser",
1029 "LLVMVECodeGen",
1030 "LLVMVEDesc",
1031 "LLVMVEInfo",
10371032 "LLVMSystemZDisassembler",
10381033 "LLVMSystemZAsmParser",
10391034 "LLVMSystemZCodeGen",
......@@ -1093,6 +1088,7 @@ const llvm_libs = [_][]const u8{
10931088 "LLVMARMDesc",
10941089 "LLVMARMUtils",
10951090 "LLVMARMInfo",
1091 "LLVMAMDGPUTargetMCA",
10961092 "LLVMAMDGPUDisassembler",
10971093 "LLVMAMDGPUAsmParser",
10981094 "LLVMAMDGPUCodeGen",
......@@ -1138,7 +1134,6 @@ const llvm_libs = [_][]const u8{
11381134 "LLVMMIRParser",
11391135 "LLVMAsmPrinter",
11401136 "LLVMDebugInfoMSF",
1141 "LLVMDebugInfoDWARF",
11421137 "LLVMSelectionDAG",
11431138 "LLVMCodeGen",
11441139 "LLVMIRReader",
......@@ -1154,6 +1149,7 @@ const llvm_libs = [_][]const u8{
11541149 "LLVMBitWriter",
11551150 "LLVMAnalysis",
11561151 "LLVMProfileData",
1152 "LLVMDebugInfoDWARF",
11571153 "LLVMObject",
11581154 "LLVMTextAPI",
11591155 "LLVMMCParser",
cmake/Findllvm.cmake+9-1
......@@ -126,6 +126,7 @@ elseif(ZIG_USE_LLVM_CONFIG)
126126 NEED_TARGET("RISCV")
127127 NEED_TARGET("Sparc")
128128 NEED_TARGET("SystemZ")
129 NEED_TARGET("VE")
129130 NEED_TARGET("WebAssembly")
130131 NEED_TARGET("X86")
131132 NEED_TARGET("XCore")
......@@ -200,6 +201,7 @@ else()
200201 FIND_AND_ADD_LLVM_LIB(LLVMXCoreCodeGen)
201202 FIND_AND_ADD_LLVM_LIB(LLVMXCoreDesc)
202203 FIND_AND_ADD_LLVM_LIB(LLVMXCoreInfo)
204 FIND_AND_ADD_LLVM_LIB(LLVMX86TargetMCA)
203205 FIND_AND_ADD_LLVM_LIB(LLVMX86Disassembler)
204206 FIND_AND_ADD_LLVM_LIB(LLVMX86AsmParser)
205207 FIND_AND_ADD_LLVM_LIB(LLVMX86CodeGen)
......@@ -211,6 +213,11 @@ else()
211213 FIND_AND_ADD_LLVM_LIB(LLVMWebAssemblyDesc)
212214 FIND_AND_ADD_LLVM_LIB(LLVMWebAssemblyUtils)
213215 FIND_AND_ADD_LLVM_LIB(LLVMWebAssemblyInfo)
216 FIND_AND_ADD_LLVM_LIB(LLVMVEDisassembler)
217 FIND_AND_ADD_LLVM_LIB(LLVMVEAsmParser)
218 FIND_AND_ADD_LLVM_LIB(LLVMVECodeGen)
219 FIND_AND_ADD_LLVM_LIB(LLVMVEDesc)
220 FIND_AND_ADD_LLVM_LIB(LLVMVEInfo)
214221 FIND_AND_ADD_LLVM_LIB(LLVMSystemZDisassembler)
215222 FIND_AND_ADD_LLVM_LIB(LLVMSystemZAsmParser)
216223 FIND_AND_ADD_LLVM_LIB(LLVMSystemZCodeGen)
......@@ -270,6 +277,7 @@ else()
270277 FIND_AND_ADD_LLVM_LIB(LLVMARMDesc)
271278 FIND_AND_ADD_LLVM_LIB(LLVMARMUtils)
272279 FIND_AND_ADD_LLVM_LIB(LLVMARMInfo)
280 FIND_AND_ADD_LLVM_LIB(LLVMAMDGPUTargetMCA)
273281 FIND_AND_ADD_LLVM_LIB(LLVMAMDGPUDisassembler)
274282 FIND_AND_ADD_LLVM_LIB(LLVMAMDGPUAsmParser)
275283 FIND_AND_ADD_LLVM_LIB(LLVMAMDGPUCodeGen)
......@@ -315,7 +323,6 @@ else()
315323 FIND_AND_ADD_LLVM_LIB(LLVMMIRParser)
316324 FIND_AND_ADD_LLVM_LIB(LLVMAsmPrinter)
317325 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoMSF)
318 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoDWARF)
319326 FIND_AND_ADD_LLVM_LIB(LLVMSelectionDAG)
320327 FIND_AND_ADD_LLVM_LIB(LLVMCodeGen)
321328 FIND_AND_ADD_LLVM_LIB(LLVMIRReader)
......@@ -331,6 +338,7 @@ else()
331338 FIND_AND_ADD_LLVM_LIB(LLVMBitWriter)
332339 FIND_AND_ADD_LLVM_LIB(LLVMAnalysis)
333340 FIND_AND_ADD_LLVM_LIB(LLVMProfileData)
341 FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoDWARF)
334342 FIND_AND_ADD_LLVM_LIB(LLVMObject)
335343 FIND_AND_ADD_LLVM_LIB(LLVMTextAPI)
336344 FIND_AND_ADD_LLVM_LIB(LLVMMCParser)
src/codegen/llvm.zig+5-7
......@@ -8745,13 +8745,11 @@ fn initializeLLVMTarget(arch: std.Target.Cpu.Arch) void {
87458745 }
87468746 },
87478747 .ve => {
8748 if (build_options.llvm_has_ve) {
8749 llvm.LLVMInitializeVETarget();
8750 llvm.LLVMInitializeVETargetInfo();
8751 llvm.LLVMInitializeVETargetMC();
8752 llvm.LLVMInitializeVEAsmPrinter();
8753 llvm.LLVMInitializeVEAsmParser();
8754 }
8748 llvm.LLVMInitializeVETarget();
8749 llvm.LLVMInitializeVETargetInfo();
8750 llvm.LLVMInitializeVETargetMC();
8751 llvm.LLVMInitializeVEAsmPrinter();
8752 llvm.LLVMInitializeVEAsmParser();
87558753 },
87568754 .arc => {
87578755 if (build_options.llvm_has_arc) {
src/config.zig.in-1
......@@ -1,7 +1,6 @@
11pub const have_llvm = true;
22pub const llvm_has_m68k = false;
33pub const llvm_has_csky = false;
4pub const llvm_has_ve = false;
54pub const llvm_has_arc = false;
65pub const version: [:0]const u8 = "@ZIG_VERSION@";
76pub const semver = @import("std").SemanticVersion.parse(version) catch unreachable;