Multiarch Fixes - gcc-9

No unpublished successful runs for gcc-9.