[Mach-O] Map __DATA,__const to __DATA_CONST,__const

rui314 · Jul 6, 2022 · be5fe4c · be5fe4c
1 parent 5634b22
commit be5fe4c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/macho/input-files.cc b/macho/input-files.cc
@@ -607,6 +607,7 @@ bool ObjectFile<E>::is_objc_object(Context<E> &ctx) {
     if (!mach_syms[i].is_undef() && mach_syms[i].is_extern &&
         this->syms[i]->name.starts_with("_OBJC_CLASS_$_"))
       return true;
+
   return false;
 }
 

diff --git a/macho/input-sections.cc b/macho/input-sections.cc
@@ -2,12 +2,21 @@
 
 namespace mold::macho {
 
+template <typename E>
+OutputSection<E> &get_output_section(Context<E> &ctx, const MachSection &hdr) {
+  std::string_view seg = hdr.get_segname();
+  std::string_view sect = hdr.get_sectname();
+
+  if (seg == "__DATA" && sect == "__const")
+    seg = "__DATA_CONST";
+
+  return *OutputSection<E>::get_instance(ctx, seg, sect);
+}
+
 template <typename E>
 InputSection<E>::InputSection(Context<E> &ctx, ObjectFile<E> &file,
                               const MachSection &hdr)
-  : file(file), hdr(hdr),
-    osec(*OutputSection<E>::get_instance(ctx, hdr.get_segname(),
-                                         hdr.get_sectname())) {
+  : file(file), hdr(hdr), osec(get_output_section(ctx, hdr)) {
   if (hdr.type != S_ZEROFILL)
     contents = file.mf->get_contents().substr(hdr.offset, hdr.size);
 }