8201475: 8199417 breaks AIX and non-pch on s390 (and presumably aarch64)

Reviewed-by: eosterlund, shade, mdoerr
4 files changed