dpu: clang: changing rtlib paths & names wrt changed to the rtlib build system

Author: jchauzi

clang/lib/Driver/ToolChains/DPURTE.cpp

@@ -52,7 +52,7 @@ char *DPURTE::GetUpmemSdkPath(const char *Path) {
 
 Tool *DPURTE::buildLinker() const {
   return new tools::dpu::Linker(*this, PathToLinkScript, PathToRtLibDirectory,
-                                PathToRtLibBc);
+                                RtLibName, PathToRtLibBc);
 }
 
 void DPURTE::addClangTargetOptions(
@@ -104,15 +104,15 @@ void Linker::ConstructJob(Compilation &C, const JobAction &JA,
   // the very beginning of memory with no allocation.
   CmdArgs.push_back("--define-common");
   if (!TCArgs.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
-    CmdArgs.push_back("-L");
-    CmdArgs.push_back(RtLibraryPath);
     if (TCArgs.hasArg(options::OPT_flto) ||
         TCArgs.hasArg(options::OPT_flto_EQ)) {
-      CmdArgs.push_back("-lrtmin");
       // Need to inject the RTE BC library into the whole chain.
       CmdArgs.push_back(RtBcLibrary);
     } else {
-      CmdArgs.push_back("-lrt");
+      CmdArgs.push_back("-L");
+      CmdArgs.push_back(RtLibraryPath);
+      CmdArgs.push_back("-l");
+      CmdArgs.push_back(RtLibraryName);
     }
   }
 

clang/lib/Driver/ToolChains/DPURTE.h

@@ -28,15 +28,12 @@ class LLVM_LIBRARY_VISIBILITY DPURTE : public Generic_ELF {
     PathToStdlibIncludes = GetUpmemSdkPath("/usr/share/upmem/include/stdlib");
     PathToSyslibIncludes = GetUpmemSdkPath("/usr/share/upmem/include/syslib");
     PathToLinkScript = GetUpmemSdkPath("/usr/share/upmem/include/link/dpu.lds");
-    PathToRtLibDirectory =
-        Args.hasArg(options::OPT_pg)
-            ? GetUpmemSdkPath("/usr/share/upmem/include/built-in-profiling")
-            : GetUpmemSdkPath("/usr/share/upmem/include/built-in");
+    PathToRtLibDirectory = GetUpmemSdkPath("/usr/share/upmem/include/built-in");
+    RtLibName = Args.hasArg(options::OPT_pg) ? "rt" : "rt_p";
     PathToRtLibBc =
         Args.hasArg(options::OPT_pg)
-            ? GetUpmemSdkPath(
-                  "/usr/share/upmem/include/built-in-profiling/rtlib.bc")
-            : GetUpmemSdkPath("/usr/share/upmem/include/built-in/rtlib.bc");
+            ? GetUpmemSdkPath("/usr/share/upmem/include/built-in/librtlto_p.a")
+            : GetUpmemSdkPath("/usr/share/upmem/include/built-in/librtlto.a");
   }
 
   ~DPURTE() override {
@@ -77,6 +74,7 @@ class LLVM_LIBRARY_VISIBILITY DPURTE : public Generic_ELF {
   char *PathToStdlibIncludes;
   char *PathToLinkScript;
   char *PathToRtLibDirectory;
+  const char *RtLibName;
   char *PathToRtLibBc;
 };
 } // end namespace toolchains
@@ -85,10 +83,11 @@ namespace dpu {
 class LLVM_LIBRARY_VISIBILITY Linker : public GnuTool {
 public:
   Linker(const ToolChain &TC, const char *Script, const char *RtLibDir,
-         const char *PathToRtLibBc)
+         const char *RtLibName, const char *PathToRtLibBc)
       : GnuTool("dpu::Linker", "ld.lld", TC) {
     LinkScript = Script;
     RtLibraryPath = RtLibDir;
+    RtLibraryName = RtLibName;
     RtBcLibrary = PathToRtLibBc;
   }
 
@@ -104,6 +103,7 @@ class LLVM_LIBRARY_VISIBILITY Linker : public GnuTool {
 private:
   const char *LinkScript;
   const char *RtLibraryPath;
+  const char *RtLibraryName;
   const char *RtBcLibrary;
 };
 } // end namespace dpu