rs6000: Small improvement to the C++17 ABI fix [PR94707]