-fransics-path to bbc

Author: Meinersbur

clang/include/clang/Driver/Driver.h

@@ -188,8 +188,6 @@ class Driver {
   /// The path to the compiler resource directory.
   std::string ResourceDir;
 
-
-
   /// System directory for config files.
   std::string SystemConfigDir;
 

clang/lib/Driver/ToolChains/Flang.cpp

@@ -958,13 +958,13 @@ void Flang::ConstructJob(Compilation &C, const JobAction &JA,
   CmdArgs.push_back(D.ResourceDir.c_str());
 
 
-#if 1
+
   // Default intrinsic module dirs must be added after any user-provided -fintrinsic-modules-path to have lower precedence
   if  ( auto IntrModPath = TC.getDefaultIntrinsicModuleDir()) {
     CmdArgs.push_back("-fintrinsic-modules-path");
     CmdArgs.push_back( Args.MakeArgString(*IntrModPath));
   }
-#endif 
+
 
 
   // Offloading related options

cmake/Modules/GetToolchainDirs.cmake

@@ -47,6 +47,7 @@ function (get_toolchain_library_subdir outvar)
 endfunction ()
 
 
+# Corresponds to Flang's ToolChain::getDefaultIntrinsicModuleDir().
 function (get_toolchain_module_subdir outvar)
   set(outval "finclude")
 

flang/include/flang/Parser/options.h

@@ -27,8 +27,7 @@ struct Options {
   int fixedFormColumns{72};
   common::LanguageFeatureControl features;
 
-  /// Search paths from -J/-module-dir
-  /// Only a single path is supported which is also the location for writing modules.
+  /// Search paths from -I/-J/-module-dir/-fintrinsic-modules-path for 
   std::vector<std::string> searchDirectories;
 
   /// Search paths from -fintrinsic-modules-path

flang/lib/Frontend/CompilerInvocation.cpp

@@ -916,7 +916,6 @@ static void parsePreprocessorArgs(Fortran::frontend::PreprocessorOptions &opts,
   for (const auto *currentArg : args.filtered(clang::driver::options::OPT_I))
     opts.searchDirectoriesFromDashI.emplace_back(currentArg->getValue());
 
-
   // Prepend the ordered list of -fintrinsic-modules-path
   // to the default location to search.
   for (const auto *currentArg :
@@ -1502,13 +1501,11 @@ bool CompilerInvocation::createFromArgs(
     success = false;
   }
 
-  // Default resource dir
-      auto  mainExe =  llvm::sys::fs::getMainExecutable(argv0, nullptr);
-  invoc.resourceDir = clang::driver::Driver::GetResourcesPath(argv0);
-
-  if (const llvm::opt::Arg *a =
-          args.getLastArg(clang::driver::options::OPT_resource_dir))
-    invoc.resourceDir = a->getValue();
+  // User-specified or default resource dir   
+  if (const llvm::opt::Arg *a =  args.getLastArg(clang::driver::options::OPT_resource_dir))
+    invoc.resourceDir = a->getValue(); 
+  else 
+    clang::driver::Driver::GetResourcesPath(llvm::sys::fs::getMainExecutable(argv0, nullptr));
 
   // -flang-experimental-hlfir
   if (args.hasArg(clang::driver::options::OPT_flang_experimental_hlfir) ||
@@ -1729,9 +1726,6 @@ void CompilerInvocation::setDefaultPredefinitions() {
   }
 }
 
-
-
-
 void CompilerInvocation::setFortranOpts(const llvm::TargetMachine &targetMachine) {
   auto &fortranOptions = getFortranOpts();
   const auto &frontendOptions = getFrontendOpts();

flang/test/lit.cfg.py

@@ -149,10 +149,6 @@ def get_default_intrinsic_module_path():
 
     if not flang_dir:
         lit_config.fatal(f"Couldn't find the intrinsic module dir for Flang using {flang_exe}"  )
-
-
-
-
     return flang_dir
 
 intrinsics_search_args = []
@@ -183,6 +179,12 @@ def get_default_intrinsic_module_path():
         extra_args=["-fc1"] + intrinsics_search_args+extra_intrinsics_search_args,
         unresolved="fatal",
     ),
+        ToolSubst(
+                 "bbc",
+        command=FindTool("bbc"),
+         extra_args= intrinsics_search_args+extra_intrinsics_search_args,
+           unresolved="fatal",
+        )
 ]
 
 # Flang has several unimplemented features. TODO messages are used to mark

flang/tools/bbc/bbc.cpp

@@ -92,6 +92,8 @@ static llvm::cl::alias includeAlias("module-directory",
                                     llvm::cl::desc("module search directory"),
                                     llvm::cl::aliasopt(includeDirs));
 
+
+
 static llvm::cl::list<std::string>
     intrinsicIncludeDirs("J", llvm::cl::desc("intrinsic module search paths"));
 
@@ -100,6 +102,10 @@ static llvm::cl::alias
                           llvm::cl::desc("intrinsic module directory"),
                           llvm::cl::aliasopt(intrinsicIncludeDirs));
 
+static llvm::cl::alias  intrinsicModulePath("fintrinsic-modules-path", llvm::cl::desc("intrinsic module search paths"), llvm::cl::aliasopt(intrinsicIncludeDirs));
+
+
+
 static llvm::cl::opt<std::string>
     moduleDir("module", llvm::cl::desc("module output directory (default .)"),
               llvm::cl::init("."));
@@ -570,10 +576,13 @@ int main(int argc, char **argv) {
   ProgramName programPrefix;
   programPrefix = argv[0] + ": "s;
 
- std::vector <std::string> intrinsicsDirs ( intrinsicIncludeDirs.begin(), intrinsicIncludeDirs.end());
+//std::vector <std::string> intrinsicsDirs ( intrinsicIncludeDirs.begin(), intrinsicIncludeDirs.end());
 
   if (includeDirs.size() == 0) {
     includeDirs.push_back(".");
+
+
+#if 0
     // Default Fortran modules should be installed in finclude/<target-triple> of the resource directory
 
 
@@ -603,6 +612,7 @@ vfs->makeAbsolute (resourceDir);
   //   llvm::errs() << "defaultIntrinsicsDir: " << defaultIntrinsicsDir << "\n";
  if (defaultIntrinsicsDir)
   intrinsicsDirs.push_back(*defaultIntrinsicsDir);
+#endif 
   }
 
   Fortran::parser::Options options;
@@ -682,7 +692,7 @@ vfs->makeAbsolute (resourceDir);
   semanticsContext.set_moduleDirectory(moduleDir)
       .set_moduleFileSuffix(moduleSuffix)
       .set_searchDirectories(includeDirs)
-      .set_intrinsicModuleDirectories(intrinsicsDirs)
+      .set_intrinsicModuleDirectories(intrinsicIncludeDirs)
       .set_warnOnNonstandardUsage(warnStdViolation)
       .set_warningsAreErrors(warnIsError);