mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-16 06:18:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix logic for default entry point

Browse Source 
when linking libc, the entry point is within libc.
when producing C code, the entry point is decided when compiling the C
code and does not need to be known up front.

fixes a false positive "error: unknown target entry point" when using
-ofmt=c.
This commit is contained in:
Andrew Kelley 2023-12-24 20:11:58 -07:00
parent 1edcea9ec8
commit 44e2dbe117
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/Compilation/Config.zig
View File

@ -161,20 +161,6 @@ pub fn resolve(options: Options) ResolveError!Config {
break :b options.shared_memory orelse false; break :b options.shared_memory orelse false;
}; };
const entry: ?[]const u8 = switch (options.entry) {
.disabled => null,
.default => b: {
if (options.output_mode != .Exe) break :b null;
break :b target_util.defaultEntrySymbolName(target, wasi_exec_model) orelse
return error.UnknownTargetEntryPoint;
},
.enabled => target_util.defaultEntrySymbolName(target, wasi_exec_model) orelse
return error.UnknownTargetEntryPoint,
.named => |name| name,
};
if (entry != null and options.output_mode != .Exe)
return error.NonExecutableEntryPoint;
// *If* the LLVM backend were to be selected, should Zig use the LLVM // *If* the LLVM backend were to be selected, should Zig use the LLVM
// library to build the LLVM module? // library to build the LLVM module?
const use_lib_llvm = b: { const use_lib_llvm = b: {
@ -348,6 +334,29 @@ pub fn resolve(options: Options) ResolveError!Config {
break :b false; break :b false;
}; };
const entry: ?[]const u8 = switch (options.entry) {
.disabled => null,
.default => b: {
if (options.output_mode != .Exe) break :b null;
// When linking libc, the entry point is inside libc and not in the
// zig compilation unit.
if (link_libc) break :b null;
// When producing C source code, the decision of entry point is made
// when compiling the C code, not when producing the C code.
if (target.ofmt == .c) break :b null;
break :b target_util.defaultEntrySymbolName(target, wasi_exec_model) orelse
return error.UnknownTargetEntryPoint;
},
.enabled => target_util.defaultEntrySymbolName(target, wasi_exec_model) orelse
return error.UnknownTargetEntryPoint,
.named => |name| name,
};
if (entry != null and options.output_mode != .Exe)
return error.NonExecutableEntryPoint;
const any_unwind_tables = options.any_unwind_tables or const any_unwind_tables = options.any_unwind_tables or
link_libunwind or target_util.needUnwindTables(target); link_libunwind or target_util.needUnwindTables(target);