--- src/bootstrap/Cargo.toml
+++ src/bootstrap/Cargo.toml
@@ -90,6 +90,7 @@
 # dependencies, only bootstrap itself.
 [profile.dev]
 debug = 0
+strip = "none"
 
 [profile.dev.package]
 # Only use debuginfo=1 to further reduce compile times.
--- src/llvm-project/llvm/lib/ObjCopy/MachO/MachOLayoutBuilder.cpp
+++ src/llvm-project/llvm/lib/ObjCopy/MachO/MachOLayoutBuilder.cpp
@@ -283,6 +283,7 @@
   uint64_t StartOfSymbols = updateOffset(NListSize * O.SymTable.Symbols.size());
   uint64_t StartOfIndirectSymbols =
       updateOffset(sizeof(uint32_t) * O.IndirectSymTable.Symbols.size());
+  Offset = alignTo(Offset, Is64Bit ? 8 : 4);
   uint64_t StartOfSymbolStrings = updateOffset(StrTableBuilder.getSize());
   uint64_t StartOfDylibCodeSignDRs = updateOffset(O.DylibCodeSignDRs.Data.size());
 
