Rename r6 to r6_p for builtins-s390.cc