Get rid of r11 and r15, as they are fp/sp on s390.
PPC references to those should now be r11_p and r15_p and will be remapped appropriately