[clang] [Driver][Solaris][NFC] A little bit of clean up (PR #69867)

[Brad Smith via cfe-commits]

https://github.com/brad0 closed https://github.com/llvm/llvm-project/pull/69867
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [Driver][Solaris][NFC] A little bit of clean up (PR #69867)

[Fangrui Song via cfe-commits]

https://github.com/MaskRay approved this pull request.


https://github.com/llvm/llvm-project/pull/69867
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [Driver][Solaris][NFC] A little bit of clean up (PR #69867)

[Brad Smith via cfe-commits]

brad0 wrote:

@MaskRay Ping.

https://github.com/llvm/llvm-project/pull/69867
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [Driver][Solaris][NFC] A little bit of clean up (PR #69867)

[Brad Smith via cfe-commits]

https://github.com/brad0 updated https://github.com/llvm/llvm-project/pull/69867

>From 1aa7e406378adb1b7c3ba79b10d2dcb0a48c4ce6 Mon Sep 17 00:00:00 2001
From: Brad Smith 
Date: Sun, 22 Oct 2023 00:55:07 -0400
Subject: [PATCH] [Driver][Solaris][NFC] A little bit of clean up

---
 clang/lib/Driver/ToolChains/Solaris.cpp | 72 -
 1 file changed, 34 insertions(+), 38 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/Solaris.cpp 
b/clang/lib/Driver/ToolChains/Solaris.cpp
index 5421c029562abca..e45932008a65ab8 100644
--- a/clang/lib/Driver/ToolChains/Solaris.cpp
+++ b/clang/lib/Driver/ToolChains/Solaris.cpp
@@ -87,10 +87,12 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
const InputInfoList ,
const ArgList ,
const char *LinkingOutput) const {
-  const Driver  = getToolChain().getDriver();
-  const bool IsPIE = getPIE(Args, getToolChain());
+  const auto  = static_cast(getToolChain());
+  const Driver  = ToolChain.getDriver();
+  const llvm::Triple::ArchType Arch = ToolChain.getArch();
+  const bool IsPIE = getPIE(Args, ToolChain);
+  const bool LinkerIsGnuLd = isLinkerGnuLd(ToolChain, Args);
   ArgStringList CmdArgs;
-  bool LinkerIsGnuLd = isLinkerGnuLd(getToolChain(), Args);
 
   // Demangle C++ names in errors.  GNU ld already defaults to --demangle.
   if (!LinkerIsGnuLd)
@@ -126,9 +128,6 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
 
   if (LinkerIsGnuLd) {
 // Set the correct linker emulation for 32- and 64-bit Solaris.
-const auto  = static_cast(getToolChain());
-const llvm::Triple::ArchType Arch = ToolChain.getArch();
-
 switch (Arch) {
 case llvm::Triple::x86:
   CmdArgs.push_back("-m");
@@ -168,10 +167,9 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
options::OPT_r)) {
 if (!Args.hasArg(options::OPT_shared))
-  CmdArgs.push_back(
-  Args.MakeArgString(getToolChain().GetFilePath("crt1.o")));
+  CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crt1.o")));
 
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath("crti.o")));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o")));
 
 const Arg *Std = Args.getLastArg(options::OPT_std_EQ, options::OPT_ansi);
 bool HaveAnsi = false;
@@ -186,43 +184,42 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
 // Use values-Xc.o for -ansi, -std=c*, -std=iso9899:199409.
 if (HaveAnsi || (LangStd && !LangStd->isGNUMode()))
   values_X = "values-Xc.o";
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(values_X)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(values_X)));
 
 const char *values_xpg = "values-xpg6.o";
 // Use values-xpg4.o for -std=c90, -std=gnu90, -std=iso9899:199409.
 if (LangStd && LangStd->getLanguage() == Language::C && !LangStd->isC99())
   values_xpg = "values-xpg4.o";
-CmdArgs.push_back(
-Args.MakeArgString(getToolChain().GetFilePath(values_xpg)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(values_xpg)));
 
 const char *crtbegin = nullptr;
 if (Args.hasArg(options::OPT_shared) || IsPIE)
   crtbegin = "crtbeginS.o";
 else
   crtbegin = "crtbegin.o";
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(crtbegin)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin)));
 // Add crtfastmath.o if available and fast math is enabled.
-getToolChain().addFastMathRuntimeIfAvailable(Args, CmdArgs);
+ToolChain.addFastMathRuntimeIfAvailable(Args, CmdArgs);
   }
 
-  getToolChain().AddFilePathLibArgs(Args, CmdArgs);
+  ToolChain.AddFilePathLibArgs(Args, CmdArgs);
 
   Args.addAllArgs(CmdArgs,
   {options::OPT_L, options::OPT_T_Group, options::OPT_r});
 
-  bool NeedsSanitizerDeps = addSanitizerRuntimes(getToolChain(), Args, 
CmdArgs);
-  AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
+  bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
+  AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
options::OPT_r)) {
 // Use the static OpenMP runtime with -static-openmp
 bool StaticOpenMP = Args.hasArg(options::OPT_static_openmp) &&
 !Args.hasArg(options::OPT_static);
-addOpenMPRuntime(CmdArgs, getToolChain(), Args, StaticOpenMP);
+addOpenMPRuntime(CmdArgs, ToolChain, Args, StaticOpenMP);
 
 if (D.CCCIsCXX()) {
-  if (getToolChain().ShouldLinkCXXStdlib(Args))
-getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
+  if (ToolChain.ShouldLinkCXXStdlib(Args))
+

[clang] [Driver][Solaris][NFC] A little bit of clean up (PR #69867)

[Brad Smith via cfe-commits]

https://github.com/brad0 updated https://github.com/llvm/llvm-project/pull/69867

>From 9896afcd836cc87a051dd486034c395eda8493eb Mon Sep 17 00:00:00 2001
From: Brad Smith 
Date: Sun, 22 Oct 2023 00:55:07 -0400
Subject: [PATCH] [Driver][Solaris][NFC] A little bit of clean up

---
 clang/lib/Driver/ToolChains/Solaris.cpp | 70 -
 1 file changed, 33 insertions(+), 37 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/Solaris.cpp 
b/clang/lib/Driver/ToolChains/Solaris.cpp
index 3d5a710842eca44..caafd76b4772027 100644
--- a/clang/lib/Driver/ToolChains/Solaris.cpp
+++ b/clang/lib/Driver/ToolChains/Solaris.cpp
@@ -87,10 +87,12 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
const InputInfoList ,
const ArgList ,
const char *LinkingOutput) const {
-  const Driver  = getToolChain().getDriver();
-  const bool IsPIE = getPIE(Args, getToolChain());
+  const auto  = static_cast(getToolChain());
+  const Driver  = ToolChain.getDriver();
+  const llvm::Triple::ArchType Arch = ToolChain.getArch();
+  const bool IsPIE = getPIE(Args, ToolChain);
+  const bool LinkerIsGnuLd = isLinkerGnuLd(ToolChain, Args);
   ArgStringList CmdArgs;
-  bool LinkerIsGnuLd = isLinkerGnuLd(getToolChain(), Args);
 
   // Demangle C++ names in errors.  GNU ld already defaults to --demangle.
   if (!LinkerIsGnuLd)
@@ -126,9 +128,6 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
 
   if (LinkerIsGnuLd) {
 // Set the correct linker emulation for 32- and 64-bit Solaris.
-const auto  = static_cast(getToolChain());
-const llvm::Triple::ArchType Arch = ToolChain.getArch();
-
 switch (Arch) {
 case llvm::Triple::x86:
   CmdArgs.push_back("-m");
@@ -168,10 +167,9 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
options::OPT_r)) {
 if (!Args.hasArg(options::OPT_shared))
-  CmdArgs.push_back(
-  Args.MakeArgString(getToolChain().GetFilePath("crt1.o")));
+  CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crt1.o")));
 
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath("crti.o")));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o")));
 
 const Arg *Std = Args.getLastArg(options::OPT_std_EQ, options::OPT_ansi);
 bool HaveAnsi = false;
@@ -186,46 +184,45 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
 // Use values-Xc.o for -ansi, -std=c*, -std=iso9899:199409.
 if (HaveAnsi || (LangStd && !LangStd->isGNUMode()))
   values_X = "values-Xc.o";
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(values_X)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(values_X)));
 
 const char *values_xpg = "values-xpg6.o";
 // Use values-xpg4.o for -std=c90, -std=gnu90, -std=iso9899:199409.
 if (LangStd && LangStd->getLanguage() == Language::C && !LangStd->isC99())
   values_xpg = "values-xpg4.o";
-CmdArgs.push_back(
-Args.MakeArgString(getToolChain().GetFilePath(values_xpg)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(values_xpg)));
 
 const char *crtbegin = nullptr;
 if (Args.hasArg(options::OPT_shared) || IsPIE)
   crtbegin = "crtbeginS.o";
 else
   crtbegin = "crtbegin.o";
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(crtbegin)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin)));
 // Add crtfastmath.o if available and fast math is enabled.
-getToolChain().addFastMathRuntimeIfAvailable(Args, CmdArgs);
+ToolChain.addFastMathRuntimeIfAvailable(Args, CmdArgs);
   }
 
-  getToolChain().AddFilePathLibArgs(Args, CmdArgs);
+  ToolChain.AddFilePathLibArgs(Args, CmdArgs);
 
   Args.addAllArgs(CmdArgs,
   {options::OPT_L, options::OPT_T_Group, options::OPT_r});
 
-  bool NeedsSanitizerDeps = addSanitizerRuntimes(getToolChain(), Args, 
CmdArgs);
-  AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
+  bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
+  AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
options::OPT_r)) {
 if (D.CCCIsCXX()) {
-  if (getToolChain().ShouldLinkCXXStdlib(Args))
-getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
+  if (ToolChain.ShouldLinkCXXStdlib(Args))
+ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
   CmdArgs.push_back("-lm");
 }
 // Additional linker set-up and flags for Fortran. This is required in 
order
 // to generate executables. As Fortran runtime depends on the C runtime,
 // these dependencies need to be listed before the C runtime below.
 if 

[clang] [Driver][Solaris][NFC] A little bit of clean up (PR #69867)

[Brad Smith via cfe-commits]

https://github.com/brad0 updated https://github.com/llvm/llvm-project/pull/69867

>From 9530591f803a41e7d582c897477ec98fb39411e8 Mon Sep 17 00:00:00 2001
From: Brad Smith 
Date: Sun, 22 Oct 2023 00:55:07 -0400
Subject: [PATCH] [Driver][Solaris][NFC] A little bit of clean up

---
 clang/lib/Driver/ToolChains/Solaris.cpp | 69 -
 1 file changed, 33 insertions(+), 36 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/Solaris.cpp 
b/clang/lib/Driver/ToolChains/Solaris.cpp
index 3d5a710842eca44..f0611046b37029d 100644
--- a/clang/lib/Driver/ToolChains/Solaris.cpp
+++ b/clang/lib/Driver/ToolChains/Solaris.cpp
@@ -87,10 +87,12 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
const InputInfoList ,
const ArgList ,
const char *LinkingOutput) const {
-  const Driver  = getToolChain().getDriver();
-  const bool IsPIE = getPIE(Args, getToolChain());
+  const auto  = static_cast(getToolChain());
+  const Driver  = ToolChain.getDriver();
+  const llvm::Triple::ArchType Arch = ToolChain.getArch();
+  const bool IsPIE = getPIE(Args, ToolChain);
+  const bool LinkerIsGnuLd = isLinkerGnuLd(ToolChain, Args);
   ArgStringList CmdArgs;
-  bool LinkerIsGnuLd = isLinkerGnuLd(getToolChain(), Args);
 
   // Demangle C++ names in errors.  GNU ld already defaults to --demangle.
   if (!LinkerIsGnuLd)
@@ -126,9 +128,6 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
 
   if (LinkerIsGnuLd) {
 // Set the correct linker emulation for 32- and 64-bit Solaris.
-const auto  = static_cast(getToolChain());
-const llvm::Triple::ArchType Arch = ToolChain.getArch();
-
 switch (Arch) {
 case llvm::Triple::x86:
   CmdArgs.push_back("-m");
@@ -168,10 +167,9 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
options::OPT_r)) {
 if (!Args.hasArg(options::OPT_shared))
-  CmdArgs.push_back(
-  Args.MakeArgString(getToolChain().GetFilePath("crt1.o")));
+  CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crt1.o")));
 
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath("crti.o")));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o")));
 
 const Arg *Std = Args.getLastArg(options::OPT_std_EQ, options::OPT_ansi);
 bool HaveAnsi = false;
@@ -186,46 +184,46 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
 // Use values-Xc.o for -ansi, -std=c*, -std=iso9899:199409.
 if (HaveAnsi || (LangStd && !LangStd->isGNUMode()))
   values_X = "values-Xc.o";
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(values_X)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(values_X)));
 
 const char *values_xpg = "values-xpg6.o";
 // Use values-xpg4.o for -std=c90, -std=gnu90, -std=iso9899:199409.
 if (LangStd && LangStd->getLanguage() == Language::C && !LangStd->isC99())
   values_xpg = "values-xpg4.o";
 CmdArgs.push_back(
-Args.MakeArgString(getToolChain().GetFilePath(values_xpg)));
+Args.MakeArgString(ToolChain.GetFilePath(values_xpg)));
 
 const char *crtbegin = nullptr;
 if (Args.hasArg(options::OPT_shared) || IsPIE)
   crtbegin = "crtbeginS.o";
 else
   crtbegin = "crtbegin.o";
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(crtbegin)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin)));
 // Add crtfastmath.o if available and fast math is enabled.
-getToolChain().addFastMathRuntimeIfAvailable(Args, CmdArgs);
+ToolChain.addFastMathRuntimeIfAvailable(Args, CmdArgs);
   }
 
-  getToolChain().AddFilePathLibArgs(Args, CmdArgs);
+  ToolChain.AddFilePathLibArgs(Args, CmdArgs);
 
   Args.addAllArgs(CmdArgs,
   {options::OPT_L, options::OPT_T_Group, options::OPT_r});
 
-  bool NeedsSanitizerDeps = addSanitizerRuntimes(getToolChain(), Args, 
CmdArgs);
-  AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
+  bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
+  AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
options::OPT_r)) {
 if (D.CCCIsCXX()) {
-  if (getToolChain().ShouldLinkCXXStdlib(Args))
-getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
+  if (ToolChain.ShouldLinkCXXStdlib(Args))
+ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
   CmdArgs.push_back("-lm");
 }
 // Additional linker set-up and flags for Fortran. This is required in 
order
 // to generate executables. As Fortran runtime depends on the C runtime,
 // these dependencies need to be listed before the C runtime below.
 if (D.IsFlangMode()) {
-  

[clang] [Driver][Solaris][NFC] A little bit of clean up (PR #69867)

[Brad Smith via cfe-commits]

https://github.com/brad0 updated https://github.com/llvm/llvm-project/pull/69867

>From 813cdfc23027f3b5494115653b458bc1df3ee2f2 Mon Sep 17 00:00:00 2001
From: Brad Smith 
Date: Sun, 22 Oct 2023 00:55:07 -0400
Subject: [PATCH] [Driver][Solaris][NFC] A little bit of clean up

---
 clang/lib/Driver/ToolChains/Solaris.cpp | 68 -
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/Solaris.cpp 
b/clang/lib/Driver/ToolChains/Solaris.cpp
index 3d5a710842eca44..c8240e2283f3ff7 100644
--- a/clang/lib/Driver/ToolChains/Solaris.cpp
+++ b/clang/lib/Driver/ToolChains/Solaris.cpp
@@ -87,10 +87,12 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
const InputInfoList ,
const ArgList ,
const char *LinkingOutput) const {
-  const Driver  = getToolChain().getDriver();
-  const bool IsPIE = getPIE(Args, getToolChain());
+  const auto  = static_cast(getToolChain());
+  const Driver  = ToolChain.getDriver();
+  const llvm::Triple::ArchType Arch = ToolChain.getArch();
+  const bool IsPIE = getPIE(Args, ToolChain);
+  const bool LinkerIsGnuLd = isLinkerGnuLd(ToolChain, Args);
   ArgStringList CmdArgs;
-  bool LinkerIsGnuLd = isLinkerGnuLd(getToolChain(), Args);
 
   // Demangle C++ names in errors.  GNU ld already defaults to --demangle.
   if (!LinkerIsGnuLd)
@@ -126,9 +128,6 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
 
   if (LinkerIsGnuLd) {
 // Set the correct linker emulation for 32- and 64-bit Solaris.
-const auto  = static_cast(getToolChain());
-const llvm::Triple::ArchType Arch = ToolChain.getArch();
-
 switch (Arch) {
 case llvm::Triple::x86:
   CmdArgs.push_back("-m");
@@ -169,9 +168,9 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
options::OPT_r)) {
 if (!Args.hasArg(options::OPT_shared))
   CmdArgs.push_back(
-  Args.MakeArgString(getToolChain().GetFilePath("crt1.o")));
+  Args.MakeArgString(ToolChain.GetFilePath("crt1.o")));
 
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath("crti.o")));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o")));
 
 const Arg *Std = Args.getLastArg(options::OPT_std_EQ, options::OPT_ansi);
 bool HaveAnsi = false;
@@ -186,46 +185,46 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
 // Use values-Xc.o for -ansi, -std=c*, -std=iso9899:199409.
 if (HaveAnsi || (LangStd && !LangStd->isGNUMode()))
   values_X = "values-Xc.o";
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(values_X)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(values_X)));
 
 const char *values_xpg = "values-xpg6.o";
 // Use values-xpg4.o for -std=c90, -std=gnu90, -std=iso9899:199409.
 if (LangStd && LangStd->getLanguage() == Language::C && !LangStd->isC99())
   values_xpg = "values-xpg4.o";
 CmdArgs.push_back(
-Args.MakeArgString(getToolChain().GetFilePath(values_xpg)));
+Args.MakeArgString(ToolChain.GetFilePath(values_xpg)));
 
 const char *crtbegin = nullptr;
 if (Args.hasArg(options::OPT_shared) || IsPIE)
   crtbegin = "crtbeginS.o";
 else
   crtbegin = "crtbegin.o";
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(crtbegin)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin)));
 // Add crtfastmath.o if available and fast math is enabled.
-getToolChain().addFastMathRuntimeIfAvailable(Args, CmdArgs);
+ToolChain.addFastMathRuntimeIfAvailable(Args, CmdArgs);
   }
 
-  getToolChain().AddFilePathLibArgs(Args, CmdArgs);
+  ToolChain.AddFilePathLibArgs(Args, CmdArgs);
 
   Args.addAllArgs(CmdArgs,
   {options::OPT_L, options::OPT_T_Group, options::OPT_r});
 
-  bool NeedsSanitizerDeps = addSanitizerRuntimes(getToolChain(), Args, 
CmdArgs);
-  AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
+  bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
+  AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
options::OPT_r)) {
 if (D.CCCIsCXX()) {
-  if (getToolChain().ShouldLinkCXXStdlib(Args))
-getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
+  if (ToolChain.ShouldLinkCXXStdlib(Args))
+ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
   CmdArgs.push_back("-lm");
 }
 // Additional linker set-up and flags for Fortran. This is required in 
order
 // to generate executables. As Fortran runtime depends on the C runtime,
 // these dependencies need to be listed before the C runtime below.
 if (D.IsFlangMode()) {
-  addFortranRuntimeLibraryPath(getToolChain(), Args, CmdArgs);
-  

[clang] [Driver][Solaris][NFC] A little bit of clean up (PR #69867)

[Brad Smith via cfe-commits]

brad0 wrote:

ping.

https://github.com/llvm/llvm-project/pull/69867
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [Driver][Solaris][NFC] A little bit of clean up (PR #69867)

[via cfe-commits]

github-actions[bot] wrote:




:warning: C/C++ code formatter, clang-format found issues in your code. 
:warning:



You can test this locally with the following command:


``bash
git-clang-format --diff 0b7ae41b23fc05c2ac3afc8566b8a923d7f76c45 
e2c5b620b7d527dc0ba886122a0a510c058dcd17 -- 
clang/lib/Driver/ToolChains/Solaris.cpp
``





View the diff from clang-format here.


``diff
diff --git a/clang/lib/Driver/ToolChains/Solaris.cpp 
b/clang/lib/Driver/ToolChains/Solaris.cpp
index 0848441c3dbc..cd94616eef3e 100644
--- a/clang/lib/Driver/ToolChains/Solaris.cpp
+++ b/clang/lib/Driver/ToolChains/Solaris.cpp
@@ -168,8 +168,7 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nostartfiles,
options::OPT_r)) {
 if (!Args.hasArg(options::OPT_shared))
-  CmdArgs.push_back(
-  Args.MakeArgString(ToolChain.GetFilePath("crt1.o")));
+  CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crt1.o")));
 
 CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o")));
 
@@ -192,8 +191,7 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
 // Use values-xpg4.o for -std=c90, -std=gnu90, -std=iso9899:199409.
 if (LangStd && LangStd->getLanguage() == Language::C && !LangStd->isC99())
   values_xpg = "values-xpg4.o";
-CmdArgs.push_back(
-Args.MakeArgString(ToolChain.GetFilePath(values_xpg)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(values_xpg)));
 
 const char *crtbegin = nullptr;
 if (Args.hasArg(options::OPT_shared) || IsPIE)
@@ -279,10 +277,8 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
   crtend = "crtendS.o";
 else
   crtend = "crtend.o";
-CmdArgs.push_back(
-Args.MakeArgString(ToolChain.GetFilePath(crtend)));
-CmdArgs.push_back(
-Args.MakeArgString(ToolChain.GetFilePath("crtn.o")));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtend)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crtn.o")));
   }
 
   ToolChain.addProfileRTLibs(Args, CmdArgs);

``




https://github.com/llvm/llvm-project/pull/69867
___
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[clang] [Driver][Solaris][NFC] A little bit of clean up (PR #69867)

[Brad Smith via cfe-commits]

https://github.com/brad0 created https://github.com/llvm/llvm-project/pull/69867

None

>From e2c5b620b7d527dc0ba886122a0a510c058dcd17 Mon Sep 17 00:00:00 2001
From: Brad Smith 
Date: Sun, 22 Oct 2023 00:55:07 -0400
Subject: [PATCH] [Driver][Solaris][NFC] A little bit of clean up

---
 clang/lib/Driver/ToolChains/Solaris.cpp | 69 -
 1 file changed, 34 insertions(+), 35 deletions(-)

diff --git a/clang/lib/Driver/ToolChains/Solaris.cpp 
b/clang/lib/Driver/ToolChains/Solaris.cpp
index ecff8ddc4ee766f..0848441c3dbc603 100644
--- a/clang/lib/Driver/ToolChains/Solaris.cpp
+++ b/clang/lib/Driver/ToolChains/Solaris.cpp
@@ -87,10 +87,12 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
const InputInfoList ,
const ArgList ,
const char *LinkingOutput) const {
-  const Driver  = getToolChain().getDriver();
-  const bool IsPIE = getPIE(Args, getToolChain());
+  const auto  = static_cast(getToolChain());
+  const Driver  = ToolChain.getDriver();
+  const llvm::Triple::ArchType Arch = ToolChain.getArch();
+  const bool IsPIE = getPIE(Args, ToolChain);
+  const bool LinkerIsGnuLd = isLinkerGnuLd(ToolChain, Args);
   ArgStringList CmdArgs;
-  bool LinkerIsGnuLd = isLinkerGnuLd(getToolChain(), Args);
 
   // Demangle C++ names in errors.  GNU ld already defaults to --demangle.
   if (!LinkerIsGnuLd)
@@ -127,10 +129,6 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
 
   if (LinkerIsGnuLd) {
 // Set the correct linker emulation for 32- and 64-bit Solaris.
-const toolchains::Solaris  =
-static_cast(getToolChain());
-const llvm::Triple::ArchType Arch = ToolChain.getArch();
-
 switch (Arch) {
 case llvm::Triple::x86:
   CmdArgs.push_back("-m");
@@ -171,9 +169,9 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
options::OPT_r)) {
 if (!Args.hasArg(options::OPT_shared))
   CmdArgs.push_back(
-  Args.MakeArgString(getToolChain().GetFilePath("crt1.o")));
+  Args.MakeArgString(ToolChain.GetFilePath("crt1.o")));
 
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath("crti.o")));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath("crti.o")));
 
 const Arg *Std = Args.getLastArg(options::OPT_std_EQ, options::OPT_ansi);
 bool HaveAnsi = false;
@@ -188,46 +186,46 @@ void solaris::Linker::ConstructJob(Compilation , const 
JobAction ,
 // Use values-Xc.o for -ansi, -std=c*, -std=iso9899:199409.
 if (HaveAnsi || (LangStd && !LangStd->isGNUMode()))
   values_X = "values-Xc.o";
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(values_X)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(values_X)));
 
 const char *values_xpg = "values-xpg6.o";
 // Use values-xpg4.o for -std=c90, -std=gnu90, -std=iso9899:199409.
 if (LangStd && LangStd->getLanguage() == Language::C && !LangStd->isC99())
   values_xpg = "values-xpg4.o";
 CmdArgs.push_back(
-Args.MakeArgString(getToolChain().GetFilePath(values_xpg)));
+Args.MakeArgString(ToolChain.GetFilePath(values_xpg)));
 
 const char *crtbegin = nullptr;
 if (Args.hasArg(options::OPT_shared) || IsPIE)
   crtbegin = "crtbeginS.o";
 else
   crtbegin = "crtbegin.o";
-
CmdArgs.push_back(Args.MakeArgString(getToolChain().GetFilePath(crtbegin)));
+CmdArgs.push_back(Args.MakeArgString(ToolChain.GetFilePath(crtbegin)));
 // Add crtfastmath.o if available and fast math is enabled.
-getToolChain().addFastMathRuntimeIfAvailable(Args, CmdArgs);
+ToolChain.addFastMathRuntimeIfAvailable(Args, CmdArgs);
   }
 
-  getToolChain().AddFilePathLibArgs(Args, CmdArgs);
+  ToolChain.AddFilePathLibArgs(Args, CmdArgs);
 
   Args.addAllArgs(CmdArgs,
   {options::OPT_L, options::OPT_T_Group, options::OPT_r});
 
-  bool NeedsSanitizerDeps = addSanitizerRuntimes(getToolChain(), Args, 
CmdArgs);
-  AddLinkerInputs(getToolChain(), Inputs, Args, CmdArgs, JA);
+  bool NeedsSanitizerDeps = addSanitizerRuntimes(ToolChain, Args, CmdArgs);
+  AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs, JA);
 
   if (!Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs,
options::OPT_r)) {
 if (D.CCCIsCXX()) {
-  if (getToolChain().ShouldLinkCXXStdlib(Args))
-getToolChain().AddCXXStdlibLibArgs(Args, CmdArgs);
+  if (ToolChain.ShouldLinkCXXStdlib(Args))
+ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
   CmdArgs.push_back("-lm");
 }
 // Additional linker set-up and flags for Fortran. This is required in 
order
 // to generate executables. As Fortran runtime depends on the C runtime,
 // these dependencies need to be listed before the C runtime below.
 if (D.IsFlangMode()) {
-  addFortranRuntimeLibraryPath(getToolChain(), Args,