Skip to content

Commit 5044153

Browse files
committed
Use no-libc Linux start for glibc default apps
1 parent 3358aee commit 5044153

3 files changed

Lines changed: 5 additions & 8 deletions

File tree

src/backend/llvm/MonoLlvmCodeGen.zig

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,7 +1388,7 @@ pub const MonoLlvmCodeGen = struct {
13881388
arg_layouts: []const layout.Idx,
13891389
ret_layout: layout.Idx,
13901390
) Error!void {
1391-
if (self.enable_default_platform_runtime and
1391+
if (self.enable_default_platform_hosted_calls and
13921392
self.host_call_mode == .extern_symbols and
13931393
self.target.os.tag == .linux and
13941394
std.mem.eql(u8, symbol_name, "_start"))
@@ -4855,10 +4855,7 @@ pub const MonoLlvmCodeGen = struct {
48554855

48564856
fn emitDefaultPlatformWriteStdout(self: *MonoLlvmCodeGen, ptr: LlvmBuilder.Value, len: LlvmBuilder.Value) Error!void {
48574857
switch (self.target.os.tag) {
4858-
.linux => switch (self.target.abi) {
4859-
.gnu, .gnueabi, .gnueabihf, .gnux32 => try self.emitCWriteStdout(ptr, len),
4860-
else => try self.emitLinuxWriteStdout(ptr, len),
4861-
},
4858+
.linux => try self.emitLinuxWriteStdout(ptr, len),
48624859
.macos, .windows => try self.emitCWriteStdout(ptr, len),
48634860
else => return error.CompilationFailed,
48644861
}

src/cli/main.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3646,7 +3646,7 @@ fn defaultBuildPlatformSource(args: cli_args.BuildArgs) []const u8 {
36463646
if (args.target) |target_str| {
36473647
if (RocTarget.fromString(target_str)) |target| {
36483648
return switch (target) {
3649-
.x64glibc, .arm64glibc, .x64mac, .arm64mac, .x64win, .arm64win => echo_platform.build_c_platform_main_source,
3649+
.x64mac, .arm64mac, .x64win, .arm64win => echo_platform.build_c_platform_main_source,
36503650
.wasm32 => echo_platform.build_wasm_archive_platform_main_source,
36513651
else => echo_platform.build_platform_main_source,
36523652
};

src/echo_platform/mod.zig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ pub const build_platform_main_source =
3232
\\ inputs: "targets/",
3333
\\ x64musl: { inputs: [app] },
3434
\\ arm64musl: { inputs: [app] },
35+
\\ x64glibc: { inputs: [app] },
36+
\\ arm64glibc: { inputs: [app] },
3537
\\ }
3638
\\
3739
\\import Echo
@@ -58,8 +60,6 @@ pub const build_c_platform_main_source =
5860
\\ hosted { "roc_default_echo_line": Echo.line! }
5961
\\ targets: {
6062
\\ inputs: "targets/",
61-
\\ x64glibc: { inputs: [app] },
62-
\\ arm64glibc: { inputs: [app] },
6363
\\ x64mac: { inputs: [app] },
6464
\\ arm64mac: { inputs: [app] },
6565
\\ x64win: { inputs: [app] },

0 commit comments

Comments
 (0)