Merge pull request #302750 from ExpidusOS/feat/dump-llvm-9

, cling

, fetchurl

, lib

, llvmPackages_9

, llvmPackages_13

, makeWrapper

, runCommand

, stdenv

, fetchFromGitHub

, gcc

, git

, llvmPackages_9

, llvmPackages_13

# Libraries

, argparse

, cling

    cling.unwrapped

    cppzmq

    libuuid

    llvmPackages_9.llvm

    llvmPackages_13.llvm

    ncurses

    openssl

    pugixml

    "-DCMAKE_BUILD_TYPE=Debug"

  ];

  postPatch = ''

    substituteInPlace src/xmagics/executable.cpp \

      --replace "getDataLayout" "getDataLayoutString"

    substituteInPlace src/xmagics/execution.cpp \

      --replace "simplisticCastAs" "castAs"

    substituteInPlace src/xmime_internal.hpp \

      --replace "code.str()" "code.str().str()"

  '';

  dontStrip = debug;

  meta = {

      echo "-isystem ${getDev libcxx}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags

      echo "-stdlib=libc++" >> $out/nix-support/libcxx-ldflags

    ''

    # can remove once LLVM9 and LLVM11 are dropped from nixpkgs

    + optionalString (libcxx.isLLVM or false && lib.versionOlder (lib.getVersion libcxx) "12" && libcxx ? cxxabi.libName) ''

      echo "-isystem ${lib.getDev libcxx.cxxabi}/include/c++/v1" >> $out/nix-support/libcxx-cxxflags

      echo "-l${libcxx.cxxabi.libName}" >> $out/nix-support/libcxx-ldflags

    ''

    ##

    ## Initial CFLAGS

From 7147e9774c74abcd1d6db24e24d0fd989c2b97dd Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Holger=20W=C3=BCnsche?= <holger.o.wuensche@t-online.de>

Date: Tue, 21 Jan 2020 19:52:04 +0100

Subject: [PATCH] [HIP] use GetProgramPath for executable discovery

This change replaces the manual building of executable paths

using llvm::sys::path::append with GetProgramPath.

This enables adding other paths in case executables reside

in different directories and makes the code easier to read.

Differential Revision: https://reviews.llvm.org/D72903

---

 clang/lib/Driver/ToolChains/HIP.cpp | 23 ++++++++---------------

 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/lib/Driver/ToolChains/HIP.cpp b/lib/Driver/ToolChains/HIP.cpp

index 2ec97e798fd..735c302debb 100644

--- a/lib/Driver/ToolChains/HIP.cpp

+++ b/lib/Driver/ToolChains/HIP.cpp

@@ -66,9 +66,8 @@ const char *AMDGCN::Linker::constructLLVMLinkCommand(

   const char *OutputFileName =

       C.addTempFile(C.getArgs().MakeArgString(TmpName));

   CmdArgs.push_back(OutputFileName);

-  SmallString<128> ExecPath(C.getDriver().Dir);

-  llvm::sys::path::append(ExecPath, "llvm-link");

-  const char *Exec = Args.MakeArgString(ExecPath);

+  const char *Exec =

+      Args.MakeArgString(getToolChain().GetProgramPath("llvm-link"));

   C.addCommand(llvm::make_unique<Command>(JA, *this, Exec, CmdArgs, Inputs));

   return OutputFileName;

 }

@@ -114,9 +113,8 @@ const char *AMDGCN::Linker::constructOptCommand(

   const char *OutputFileName =

       C.addTempFile(C.getArgs().MakeArgString(TmpFileName));

   OptArgs.push_back(OutputFileName);

-  SmallString<128> OptPath(C.getDriver().Dir);

-  llvm::sys::path::append(OptPath, "opt");

-  const char *OptExec = Args.MakeArgString(OptPath);

+  const char *OptExec =

+      Args.MakeArgString(getToolChain().GetProgramPath("opt"));

   C.addCommand(llvm::make_unique<Command>(JA, *this, OptExec, OptArgs, Inputs));

   return OutputFileName;

 }

@@ -156,9 +154,7 @@ const char *AMDGCN::Linker::constructLlcCommand(

   const char *LlcOutputFile =

       C.addTempFile(C.getArgs().MakeArgString(LlcOutputFileName));

   LlcArgs.push_back(LlcOutputFile);

-  SmallString<128> LlcPath(C.getDriver().Dir);

-  llvm::sys::path::append(LlcPath, "llc");

-  const char *Llc = Args.MakeArgString(LlcPath);

+  const char *Llc = Args.MakeArgString(getToolChain().GetProgramPath("llc"));

   C.addCommand(llvm::make_unique<Command>(JA, *this, Llc, LlcArgs, Inputs));

   return LlcOutputFile;

 }

@@ -172,9 +168,7 @@ void AMDGCN::Linker::constructLldCommand(Compilation &C, const JobAction &JA,

   // The output from ld.lld is an HSA code object file.

   ArgStringList LldArgs{

       "-flavor", "gnu", "-shared", "-o", Output.getFilename(), InputFileName};

-  SmallString<128> LldPath(C.getDriver().Dir);

-  llvm::sys::path::append(LldPath, "lld");

-  const char *Lld = Args.MakeArgString(LldPath);

+  const char *Lld = Args.MakeArgString(getToolChain().GetProgramPath("lld"));

   C.addCommand(llvm::make_unique<Command>(JA, *this, Lld, LldArgs, Inputs));

 }

@@ -206,9 +200,8 @@ void AMDGCN::constructHIPFatbinCommand(Compilation &C, const JobAction &JA,

       Args.MakeArgString(std::string("-outputs=").append(OutputFileName));

   BundlerArgs.push_back(BundlerOutputArg);

-  SmallString<128> BundlerPath(C.getDriver().Dir);

-  llvm::sys::path::append(BundlerPath, "clang-offload-bundler");

-  const char *Bundler = Args.MakeArgString(BundlerPath);

+  const char *Bundler = Args.MakeArgString(

+      T.getToolChain().GetProgramPath("clang-offload-bundler"));

   C.addCommand(llvm::make_unique<Command>(JA, T, Bundler, BundlerArgs, Inputs));

 }

-- 

2.23.1

Index: lib/Driver/ToolChains/BareMetal.cpp

===================================================================

--- a/lib/Driver/ToolChains/BareMetal.cpp

+++ b/lib/Driver/ToolChains/BareMetal.cpp

@@ -157,7 +157,7 @@

 void BareMetal::AddLinkRuntimeLib(const ArgList &Args,

                                   ArgStringList &CmdArgs) const {

   CmdArgs.push_back(Args.MakeArgString("-lclang_rt.builtins-" +

-                                       getTriple().getArchName() + ".a"));

+                                       getTriple().getArchName()));

 }

 void baremetal::Linker::ConstructJob(Compilation &C, const JobAction &JA,

Index: test/Driver/baremetal.cpp

===================================================================

--- a/test/Driver/baremetal.cpp

+++ b/test/Driver/baremetal.cpp

@@ -13,7 +13,7 @@

 // CHECK-V6M-C-NEXT: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"

 // CHECK-V6M-C-SAME: "-L[[RESOURCE_DIR:[^"]+]]{{[/\\]+}}lib{{[/\\]+}}baremetal"

 // CHECK-V6M-C-SAME: "-T" "semihosted.lds" "-Lsome{{[/\\]+}}directory{{[/\\]+}}user{{[/\\]+}}asked{{[/\\]+}}for"

-// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"

+// CHECK-V6M-C-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"

 // CHECK-V6M-C-SAME: "-o" "{{.*}}.o"

 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \

@@ -35,7 +35,7 @@

 // CHECK-V6M-DEFAULTCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"

 // CHECK-V6M-DEFAULTCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"

 // CHECK-V6M-DEFAULTCXX-SAME: "-lc++" "-lc++abi" "-lunwind"

-// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"

+// CHECK-V6M-DEFAULTCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"

 // CHECK-V6M-DEFAULTCXX-SAME: "-o" "{{.*}}.o"

 // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \

@@ -48,7 +48,7 @@

 // CHECK-V6M-LIBCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"

 // CHECK-V6M-LIBCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"

 // CHECK-V6M-LIBCXX-SAME: "-lc++" "-lc++abi" "-lunwind"

-// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"

+// CHECK-V6M-LIBCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"

 // CHECK-V6M-LIBCXX-SAME: "-o" "{{.*}}.o"

 // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \

@@ -61,7 +61,7 @@

 // CHECK-V6M-LIBSTDCXX: "{{[^"]*}}ld{{(\.(lld|bfd|gold))?}}{{(\.exe)?}}" "{{.*}}.o" "-Bstatic"

 // CHECK-V6M-LIBSTDCXX-SAME: "-L{{[^"]*}}{{[/\\]+}}lib{{(64)?}}{{[/\\]+}}clang{{[/\\]+}}{{.*}}{{[/\\]+}}lib{{[/\\]+}}baremetal"

 // CHECK-V6M-LIBSTDCXX-SAME: "-lstdc++" "-lsupc++" "-lunwind"

-// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m.a"

+// CHECK-V6M-LIBSTDCXX-SAME: "-lc" "-lm" "-lclang_rt.builtins-armv6m"

 // CHECK-V6M-LIBSTDCXX-SAME: "-o" "{{.*}}.o"

 // RUN: %clangxx -no-canonical-prefixes %s -### -o %t.o 2>&1 \