Commit 1e785409bb

Andrew Kelley <andrew@ziglang.org>
2024-10-15 00:30:30
move link.Elf.LdScript to link.LdScript
1 parent 028a9a1
Changed files (3)
src/link/Elf.zig
@@ -1,4 +1,5 @@
 pub const Atom = @import("Elf/Atom.zig");
+pub const LdScript = @import("LdScript.zig");
 
 base: link.File,
 rpath_table: std.StringArrayHashMapUnmanaged(void),
@@ -5625,7 +5626,6 @@ const GnuHashSection = synthetic_sections.GnuHashSection;
 const GotSection = synthetic_sections.GotSection;
 const GotPltSection = synthetic_sections.GotPltSection;
 const HashSection = synthetic_sections.HashSection;
-const LdScript = @import("Elf/LdScript.zig");
 const LinkerDefined = @import("Elf/LinkerDefined.zig");
 const Liveness = @import("../Liveness.zig");
 const LlvmObject = @import("../codegen/llvm.zig").Object;
src/link/Elf/LdScript.zig → src/link/LdScript.zig
@@ -442,7 +442,7 @@ const TokenIterator = struct {
 };
 
 const LdScript = @This();
-const Diags = @import("../../link.zig").Diags;
+const Diags = @import("../link.zig").Diags;
 
 const std = @import("std");
 const assert = std.debug.assert;
CMakeLists.txt
@@ -601,7 +601,6 @@ set(ZIG_STAGE2_SOURCES
     src/link/Elf/Archive.zig
     src/link/Elf/Atom.zig
     src/link/Elf/AtomList.zig
-    src/link/Elf/LdScript.zig
     src/link/Elf/LinkerDefined.zig
     src/link/Elf/Merge.zig
     src/link/Elf/Object.zig
@@ -615,6 +614,7 @@ set(ZIG_STAGE2_SOURCES
     src/link/Elf/relocatable.zig
     src/link/Elf/relocation.zig
     src/link/Elf/synthetic_sections.zig
+    src/link/LdScript.zig
     src/link/MachO.zig
     src/link/MachO/Archive.zig
     src/link/MachO/Atom.zig