Fix static linking in wrapper tools

Author: manorom

clang/tools/nec-aurora-build/CMakeLists.txt

@@ -32,8 +32,8 @@ find_library(
 set(NECAURORA_STATIC_LINKING_AVAILABLE 1)
 
 if (NECAURORA_LIBVEORUN_STATIC)
-    set(LIBVEORUN_STATIC_PATH "${NECAURORA_LIBVEORUN_STATIC_LIBRARY}")
-    set(NECAURORA_STATIC_LINKING_AVAILABLE 0)
+    message(STATUS "Found libveorun.a")
+    set(LIBVEORUN_STATIC_PATH "${NECAURORA_LIBVEORUN_STATIC}")
 endif()
 
 find_package(NECAURORA_LIBELF)

clang/tools/nec-aurora-build/linker.cpp

@@ -103,7 +103,7 @@ std::string generateSymTabCode(const std::vector<std::string> &symbols) {
 }
 
 int runStaticLinker(const std::vector<const char *> &ObjectFiles,
-                    const std::string &Args) {
+                    const std::string &Args, const std::string &OutputFile) {
 #ifndef LIBVEORUN_STATIC_PATH
   std::cerr << "necaurora-ofld-wrapper: Static linking not supported"
             << std::endl;
@@ -118,9 +118,13 @@ int runStaticLinker(const std::vector<const char *> &ObjectFiles,
 
   std::string SymTabPath = generateSymTabCode(SymbolNames);
 
-  CmdLine << getTargetCompiler() << " "
+  CmdLine << getTargetCompiler() << " ";
+  for (auto ObjFile: ObjectFiles) {
+    CmdLine << ObjFile << " ";
+  }
+  CmdLine << SymTabPath << " "
           << LIBVEORUN_STATIC_PATH
-          << " " << SymTabPath << " " << Args;
+          << " -fopenmp -o " << OutputFile;
   if (Verbose) {
     std::cerr << "  \"" << CmdLine.str() << "\"" << std::endl;
   }

clang/tools/nec-aurora-build/necaurora-ofld-wrapper.cpp

@@ -42,7 +42,8 @@ enum class ToolMode {
 
 int parseCmdline(int argc, char **argv, ToolMode &Mode, std::string &SotocPath,
                  std::string &InputFile, std::string &Args, bool &Verbose,
-                 bool &SaveTemps, std::vector<const char *> &ObjectFiles) {
+                 bool &SaveTemps, std::vector<const char *> &ObjectFiles,
+                 std::string &OutputFile) {
   std::stringstream ArgsStream;
   Mode = ToolMode::Unknown;
   bool StaticLinkerFlag = false;
@@ -87,6 +88,10 @@ int parseCmdline(int argc, char **argv, ToolMode &Mode, std::string &SotocPath,
       ArgsStream << argv[i] << " ";
       ObjectFiles.push_back(argv[i]);
       continue;
+    } else if (strcmp(argv[i], "-o") == 0) {
+      ArgsStream << argv[i] << " ";
+      OutputFile = std::string(argv[i+1]);
+      continue;
     } else {
       ArgsStream << argv[i] << " ";
     }
@@ -131,11 +136,12 @@ int main(int argc, char **argv) {
   std::string SotocOutputPath;
   std::string Args;
   std::vector<const char *> ObjectFiles;
+  std::string OutputFile;
 
   KeepTransformedFilesDir = std::getenv("NECAURORA_KEEP_FILES_DIR");
 
   rc = parseCmdline(argc, argv, Mode, SotocPath, InputFile, Args, Verbose,
-                    SaveTemps, ObjectFiles);
+                    SaveTemps, ObjectFiles, OutputFile);
   if (rc != 0) {
     std::cerr << "necaurora-ofld-cc1-wraper: failed parsing the command "
               << "line\n";
@@ -161,7 +167,7 @@ int main(int argc, char **argv) {
       return EXIT_FAILURE;
     }
   } else if (Mode == ToolMode::StaticLinker) {
-    rc = runStaticLinker(ObjectFiles, Args);
+    rc = runStaticLinker(ObjectFiles, Args, OutputFile);
     if (rc != 0) {
       std::cerr << "necaurora-ofld-wrapper: static linking failed "
                 << "with code " << rc << "\n";

clang/tools/nec-aurora-build/necaurora-ofld-wrapper.h

@@ -17,7 +17,8 @@ int runSourceTransformation(const std::string &InputPath,
 int runTargetCompiler(const std::string &InputPath, const std::string &Args);
 
 int runStaticLinker(const std::vector<const char *> &ObjectFiles,
-                    const std::string &Args);
+                    const std::string &Args,
+                    const std::string &OutputFile);
 
 int runPassthrough(const std::string &Args);