linker/linker_phdr.cpp merge fixes or whatever...