Skip to content

coff: fix incorrect default image_base values and re-enable shared library tests on Windows #21767

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2024
Merged

coff: fix incorrect default image_base values and re-enable shared library tests on Windows #21767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/link/Coff.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,11 +274,15 @@ pub fn createEmpty(

.image_base = options.image_base orelse switch (output_mode) {
.Exe => switch (target.cpu.arch) {
.aarch64 => 0x140000000,
.thumb, .x86_64, .x86 => 0x400000,
.aarch64, .x86_64 => 0x140000000,
.thumb, .x86 => 0x400000,
else => unreachable,
},
.Lib => switch (target.cpu.arch) {
.aarch64, .x86_64 => 0x180000000,
.thumb, .x86 => 0x10000000,
else => unreachable,
},
.Lib => 0x10000000,
.Obj => 0,
},

Expand Down
5 changes: 0 additions & 5 deletions test/standalone/c_compiler/build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ pub fn build(b: *std.Build) void {
const test_step = b.step("test", "Test it");
b.default_step = test_step;

if (builtin.os.tag == .windows) {
// https://github.com/ziglang/zig/issues/16965
return;
}

add(b, test_step, "test_c_Debug", "test_cpp_Debug", .Debug);
add(b, test_step, "test_c_ReleaseFast", "test_cpp_ReleaseFast", .ReleaseFast);
add(b, test_step, "test_c_ReleaseSmall", "test_cpp_ReleaseSmall", .ReleaseSmall);
Expand Down
5 changes: 0 additions & 5 deletions test/standalone/coff_dwarf/build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ pub fn build(b: *std.Build) void {
else
b.resolveTargetQuery(.{ .os_tag = .windows });

if (builtin.cpu.arch == .aarch64) {
// https://github.com/ziglang/zig/issues/18427
return;
}

const exe = b.addExecutable(.{
.name = "main",
.root_source_file = b.path("main.zig"),
Expand Down
5 changes: 0 additions & 5 deletions test/standalone/load_dynamic_library/build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ pub fn build(b: *std.Build) void {

if (builtin.os.tag == .wasi) return;

if (builtin.os.tag == .windows) {
// https://github.com/ziglang/zig/issues/16960
return;
}

const lib = b.addSharedLibrary(.{
.name = "add",
.root_source_file = b.path("add.zig"),
Expand Down
5 changes: 0 additions & 5 deletions test/standalone/shared_library/build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,6 @@ pub fn build(b: *std.Build) void {
const test_step = b.step("test", "Test it");
b.default_step = test_step;

if (@import("builtin").os.tag == .windows) {
// https://github.com/ziglang/zig/issues/16959
return;
}

const optimize: std.builtin.OptimizeMode = .Debug;
const target = b.graph.host;
const lib = b.addSharedLibrary(.{
Expand Down
Loading