[flang] Merge pull request flang-compiler/f18#836 from flang-compiler/pmk-kinds
authorPeter Klausler <35819229+klausler@users.noreply.github.com>
Fri, 22 Nov 2019 22:47:17 +0000 (14:47 -0800)
committerGitHub <noreply@github.com>
Fri, 22 Nov 2019 22:47:17 +0000 (14:47 -0800)
commit4d7b6cf3c1e63187707d4254e291f6298792675c
tree7a0a50f52abf2cb7d75a8cd319bfc14aa9843c02
parente46cd9ee18d5d809123f4984fa23df9648f2fa8e
[flang] Merge pull request flang-compiler/f18#836 from flang-compiler/pmk-kinds

Fold MERGE, use it in ISO_FORTRAN_ENV

Original-commit: flang-compiler/f18@34e04649fe6515a84cc5288b8ecfb133bd618e5a
Reviewed-on: https://github.com/flang-compiler/f18/pull/836