mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-09 19:10:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

cbe: fix threadlocal

Browse Source
This commit is contained in:
Jacob Young 2022-10-31 22:31:47 -04:00
parent 757db665a7
commit 91fe0b80a2
4 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/include/zig.h vendored
View File

@ -19,7 +19,7 @@
#endif
#if __STDC_VERSION__ >= 201112L
#define zig_threadlocal thread_local
#define zig_threadlocal _Thread_local
#elif defined(__GNUC__)
#define zig_threadlocal __thread
#elif _MSC_VER

9
src/codegen/c.zig
View File

@ -2236,12 +2236,6 @@ pub fn genDecl(o: *Object) !void {
const variable: *Module.Var = var_payload.data;
const is_global = o.dg.declIsGlobal(tv) or variable.is_extern;
const fwd_decl_writer = o.dg.fwd_decl.writer();
if (is_global) {
try fwd_decl_writer.writeAll("zig_extern_c ");
}
if (variable.is_threadlocal) {
try fwd_decl_writer.writeAll("zig_threadlocal ");
}
const decl_c_value: CValue = if (is_global) .{
.bytes = mem.span(o.dg.decl.name),
@ -2249,6 +2243,8 @@ pub fn genDecl(o: *Object) !void {
.decl = o.dg.decl_index,
};
if (is_global) try fwd_decl_writer.writeAll("zig_extern_c ");
if (variable.is_threadlocal) try fwd_decl_writer.writeAll("zig_threadlocal ");
try o.dg.renderTypeAndName(fwd_decl_writer, o.dg.decl.ty, decl_c_value, .Mut, o.dg.decl.@"align", .Complete);
try fwd_decl_writer.writeAll(";\n");
@ -2257,6 +2253,7 @@ pub fn genDecl(o: *Object) !void {
}
const w = o.writer();
if (variable.is_threadlocal) try w.writeAll("zig_threadlocal ");
try o.dg.renderTypeAndName(w, o.dg.decl.ty, decl_c_value, .Mut, o.dg.decl.@"align", .Complete);
try w.writeAll(" = ");
if (variable.init.tag() != .unreachable_value) {

1
test/behavior/basic.zig
View File

@ -725,7 +725,6 @@ test "comptime manyptr concatenation" {
}
test "thread local variable" {
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO

1
test/behavior/bugs/7250.zig
View File

@ -14,7 +14,6 @@ threadlocal var g_uart0 = nrfx_uart_t{
};
test "reference a global threadlocal variable" {
if (builtin.zig_backend == .stage2_c) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_wasm) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest; // TODO
if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest; // TODO