mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-14 21:38:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

link: initialize llvm before calling the llvm API

Browse Source
This commit is contained in:
Jacob Young 2023-10-18 18:43:48 -04:00 committed by Andrew Kelley
parent 530dc0405c
commit 4d106076c3
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/codegen/llvm/Builder.zig
View File

@ -7999,11 +7999,13 @@ pub fn init(options: Options) InitError!Builder {
assert(try self.string("") == .empty);
if (options.name.len > 0) self.source_filename = try self.string(options.name);
self.initializeLLVMTarget(options.target.cpu.arch);
if (self.useLibLlvm()) self.llvm.module = llvm.Module.createWithName(
(self.source_filename.slice(&self) orelse ""),
self.llvm.context,
);
if (self.useLibLlvm()) {
initializeLLVMTarget(options.target.cpu.arch);
self.llvm.module = llvm.Module.createWithName(
(self.source_filename.slice(&self) orelse ""),
self.llvm.context,
);
}
if (options.triple.len > 0) {
self.target_triple = try self.string(options.triple);
@ -8117,8 +8119,7 @@ pub fn deinit(self: *Builder) void {
self.* = undefined;
}
pub fn initializeLLVMTarget(self: *const Builder, arch: std.Target.Cpu.Arch) void {
if (!self.useLibLlvm()) return;
pub fn initializeLLVMTarget(arch: std.Target.Cpu.Arch) void {
switch (arch) {
.aarch64, .aarch64_be, .aarch64_32 => {
llvm.LLVMInitializeAArch64Target();

2
src/link.zig
View File

@ -1150,7 +1150,9 @@ pub const File = struct {
}
const llvm_bindings = @import("codegen/llvm/bindings.zig");
const Builder = @import("codegen/llvm/Builder.zig");
const llvm = @import("codegen/llvm.zig");
Builder.initializeLLVMTarget(base.options.target.cpu.arch);
const os_tag = llvm.targetOs(base.options.target.os.tag);
const bad = llvm_bindings.WriteArchive(full_out_path_z, object_files.items.ptr, object_files.items.len, os_tag);
if (bad) return error.UnableToWriteArchive;