maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[flang] Pass PGF90 options on only if underlying compiler is PGF90 

Original-commit: flang-compiler/f18@dc34f75b07
Reviewed-on: https://github.com/flang-compiler/f18/pull/531
Tree-same-pre-rewrite: false
This commit is contained in:
peter klausler 2019-06-21 14:06:17 -07:00
parent 33c397308c
commit c4f0ea5a14
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flang/tools/f18/f18.cc
View File

@ -321,6 +321,7 @@ int main(int argc, char *const argv[]) {
DriverOptions driver;
const char *pgf90{getenv("F18_FC")};
driver.pgf90Args.push_back(pgf90 ? pgf90 : "pgf90");
bool isPGF90{driver.pgf90Args.back().rfind("pgf90") != std::string::npos};
std::list<std::string> args{argList(argc, argv)};
std::string prefix{args.front()};
@ -386,7 +387,7 @@ int main(int argc, char *const argv[]) {
Fortran::parser::LanguageFeature::BackslashEscapes, false);
} else if (arg == "-Mnobackslash") {
options.features.Enable(
Fortran::parser::LanguageFeature::BackslashEscapes);
Fortran::parser::LanguageFeature::BackslashEscapes, true);
} else if (arg == "-Mstandard") {
driver.warnOnNonstandardUsage = true;
} else if (arg == "-fopenmp") {
@ -400,7 +401,7 @@ int main(int argc, char *const argv[]) {
driver.dumpCookedChars = true;
} else if (arg == "-fbackslash") {
options.features.Enable(
Fortran::parser::LanguageFeature::BackslashEscapes);
Fortran::parser::LanguageFeature::BackslashEscapes, true);
} else if (arg == "-fno-backslash") {
options.features.Enable(
Fortran::parser::LanguageFeature::BackslashEscapes, false);
@ -455,9 +456,8 @@ int main(int argc, char *const argv[]) {
driver.encoding = Fortran::parser::Encoding::UTF_8;
} else if (arg == "-flatin") {
driver.encoding = Fortran::parser::Encoding::LATIN_1;
} else if (arg == "-fkanji") {
} else if (arg == "-fkanji" || arg == "-Mx,125,4") {
driver.encoding = Fortran::parser::Encoding::EUC_JP;
driver.pgf90Args.push_back("-Mx,125,4"); // PGI "Kanji" mode
} else if (arg == "-help" || arg == "--help" || arg == "-?") {
std::cerr
<< "f18 options:\n"
@ -504,8 +504,6 @@ int main(int argc, char *const argv[]) {
args.pop_front();
} else if (arg.substr(0, 2) == "-I") {
driver.searchDirectories.push_back(arg.substr(2));
} else if (arg == "-Mx,125,4") { // PGI "all Kanji" mode
driver.encoding = Fortran::parser::Encoding::EUC_JP;
}
}
}
@ -516,6 +514,18 @@ int main(int argc, char *const argv[]) {
if (options.features.IsEnabled(Fortran::parser::LanguageFeature::OpenMP)) {
driver.pgf90Args.push_back("-mp");
}
if (isPGF90) {
if (driver.encoding == Fortran::parser::Encoding::EUC_JP) {
driver.pgf90Args.push_back("-Mx,125,4"); // PGI "Kanji" mode
}
if (!options.features.IsEnabled(
Fortran::parser::LanguageFeature::BackslashEscapes)) {
driver.pgf90Args.push_back(
"-Mbackslash"); // yes, this *disables* them in pgf90
}
} else {
// TODO: equivalents for other Fortran compilers
}
Fortran::parser::AllSources allSources;
allSources.set_encoding(driver.encoding);