Here's the infrastructure patch I've got that makes it possible to do this fast matching of @GOT, @PLT, etc. I can't contribute the port I'm working on yet, but I can already give you a feel of how it's going to look like. Given the patch below: