Skip to content

Commit 6b28222

Browse files
committed
Remove eh_frame_no_load option
1 parent 649e570 commit 6b28222

2 files changed

Lines changed: 11 additions & 19 deletions

File tree

build-internals/build.zig

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,6 @@ pub const LinkerScript = struct {
276276
/// Place rodata in the first region tagged as ram.
277277
ram,
278278
} = .flash,
279-
/// Give .eh_frame and .eh_frame_hdr the status of other elf debug
280-
/// sections (to not flash them to the device).
281-
eh_frame_no_load: bool = true,
282279
},
283280
};
284281
};

tools/generate_linker_script.zig

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -268,27 +268,22 @@ pub fn main(init: std.process.Init) !void {
268268
, .{flash_region_name});
269269
}
270270

271-
if (options.eh_frame_no_load) {
272-
try writer.interface.writeAll(
273-
\\
274-
\\ .eh_frame_hdr 0 (INFO) :
275-
\\ {
276-
\\ KEEP(*(.eh_frame_hdr))
277-
\\ }
278-
\\
279-
\\ .eh_frame 0 (INFO) :
280-
\\ {
281-
\\ KEEP(*(.eh_frame))
282-
\\ }
283-
\\
284-
);
285-
}
286-
287271
try writer.interface.writeAll(
272+
\\
273+
\\ .eh_frame_hdr 0 (INFO) :
274+
\\ {
275+
\\ KEEP(*(.eh_frame_hdr))
276+
\\ }
277+
\\
278+
\\ .eh_frame 0 (INFO) :
279+
\\ {
280+
\\ KEEP(*(.eh_frame))
281+
\\ }
288282
\\
289283
\\ microzig_data_load_start = LOADADDR(.data);
290284
\\
291285
);
286+
292287
switch (parsed_args.cpu_arch) {
293288
.riscv32, .riscv64 => try writer.interface.writeAll(
294289
\\ PROVIDE(__global_pointer$ = microzig_data_start + 0x800);

0 commit comments

Comments
 (0)