Commit b93fd4bb73506a8feb0b4c312c1afbf88cc9248d | zig

author	Jakub Konka <kubkon@jakubkonka.com> 2021-06-11 16:52:17+02:00
committer	Jakub Konka <kubkon@jakubkonka.com> 2021-06-11 16:52:22+02:00
log	b93fd4bb73506a8feb0b4c312c1afbf88cc9248d
tree	f512539ec804f7bfd23588f8bf50606a760a1454
parent	961d556570e19c2fca1ba5ad1aadd843f012b7ed

zld: match all DATA sections as data except __const

Examples of such sections include:
* in Go, you will get `__DATA,__noptrdata` or `__DATA,__go_buildinfo`
  which should be mapped to `__DATA,__data`

1 files changed, 11 insertions(+), 12 deletions(-)

src
- link
  - MachO
    Zld.zig

src/link/MachO/Zld.zig+11-12

 @@ -857,24 +857,23 @@ fn getMatchingSection(self: *Zld, section: macho.section_64) ?MatchingSection {
                             .seg = self.text_segment_cmd_index.?,
                             .sect = self.ustring_section_index.?,
                         };
-                    } else {
-                        break :blk .{
-                            .seg = self.text_segment_cmd_index.?,
-                            .sect = self.text_const_section_index.?,
-                        };
                     }
-                } else if (mem.eql(u8, segname, "__DATA")) {
+                    break :blk .{
-                    if (mem.eql(u8, sectname, "__data")) {
+                        .seg = self.text_segment_cmd_index.?,
-                        break :blk .{
+                        .sect = self.text_const_section_index.?,
-                            .seg = self.data_segment_cmd_index.?,
+                    };
-                            .sect = self.data_section_index.?,
+                }
-                        };
+                if (mem.eql(u8, segname, "__DATA")) {
-                    } else if (mem.eql(u8, sectname, "__const")) {
+                    if (mem.eql(u8, sectname, "__const")) {
                         break :blk .{
                             .seg = self.data_const_segment_cmd_index.?,
                             .sect = self.data_const_section_index.?,
                         };
                     }
+                    break :blk .{
+                        .seg = self.data_segment_cmd_index.?,
+                        .sect = self.data_section_index.?,
+                    };
                 }
                 break :blk null;
             },

zld: match all __DATA sections as __data except __const

zld: match all DATA sections as data except __const