authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-08-18 10:49:09-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2022-08-19 16:45:16-07:00
log437311756d88984d9bf3057d9cd93986c15434fa
tree9845ed7d4ad76a191610b885061c26050bd7c349
parent35f62bc7aeca5c84f4ddda5736ce902018d23964

LLVM: add DLL export attribute

This was present in stage1 but missing from self-hosted.

4 files changed, 17 insertions(+), 1 deletions(-)

src/Compilation.zig+1-1
......@@ -1231,7 +1231,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
12311231 break :blk lm;
12321232 } else default_link_mode;
12331233
1234 const dll_export_fns = if (options.dll_export_fns) |explicit| explicit else is_dyn_lib or options.rdynamic;
1234 const dll_export_fns = options.dll_export_fns orelse (is_dyn_lib or options.rdynamic);
12351235
12361236 const libc_dirs = try detectLibCIncludeDirs(
12371237 arena,
src/Module.zig+4
......@@ -6529,3 +6529,7 @@ pub fn addGlobalAssembly(mod: *Module, decl_index: Decl.Index, source: []const u
65296529
65306530 mod.global_assembly.putAssumeCapacityNoClobber(decl_index, duped_source);
65316531}
6532
6533pub fn wantDllExports(mod: Module) bool {
6534 return mod.comp.bin_file.options.dll_export_fns and mod.getTarget().os.tag == .windows;
6535}
src/codegen/llvm.zig+3
......@@ -1103,6 +1103,7 @@ pub const Object = struct {
11031103 }
11041104 llvm_global.setUnnamedAddr(.False);
11051105 llvm_global.setLinkage(.External);
1106 if (module.wantDllExports()) llvm_global.setDLLStorageClass(.Default);
11061107 if (self.di_map.get(decl)) |di_node| {
11071108 if (try decl.isFunction()) {
11081109 const di_func = @ptrCast(*llvm.DISubprogram, di_node);
......@@ -1128,6 +1129,7 @@ pub const Object = struct {
11281129 const exp_name = exports[0].options.name;
11291130 llvm_global.setValueName2(exp_name.ptr, exp_name.len);
11301131 llvm_global.setUnnamedAddr(.False);
1132 if (module.wantDllExports()) llvm_global.setDLLStorageClass(.DLLExport);
11311133 if (self.di_map.get(decl)) |di_node| {
11321134 if (try decl.isFunction()) {
11331135 const di_func = @ptrCast(*llvm.DISubprogram, di_node);
......@@ -1187,6 +1189,7 @@ pub const Object = struct {
11871189 defer module.gpa.free(fqn);
11881190 llvm_global.setValueName2(fqn.ptr, fqn.len);
11891191 llvm_global.setLinkage(.Internal);
1192 if (module.wantDllExports()) llvm_global.setDLLStorageClass(.Default);
11901193 llvm_global.setUnnamedAddr(.True);
11911194 if (decl.val.castTag(.variable)) |variable| {
11921195 const single_threaded = module.comp.bin_file.options.single_threaded;
src/codegen/llvm/bindings.zig+9
......@@ -223,6 +223,9 @@ pub const Value = opaque {
223223 pub const setInitializer = LLVMSetInitializer;
224224 extern fn LLVMSetInitializer(GlobalVar: *const Value, ConstantVal: *const Value) void;
225225
226 pub const setDLLStorageClass = LLVMSetDLLStorageClass;
227 extern fn LLVMSetDLLStorageClass(Global: *const Value, Class: DLLStorageClass) void;
228
226229 pub const addCase = LLVMAddCase;
227230 extern fn LLVMAddCase(Switch: *const Value, OnVal: *const Value, Dest: *const BasicBlock) void;
228231
......@@ -1482,6 +1485,12 @@ pub const CallAttr = enum(c_int) {
14821485 AlwaysInline,
14831486};
14841487
1488pub const DLLStorageClass = enum(c_uint) {
1489 Default,
1490 DLLImport,
1491 DLLExport,
1492};
1493
14851494pub const address_space = struct {
14861495 pub const default: c_uint = 0;
14871496