Add -startfiles -stdlib positive versions for GPU

Author: jhuber6

clang/include/clang/Driver/Options.td

@@ -1316,9 +1316,6 @@ defm offload_via_llvm : BoolFOption<"offload-via-llvm",
   BothFlags<[], [ClangOption], " LLVM/Offload as portable offloading runtime.">>;
 }
 
-def gpustartfiles : Flag<["-"], "gpustartfiles">, Group<Link_Group>,
-  HelpText<"Link the GPU C startup utilities automatically, used for testing.">;
-
 // CUDA options
 let Group = cuda_Group in {
 def cuda_include_ptx_EQ : Joined<["--"], "cuda-include-ptx=">,
@@ -5608,6 +5605,7 @@ def noprebind : Flag<["-"], "noprebind">;
 def noprofilelib : Flag<["-"], "noprofilelib">;
 def noseglinkedit : Flag<["-"], "noseglinkedit">;
 def nostartfiles : Flag<["-"], "nostartfiles">, Group<Link_Group>;
+def startfiles : Flag<["-"], "startfiles">, Group<Link_Group>;
 def nostdinc : Flag<["-"], "nostdinc">,
   Visibility<[ClangOption, CLOption, DXCOption]>, Group<IncludePath_Group>,
   HelpText<"Disable both standard system #include directories and builtin #include directories">;
@@ -5620,6 +5618,9 @@ def nostdincxx : Flag<["-"], "nostdinc++">, Visibility<[ClangOption, CC1Option]>
 def nostdlib : Flag<["-"], "nostdlib">,
   Visibility<[ClangOption, CLOption, FlangOption, DXCOption]>,
   Group<Link_Group>;
+def stdlib : Flag<["-"], "stdlib">,
+  Visibility<[ClangOption, CLOption, FlangOption, DXCOption]>,
+  Group<Link_Group>;
 def nostdlibxx : Flag<["-"], "nostdlib++">;
 def object : Flag<["-"], "object">;
 def o : JoinedOrSeparate<["-"], "o">,

clang/lib/Driver/ToolChains/AMDGPU.cpp

@@ -648,13 +648,15 @@ void amdgpu::Linker::ConstructJob(Compilation &C, const JobAction &JA,
         Args.MakeArgString("-plugin-opt=-mattr=" + llvm::join(Features, ",")));
   }
 
-  if (Args.hasArg(options::OPT_gpustartfiles)) {
+  if (Args.hasArg(options::OPT_stdlib))
+    CmdArgs.append({"-lc", "-lm"});
+  if (Args.hasArg(options::OPT_startfiles)) {
     auto IncludePath = getToolChain().getStdlibPath();
     if (!IncludePath)
       IncludePath = "/lib";
     SmallString<128> P(*IncludePath);
     llvm::sys::path::append(P, "crt1.o");
-    CmdArgs.append({"-lc", "-lm", Args.MakeArgString(P)});
+    CmdArgs.push_back(Args.MakeArgString(P));
   }
 
   CmdArgs.push_back("-o");

clang/lib/Driver/ToolChains/Cuda.cpp

@@ -641,13 +641,15 @@ void NVPTX::Linker::ConstructJob(Compilation &C, const JobAction &JA,
   llvm::sys::path::append(DefaultLibPath, CLANG_INSTALL_LIBDIR_BASENAME);
   CmdArgs.push_back(Args.MakeArgString(Twine("-L") + DefaultLibPath));
 
-  if (Args.hasArg(options::OPT_gpustartfiles)) {
+  if (Args.hasArg(options::OPT_stdlib))
+    CmdArgs.append({"-lc", "-lm"});
+  if (Args.hasArg(options::OPT_startfiles)) {
     auto IncludePath = getToolChain().getStdlibPath();
     if (!IncludePath)
       IncludePath = "/lib";
     SmallString<128> P(*IncludePath);
     llvm::sys::path::append(P, "crt1.o");
-    CmdArgs.append({"-lc", "-lm", Args.MakeArgString(P)});
+    CmdArgs.push_back(Args.MakeArgString(P));
   }
 
   C.addCommand(std::make_unique<Command>(

clang/test/Driver/gpustartfiles.c

@@ -1,7 +1,7 @@
-// RUN: %clang -target nvptx64-nvidia-cuda -march=sm_61 -gpustartfiles \
+// RUN: %clang -target nvptx64-nvidia-cuda -march=sm_61 -stdlib -startfiles \
 // RUN:   -nogpulib -nogpuinc -### %s 2>&1 | FileCheck -check-prefix=NVPTX %s
 // NVPTX: clang-nvlink-wrapper{{.*}}"-lc" "-lm" "{{.*}}crt1.o"
 //
-// RUN: %clang -target amdgcn-amd-amdhsa -march=gfx90a -gpustartfiles \
+// RUN: %clang -target amdgcn-amd-amdhsa -march=gfx90a -stdlib -startfiles \
 // RUN:   -nogpulib -nogpuinc -### %s 2>&1 | FileCheck -check-prefix=AMDGPU %s
 // AMDGPU: ld.lld{{.*}}"-lc" "-lm" "{{.*}}crt1.o"