peter.smith accepted this revision. peter.smith added a comment. This revision is now accepted and ready to land. That looks good to me. I agree that it is the better solution to not assume anything about the relative locations of .got and .got.plt https://reviews.llvm.org/D31682