From 9230b1a553ec44401d840b872e0b5ec490a92db3 Mon Sep 17 00:00:00 2001
From: Mads Marquart <mads@marquart.dk>
Date: Sun, 19 Apr 2026 14:00:41 +0200
Subject: [PATCH] Set Mach-O section type and attributes

---
 src/constant.rs         | 44 +----------------------------------------
 src/debuginfo/unwind.rs |  2 +-
 2 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/src/constant.rs b/src/constant.rs
index aadddb08bd..e2ad6f8c89 100644
--- a/src/constant.rs
+++ b/src/constant.rs
@@ -414,49 +414,7 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut dyn Module, cx: &mut Constant
         data.set_align(alloc.align.bytes());
 
         if let Some(section_name) = section_name {
-            let (segment_name, section_name) = if tcx.sess.target.is_like_darwin {
-                // See https://github.com/llvm/llvm-project/blob/main/llvm/lib/MC/MCSectionMachO.cpp
-                let mut parts = section_name.as_str().split(',');
-                let Some(segment_name) = parts.next() else {
-                    tcx.dcx().fatal(format!(
-                        "#[link_section = \"{}\"] is not valid for macos target: must be segment and section separated by comma",
-                        section_name
-                    ));
-                };
-                let Some(section_name) = parts.next() else {
-                    tcx.dcx().fatal(format!(
-                        "#[link_section = \"{}\"] is not valid for macos target: must be segment and section separated by comma",
-                        section_name
-                    ));
-                };
-                if section_name.len() > 16 {
-                    tcx.dcx().fatal(format!(
-                        "#[link_section = \"{}\"] is not valid for macos target: section name bigger than 16 bytes",
-                        section_name
-                    ));
-                }
-                let section_type = parts.next().unwrap_or("regular");
-                if section_type != "regular" && section_type != "cstring_literals" {
-                    tcx.dcx().fatal(format!(
-                        "#[link_section = \"{}\"] is not supported: unsupported section type {}",
-                        section_name, section_type,
-                    ));
-                }
-                let _attrs = parts.next();
-                if parts.next().is_some() {
-                    tcx.dcx().fatal(format!(
-                        "#[link_section = \"{}\"] is not valid for macos target: too many components",
-                        section_name
-                    ));
-                }
-                // FIXME(bytecodealliance/wasmtime#8901) set S_CSTRING_LITERALS section type when
-                // cstring_literals is specified
-                (segment_name, section_name)
-            } else {
-                ("", section_name.as_str())
-            };
-            // FIXME pass correct section flags on Mach-O
-            data.set_segment_section(segment_name, section_name, 0);
+            data.set_custom_section(section_name.as_str());
         }
 
         let bytes = alloc.inspect_with_uninit_and_ptr_outside_interpreter(0..alloc.len()).to_vec();
diff --git a/src/debuginfo/unwind.rs b/src/debuginfo/unwind.rs
index 4b0260a8ab..ad0a15bf7f 100644
--- a/src/debuginfo/unwind.rs
+++ b/src/debuginfo/unwind.rs
@@ -204,7 +204,7 @@ impl UnwindContext {
 
                     let mut data = DataDescription::new();
                     data.define(gcc_except_table.writer.into_vec().into_boxed_slice());
-                    data.set_segment_section("", ".gcc_except_table", 0);
+                    data.set_custom_section(".gcc_except_table");
 
                     for reloc in &gcc_except_table.relocs {
                         match reloc.name {