redstar wrote: Hopefully this gives a clean build. Ther merge conflict & build failures were caused by the removal of the `Asm` parameter in `recordRelocation()` and `writeObject()`. https://github.com/llvm/llvm-project/pull/131216