trap.o: Undefined symbol `_resume_iret' referenced from text segment
[...]

That's because you're using the wrong version of locore.s.  (There's a
good reason I said not to mix the sources, you know...)