rs6000: Fix for separate shrink-wrapping for fp (PR80860, PR80843)