[flang] Merge pull request flang-compiler/f18#235 from flang-compiler/pmk1

last minute changes for recent PR that were not pushed, sorry

Original-commit: flang-compiler/f18@f9ee3753ea1e151ddfe56a0db37aa9e69626da7f
Reviewed-on: https://github.com/flang-compiler/f18/pull/235