mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-21 05:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

LLVM: respect linksection for exported variables

Browse Source
This commit is contained in:
Andrew Kelley 2022-08-10 14:08:09 -07:00
parent e8d02c5b90
commit d267f0f968
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Sema.zig
View File

@ -6351,6 +6351,7 @@ fn instantiateGenericCall(
new_decl.is_exported = fn_owner_decl.is_exported; new_decl.is_exported = fn_owner_decl.is_exported;
new_decl.has_align = fn_owner_decl.has_align; new_decl.has_align = fn_owner_decl.has_align;
new_decl.has_linksection_or_addrspace = fn_owner_decl.has_linksection_or_addrspace; new_decl.has_linksection_or_addrspace = fn_owner_decl.has_linksection_or_addrspace;
new_decl.@"linksection" = fn_owner_decl.@"linksection";
new_decl.@"addrspace" = fn_owner_decl.@"addrspace"; new_decl.@"addrspace" = fn_owner_decl.@"addrspace";
new_decl.zir_decl_index = fn_owner_decl.zir_decl_index; new_decl.zir_decl_index = fn_owner_decl.zir_decl_index;
new_decl.alive = true; // This Decl is called at runtime. new_decl.alive = true; // This Decl is called at runtime.

11
src/codegen/llvm.zig
View File

@ -722,6 +722,10 @@ pub const Object = struct {
dg.addFnAttrString(llvm_func, "no-stack-arg-probe", ""); dg.addFnAttrString(llvm_func, "no-stack-arg-probe", "");
} }
if (decl.@"linksection") |section| {
llvm_func.setSection(section);
}
// Remove all the basic blocks of a function in order to start over, generating // Remove all the basic blocks of a function in order to start over, generating
// LLVM IR from an empty function body. // LLVM IR from an empty function body.
while (llvm_func.getFirstBasicBlock()) |bb| { while (llvm_func.getFirstBasicBlock()) |bb| {
@ -1107,6 +1111,11 @@ pub const Object = struct {
.hidden => llvm_global.setVisibility(.Hidden), .hidden => llvm_global.setVisibility(.Hidden),
.protected => llvm_global.setVisibility(.Protected), .protected => llvm_global.setVisibility(.Protected),
} }
if (exports[0].options.section) |section| {
const section_z = try module.gpa.dupeZ(u8, section);
defer module.gpa.free(section_z);
llvm_global.setSection(section_z);
}
if (decl.val.castTag(.variable)) |variable| { if (decl.val.castTag(.variable)) |variable| {
if (variable.data.is_threadlocal) { if (variable.data.is_threadlocal) {
llvm_global.setThreadLocalMode(.GeneralDynamicTLSModel); llvm_global.setThreadLocalMode(.GeneralDynamicTLSModel);
@ -2183,6 +2192,7 @@ pub const DeclGen = struct {
const target = dg.module.getTarget(); const target = dg.module.getTarget();
var global = try dg.resolveGlobalDecl(decl_index); var global = try dg.resolveGlobalDecl(decl_index);
global.setAlignment(decl.getAlignment(target)); global.setAlignment(decl.getAlignment(target));
if (decl.@"linksection") |section| global.setSection(section);
assert(decl.has_tv); assert(decl.has_tv);
const init_val = if (decl.val.castTag(.variable)) |payload| init_val: { const init_val = if (decl.val.castTag(.variable)) |payload| init_val: {
const variable = payload.data; const variable = payload.data;
@ -2216,6 +2226,7 @@ pub const DeclGen = struct {
new_global.setLinkage(global.getLinkage()); new_global.setLinkage(global.getLinkage());
new_global.setUnnamedAddr(global.getUnnamedAddress()); new_global.setUnnamedAddr(global.getUnnamedAddress());
new_global.setAlignment(global.getAlignment()); new_global.setAlignment(global.getAlignment());
if (decl.@"linksection") |section| new_global.setSection(section);
new_global.setInitializer(llvm_init); new_global.setInitializer(llvm_init);
// replaceAllUsesWith requires the type to be unchanged. So we bitcast // replaceAllUsesWith requires the type to be unchanged. So we bitcast
// the new global to the old type and use that as the thing to replace // the new global to the old type and use that as the thing to replace

3
src/codegen/llvm/bindings.zig
View File

@ -126,6 +126,9 @@ pub const Value = opaque {
pub const setThreadLocalMode = LLVMSetThreadLocalMode; pub const setThreadLocalMode = LLVMSetThreadLocalMode;
extern fn LLVMSetThreadLocalMode(Global: *const Value, Mode: ThreadLocalMode) void; extern fn LLVMSetThreadLocalMode(Global: *const Value, Mode: ThreadLocalMode) void;
pub const setSection = LLVMSetSection;
extern fn LLVMSetSection(Global: *const Value, Section: [*:0]const u8) void;
pub const deleteGlobal = LLVMDeleteGlobal; pub const deleteGlobal = LLVMDeleteGlobal;
extern fn LLVMDeleteGlobal(GlobalVar: *const Value) void; extern fn LLVMDeleteGlobal(GlobalVar: *const Value) void;