| author |  Andrew Kelley <andrew@ziglang.org> 2022-07-03 18:41:43-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2022-07-03 18:41:43-07:00 |
| log | 15bdba410a37464f588f0ec1ddde2dfeb9694c16 |
| tree | 3ce46860b866bb580a52ba52b71d1c24d08b8cac |
| parent | d588f88b1a46fc3719db50ae81e2354461c1d0da |
update build scripts to LLD and LLVM 14 libraries
4 files changed, 23 insertions(+), 22 deletions(-)
- build.zig
cmake- src
- codegen
- config.zig.in
build.zig+9-13
| ... | @@ -76,11 +76,6 @@ pub fn build(b: *Builder) !void { | ... | @@ -76,11 +76,6 @@ pub fn build(b: *Builder) !void { |
| 76 | "llvm-has-csky", | 76 | "llvm-has-csky", |
| 77 | "Whether LLVM has the experimental target csky enabled", | 77 | "Whether LLVM has the experimental target csky enabled", |
| 78 | ) orelse false; | 78 | ) 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; | ||
| 84 | const llvm_has_arc = b.option( | 79 | const llvm_has_arc = b.option( |
| 85 | bool, | 80 | bool, |
| 86 | "llvm-has-arc", | 81 | "llvm-has-arc", |
| ... | @@ -172,7 +167,6 @@ pub fn build(b: *Builder) !void { | ... | @@ -172,7 +167,6 @@ pub fn build(b: *Builder) !void { |
| 172 | exe_options.addOption(bool, "have_llvm", enable_llvm); | 167 | exe_options.addOption(bool, "have_llvm", enable_llvm); |
| 173 | exe_options.addOption(bool, "llvm_has_m68k", llvm_has_m68k); | 168 | exe_options.addOption(bool, "llvm_has_m68k", llvm_has_m68k); |
| 174 | exe_options.addOption(bool, "llvm_has_csky", llvm_has_csky); | 169 | exe_options.addOption(bool, "llvm_has_csky", llvm_has_csky); |
| 175 | exe_options.addOption(bool, "llvm_has_ve", llvm_has_ve); | ||
| 176 | exe_options.addOption(bool, "llvm_has_arc", llvm_has_arc); | 170 | exe_options.addOption(bool, "llvm_has_arc", llvm_has_arc); |
| 177 | exe_options.addOption(bool, "force_gpa", force_gpa); | 171 | exe_options.addOption(bool, "force_gpa", force_gpa); |
| 178 | 172 | ||
| ... | @@ -396,7 +390,6 @@ pub fn build(b: *Builder) !void { | ... | @@ -396,7 +390,6 @@ pub fn build(b: *Builder) !void { |
| 396 | test_cases_options.addOption(bool, "have_llvm", enable_llvm); | 390 | test_cases_options.addOption(bool, "have_llvm", enable_llvm); |
| 397 | test_cases_options.addOption(bool, "llvm_has_m68k", llvm_has_m68k); | 391 | test_cases_options.addOption(bool, "llvm_has_m68k", llvm_has_m68k); |
| 398 | test_cases_options.addOption(bool, "llvm_has_csky", llvm_has_csky); | 392 | test_cases_options.addOption(bool, "llvm_has_csky", llvm_has_csky); |
| 399 | test_cases_options.addOption(bool, "llvm_has_ve", llvm_has_ve); | ||
| 400 | test_cases_options.addOption(bool, "llvm_has_arc", llvm_has_arc); | 393 | test_cases_options.addOption(bool, "llvm_has_arc", llvm_has_arc); |
| 401 | test_cases_options.addOption(bool, "force_gpa", force_gpa); | 394 | test_cases_options.addOption(bool, "force_gpa", force_gpa); |
| 402 | test_cases_options.addOption(bool, "enable_qemu", b.enable_qemu); | 395 | test_cases_options.addOption(bool, "enable_qemu", b.enable_qemu); |
| ... | @@ -997,15 +990,11 @@ const clang_libs = [_][]const u8{ | ... | @@ -997,15 +990,11 @@ const clang_libs = [_][]const u8{ |
| 997 | "clangToolingCore", | 990 | "clangToolingCore", |
| 998 | }; | 991 | }; |
| 999 | const lld_libs = [_][]const u8{ | 992 | const lld_libs = [_][]const u8{ |
| 1000 | "lldDriver", | ||
| 1001 | "lldMinGW", | 993 | "lldMinGW", |
| 1002 | "lldELF", | 994 | "lldELF", |
| 1003 | "lldCOFF", | 995 | "lldCOFF", |
| 1004 | "lldMachO", | ||
| 1005 | "lldWasm", | 996 | "lldWasm", |
| 1006 | "lldReaderWriter", | 997 | "lldMachO", |
| 1007 | "lldCore", | ||
| 1008 | "lldYAML", | ||
| 1009 | "lldCommon", | 998 | "lldCommon", |
| 1010 | }; | 999 | }; |
| 1011 | // This list can be re-generated with `llvm-config --libfiles` and then | 1000 | // This list can be re-generated with `llvm-config --libfiles` and then |
| ... | @@ -1023,6 +1012,7 @@ const llvm_libs = [_][]const u8{ | ... | @@ -1023,6 +1012,7 @@ const llvm_libs = [_][]const u8{ |
| 1023 | "LLVMXCoreCodeGen", | 1012 | "LLVMXCoreCodeGen", |
| 1024 | "LLVMXCoreDesc", | 1013 | "LLVMXCoreDesc", |
| 1025 | "LLVMXCoreInfo", | 1014 | "LLVMXCoreInfo", |
| 1015 | "LLVMX86TargetMCA", | ||
| 1026 | "LLVMX86Disassembler", | 1016 | "LLVMX86Disassembler", |
| 1027 | "LLVMX86AsmParser", | 1017 | "LLVMX86AsmParser", |
| 1028 | "LLVMX86CodeGen", | 1018 | "LLVMX86CodeGen", |
| ... | @@ -1034,6 +1024,11 @@ const llvm_libs = [_][]const u8{ | ... | @@ -1034,6 +1024,11 @@ const llvm_libs = [_][]const u8{ |
| 1034 | "LLVMWebAssemblyDesc", | 1024 | "LLVMWebAssemblyDesc", |
| 1035 | "LLVMWebAssemblyUtils", | 1025 | "LLVMWebAssemblyUtils", |
| 1036 | "LLVMWebAssemblyInfo", | 1026 | "LLVMWebAssemblyInfo", |
| 1027 | "LLVMVEDisassembler", | ||
| 1028 | "LLVMVEAsmParser", | ||
| 1029 | "LLVMVECodeGen", | ||
| 1030 | "LLVMVEDesc", | ||
| 1031 | "LLVMVEInfo", | ||
| 1037 | "LLVMSystemZDisassembler", | 1032 | "LLVMSystemZDisassembler", |
| 1038 | "LLVMSystemZAsmParser", | 1033 | "LLVMSystemZAsmParser", |
| 1039 | "LLVMSystemZCodeGen", | 1034 | "LLVMSystemZCodeGen", |
| ... | @@ -1093,6 +1088,7 @@ const llvm_libs = [_][]const u8{ | ... | @@ -1093,6 +1088,7 @@ const llvm_libs = [_][]const u8{ |
| 1093 | "LLVMARMDesc", | 1088 | "LLVMARMDesc", |
| 1094 | "LLVMARMUtils", | 1089 | "LLVMARMUtils", |
| 1095 | "LLVMARMInfo", | 1090 | "LLVMARMInfo", |
| 1091 | "LLVMAMDGPUTargetMCA", | ||
| 1096 | "LLVMAMDGPUDisassembler", | 1092 | "LLVMAMDGPUDisassembler", |
| 1097 | "LLVMAMDGPUAsmParser", | 1093 | "LLVMAMDGPUAsmParser", |
| 1098 | "LLVMAMDGPUCodeGen", | 1094 | "LLVMAMDGPUCodeGen", |
| ... | @@ -1138,7 +1134,6 @@ const llvm_libs = [_][]const u8{ | ... | @@ -1138,7 +1134,6 @@ const llvm_libs = [_][]const u8{ |
| 1138 | "LLVMMIRParser", | 1134 | "LLVMMIRParser", |
| 1139 | "LLVMAsmPrinter", | 1135 | "LLVMAsmPrinter", |
| 1140 | "LLVMDebugInfoMSF", | 1136 | "LLVMDebugInfoMSF", |
| 1141 | "LLVMDebugInfoDWARF", | ||
| 1142 | "LLVMSelectionDAG", | 1137 | "LLVMSelectionDAG", |
| 1143 | "LLVMCodeGen", | 1138 | "LLVMCodeGen", |
| 1144 | "LLVMIRReader", | 1139 | "LLVMIRReader", |
| ... | @@ -1154,6 +1149,7 @@ const llvm_libs = [_][]const u8{ | ... | @@ -1154,6 +1149,7 @@ const llvm_libs = [_][]const u8{ |
| 1154 | "LLVMBitWriter", | 1149 | "LLVMBitWriter", |
| 1155 | "LLVMAnalysis", | 1150 | "LLVMAnalysis", |
| 1156 | "LLVMProfileData", | 1151 | "LLVMProfileData", |
| 1152 | "LLVMDebugInfoDWARF", | ||
| 1157 | "LLVMObject", | 1153 | "LLVMObject", |
| 1158 | "LLVMTextAPI", | 1154 | "LLVMTextAPI", |
| 1159 | "LLVMMCParser", | 1155 | "LLVMMCParser", |
cmake/Findllvm.cmake+9-1
| ... | @@ -126,6 +126,7 @@ elseif(ZIG_USE_LLVM_CONFIG) | ... | @@ -126,6 +126,7 @@ elseif(ZIG_USE_LLVM_CONFIG) |
| 126 | NEED_TARGET("RISCV") | 126 | NEED_TARGET("RISCV") |
| 127 | NEED_TARGET("Sparc") | 127 | NEED_TARGET("Sparc") |
| 128 | NEED_TARGET("SystemZ") | 128 | NEED_TARGET("SystemZ") |
| 129 | NEED_TARGET("VE") | ||
| 129 | NEED_TARGET("WebAssembly") | 130 | NEED_TARGET("WebAssembly") |
| 130 | NEED_TARGET("X86") | 131 | NEED_TARGET("X86") |
| 131 | NEED_TARGET("XCore") | 132 | NEED_TARGET("XCore") |
| ... | @@ -200,6 +201,7 @@ else() | ... | @@ -200,6 +201,7 @@ else() |
| 200 | FIND_AND_ADD_LLVM_LIB(LLVMXCoreCodeGen) | 201 | FIND_AND_ADD_LLVM_LIB(LLVMXCoreCodeGen) |
| 201 | FIND_AND_ADD_LLVM_LIB(LLVMXCoreDesc) | 202 | FIND_AND_ADD_LLVM_LIB(LLVMXCoreDesc) |
| 202 | FIND_AND_ADD_LLVM_LIB(LLVMXCoreInfo) | 203 | FIND_AND_ADD_LLVM_LIB(LLVMXCoreInfo) |
| 204 | FIND_AND_ADD_LLVM_LIB(LLVMX86TargetMCA) | ||
| 203 | FIND_AND_ADD_LLVM_LIB(LLVMX86Disassembler) | 205 | FIND_AND_ADD_LLVM_LIB(LLVMX86Disassembler) |
| 204 | FIND_AND_ADD_LLVM_LIB(LLVMX86AsmParser) | 206 | FIND_AND_ADD_LLVM_LIB(LLVMX86AsmParser) |
| 205 | FIND_AND_ADD_LLVM_LIB(LLVMX86CodeGen) | 207 | FIND_AND_ADD_LLVM_LIB(LLVMX86CodeGen) |
| ... | @@ -211,6 +213,11 @@ else() | ... | @@ -211,6 +213,11 @@ else() |
| 211 | FIND_AND_ADD_LLVM_LIB(LLVMWebAssemblyDesc) | 213 | FIND_AND_ADD_LLVM_LIB(LLVMWebAssemblyDesc) |
| 212 | FIND_AND_ADD_LLVM_LIB(LLVMWebAssemblyUtils) | 214 | FIND_AND_ADD_LLVM_LIB(LLVMWebAssemblyUtils) |
| 213 | FIND_AND_ADD_LLVM_LIB(LLVMWebAssemblyInfo) | 215 | 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) | ||
| 214 | FIND_AND_ADD_LLVM_LIB(LLVMSystemZDisassembler) | 221 | FIND_AND_ADD_LLVM_LIB(LLVMSystemZDisassembler) |
| 215 | FIND_AND_ADD_LLVM_LIB(LLVMSystemZAsmParser) | 222 | FIND_AND_ADD_LLVM_LIB(LLVMSystemZAsmParser) |
| 216 | FIND_AND_ADD_LLVM_LIB(LLVMSystemZCodeGen) | 223 | FIND_AND_ADD_LLVM_LIB(LLVMSystemZCodeGen) |
| ... | @@ -270,6 +277,7 @@ else() | ... | @@ -270,6 +277,7 @@ else() |
| 270 | FIND_AND_ADD_LLVM_LIB(LLVMARMDesc) | 277 | FIND_AND_ADD_LLVM_LIB(LLVMARMDesc) |
| 271 | FIND_AND_ADD_LLVM_LIB(LLVMARMUtils) | 278 | FIND_AND_ADD_LLVM_LIB(LLVMARMUtils) |
| 272 | FIND_AND_ADD_LLVM_LIB(LLVMARMInfo) | 279 | FIND_AND_ADD_LLVM_LIB(LLVMARMInfo) |
| 280 | FIND_AND_ADD_LLVM_LIB(LLVMAMDGPUTargetMCA) | ||
| 273 | FIND_AND_ADD_LLVM_LIB(LLVMAMDGPUDisassembler) | 281 | FIND_AND_ADD_LLVM_LIB(LLVMAMDGPUDisassembler) |
| 274 | FIND_AND_ADD_LLVM_LIB(LLVMAMDGPUAsmParser) | 282 | FIND_AND_ADD_LLVM_LIB(LLVMAMDGPUAsmParser) |
| 275 | FIND_AND_ADD_LLVM_LIB(LLVMAMDGPUCodeGen) | 283 | FIND_AND_ADD_LLVM_LIB(LLVMAMDGPUCodeGen) |
| ... | @@ -315,7 +323,6 @@ else() | ... | @@ -315,7 +323,6 @@ else() |
| 315 | FIND_AND_ADD_LLVM_LIB(LLVMMIRParser) | 323 | FIND_AND_ADD_LLVM_LIB(LLVMMIRParser) |
| 316 | FIND_AND_ADD_LLVM_LIB(LLVMAsmPrinter) | 324 | FIND_AND_ADD_LLVM_LIB(LLVMAsmPrinter) |
| 317 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoMSF) | 325 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoMSF) |
| 318 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoDWARF) | ||
| 319 | FIND_AND_ADD_LLVM_LIB(LLVMSelectionDAG) | 326 | FIND_AND_ADD_LLVM_LIB(LLVMSelectionDAG) |
| 320 | FIND_AND_ADD_LLVM_LIB(LLVMCodeGen) | 327 | FIND_AND_ADD_LLVM_LIB(LLVMCodeGen) |
| 321 | FIND_AND_ADD_LLVM_LIB(LLVMIRReader) | 328 | FIND_AND_ADD_LLVM_LIB(LLVMIRReader) |
| ... | @@ -331,6 +338,7 @@ else() | ... | @@ -331,6 +338,7 @@ else() |
| 331 | FIND_AND_ADD_LLVM_LIB(LLVMBitWriter) | 338 | FIND_AND_ADD_LLVM_LIB(LLVMBitWriter) |
| 332 | FIND_AND_ADD_LLVM_LIB(LLVMAnalysis) | 339 | FIND_AND_ADD_LLVM_LIB(LLVMAnalysis) |
| 333 | FIND_AND_ADD_LLVM_LIB(LLVMProfileData) | 340 | FIND_AND_ADD_LLVM_LIB(LLVMProfileData) |
| 341 | FIND_AND_ADD_LLVM_LIB(LLVMDebugInfoDWARF) | ||
| 334 | FIND_AND_ADD_LLVM_LIB(LLVMObject) | 342 | FIND_AND_ADD_LLVM_LIB(LLVMObject) |
| 335 | FIND_AND_ADD_LLVM_LIB(LLVMTextAPI) | 343 | FIND_AND_ADD_LLVM_LIB(LLVMTextAPI) |
| 336 | FIND_AND_ADD_LLVM_LIB(LLVMMCParser) | 344 | FIND_AND_ADD_LLVM_LIB(LLVMMCParser) |
src/codegen/llvm.zig+5-7
| ... | @@ -8745,13 +8745,11 @@ fn initializeLLVMTarget(arch: std.Target.Cpu.Arch) void { | ... | @@ -8745,13 +8745,11 @@ fn initializeLLVMTarget(arch: std.Target.Cpu.Arch) void { |
| 8745 | } | 8745 | } |
| 8746 | }, | 8746 | }, |
| 8747 | .ve => { | 8747 | .ve => { |
| 8748 | if (build_options.llvm_has_ve) { | 8748 | llvm.LLVMInitializeVETarget(); |
| 8749 | llvm.LLVMInitializeVETarget(); | 8749 | llvm.LLVMInitializeVETargetInfo(); |
| 8750 | llvm.LLVMInitializeVETargetInfo(); | 8750 | llvm.LLVMInitializeVETargetMC(); |
| 8751 | llvm.LLVMInitializeVETargetMC(); | 8751 | llvm.LLVMInitializeVEAsmPrinter(); |
| 8752 | llvm.LLVMInitializeVEAsmPrinter(); | 8752 | llvm.LLVMInitializeVEAsmParser(); |
| 8753 | llvm.LLVMInitializeVEAsmParser(); | ||
| 8754 | } | ||
| 8755 | }, | 8753 | }, |
| 8756 | .arc => { | 8754 | .arc => { |
| 8757 | if (build_options.llvm_has_arc) { | 8755 | if (build_options.llvm_has_arc) { |
src/config.zig.in-1
| ... | @@ -1,7 +1,6 @@ | ... | @@ -1,7 +1,6 @@ |
| 1 | pub const have_llvm = true; | 1 | pub const have_llvm = true; |
| 2 | pub const llvm_has_m68k = false; | 2 | pub const llvm_has_m68k = false; |
| 3 | pub const llvm_has_csky = false; | 3 | pub const llvm_has_csky = false; |
| 4 | pub const llvm_has_ve = false; | ||
| 5 | pub const llvm_has_arc = false; | 4 | pub const llvm_has_arc = false; |
| 6 | pub const version: [:0]const u8 = "@ZIG_VERSION@"; | 5 | pub const version: [:0]const u8 = "@ZIG_VERSION@"; |
| 7 | pub const semver = @import("std").SemanticVersion.parse(version) catch unreachable; | 6 | pub const semver = @import("std").SemanticVersion.parse(version) catch unreachable; |