Author: Camille Coti Date: 2020-08-18T11:58:19+02:00 New Revision: 556e65b8e9a1ca5d2a62fa397a7fa5eee5b58ac4
URL: https://github.com/llvm/llvm-project/commit/556e65b8e9a1ca5d2a62fa397a7fa5eee5b58ac4 DIFF: https://github.com/llvm/llvm-project/commit/556e65b8e9a1ca5d2a62fa397a7fa5eee5b58ac4.diff LOG: Order of libraries and source files in the f18 frontend When the f18 frontend calls the link editor, put the libraries and object files in the correct order. Fixes the issues reported here https://github.com/flang-compiler/flang/issues/897 Reviewed By: sscalpone, AlexisPerry Differential Revision: https://reviews.llvm.org/D84340 (cherry picked from commit ca0bf440dbf9977340db4a32ba61740930c2be03) Added: Modified: flang/tools/f18/f18.cpp Removed: ################################################################################ diff --git a/flang/tools/f18/f18.cpp b/flang/tools/f18/f18.cpp index 884b21322b73..77af3964bba8 100644 --- a/flang/tools/f18/f18.cpp +++ b/flang/tools/f18/f18.cpp @@ -368,20 +368,24 @@ std::string CompileOtherLanguage(std::string path, DriverOptions &driver) { return {}; } -void Link(std::vector<std::string> &relocatables, DriverOptions &driver) { +void Link(std::vector<std::string> &liblist, std::vector<std::string> &objects, + DriverOptions &driver) { if (!ParentProcess()) { std::vector<char *> argv; for (size_t j{0}; j < driver.F18_FCArgs.size(); ++j) { argv.push_back(driver.F18_FCArgs[j].data()); } - for (auto &relo : relocatables) { - argv.push_back(relo.data()); + for (auto &obj : objects) { + argv.push_back(obj.data()); } if (!driver.outputPath.empty()) { char dashO[3] = "-o"; argv.push_back(dashO); argv.push_back(driver.outputPath.data()); } + for (auto &lib : liblist) { + argv.push_back(lib.data()); + } Exec(argv, driver.verbose); } } @@ -396,6 +400,7 @@ int main(int argc, char *const argv[]) { bool isPGF90{driver.F18_FCArgs.back().rfind("pgf90") != std::string::npos}; std::list<std::string> args{argList(argc, argv)}; + std::vector<std::string> objlist, liblist; std::string prefix{args.front()}; args.pop_front(); prefix += ": "; @@ -412,32 +417,37 @@ int main(int argc, char *const argv[]) { Fortran::common::IntrinsicTypeDefaultKinds defaultKinds; - std::vector<std::string> fortranSources, otherSources, relocatables; + std::vector<std::string> fortranSources, otherSources; bool anyFiles{false}; while (!args.empty()) { std::string arg{std::move(args.front())}; + auto dot{arg.rfind(".")}; + std::string suffix{arg.substr(dot + 1)}; + std::string prefix{arg.substr(0, 2)}; args.pop_front(); if (arg.empty()) { } else if (arg.at(0) != '-') { anyFiles = true; - auto dot{arg.rfind(".")}; if (dot == std::string::npos) { driver.F18_FCArgs.push_back(arg); } else { - std::string suffix{arg.substr(dot + 1)}; if (suffix == "f" || suffix == "F" || suffix == "ff" || suffix == "f90" || suffix == "F90" || suffix == "ff90" || suffix == "f95" || suffix == "F95" || suffix == "ff95" || suffix == "cuf" || suffix == "CUF" || suffix == "f18" || suffix == "F18" || suffix == "ff18") { fortranSources.push_back(arg); - } else if (suffix == "o" || suffix == "a") { - relocatables.push_back(arg); + } else if (suffix == "o" || suffix == "so") { + objlist.push_back(arg); + } else if (suffix == "a") { + liblist.push_back(arg); } else { otherSources.push_back(arg); } } + } else if (prefix == "-l" || suffix == "a") { + liblist.push_back(arg); } else if (arg == "-") { fortranSources.push_back("-"); } else if (arg == "--") { @@ -679,17 +689,17 @@ int main(int argc, char *const argv[]) { for (const auto &path : fortranSources) { std::string relo{CompileFortran(path, options, driver, defaultKinds)}; if (!driver.compileOnly && !relo.empty()) { - relocatables.push_back(relo); + objlist.push_back(relo); } } for (const auto &path : otherSources) { std::string relo{CompileOtherLanguage(path, driver)}; if (!driver.compileOnly && !relo.empty()) { - relocatables.push_back(relo); + objlist.push_back(relo); } } - if (!relocatables.empty()) { - Link(relocatables, driver); + if (!objlist.empty()) { + Link(liblist, objlist, driver); } return exitStatus; } _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
