From ccd3cc3266762c1fea93cdc0190eaf71718d9e6a Mon Sep 17 00:00:00 2001 From: Alex Ambrose Date: Wed, 19 Jun 2024 14:40:21 -0700 Subject: [PATCH] Parse WASM linker flags as base 10, like clang Resolves #19536 --- src/main.zig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main.zig b/src/main.zig index 6b6dd0ec39..4f68ae908f 100644 --- a/src/main.zig +++ b/src/main.zig @@ -2252,19 +2252,19 @@ fn buildOutputType( entry = .disabled; } else if (mem.eql(u8, arg, "--initial-memory")) { const next_arg = linker_args_it.nextOrFatal(); - linker_initial_memory = std.fmt.parseUnsigned(u32, eatIntPrefix(next_arg, 16), 16) catch |err| { + linker_initial_memory = std.fmt.parseUnsigned(u32, next_arg, 10) catch |err| { fatal("unable to parse initial memory size '{s}': {s}", .{ next_arg, @errorName(err) }); }; } else if (mem.eql(u8, arg, "--max-memory")) { const next_arg = linker_args_it.nextOrFatal(); - linker_max_memory = std.fmt.parseUnsigned(u32, eatIntPrefix(next_arg, 16), 16) catch |err| { + linker_max_memory = std.fmt.parseUnsigned(u32, next_arg, 10) catch |err| { fatal("unable to parse max memory size '{s}': {s}", .{ next_arg, @errorName(err) }); }; } else if (mem.eql(u8, arg, "--shared-memory")) { create_module.opts.shared_memory = true; } else if (mem.eql(u8, arg, "--global-base")) { const next_arg = linker_args_it.nextOrFatal(); - linker_global_base = std.fmt.parseUnsigned(u32, eatIntPrefix(next_arg, 16), 16) catch |err| { + linker_global_base = std.fmt.parseUnsigned(u32, next_arg, 10) catch |err| { fatal("unable to parse global base '{s}': {s}", .{ next_arg, @errorName(err) }); }; } else if (mem.eql(u8, arg, "--export")) {