[PATCH] D53238: [Driver] Add -static-{rtlib, stdlib} and make -static-{libgcc, libstdc++} their aliases

2018-12-11 Thread Reid Kleckner via Phabricator via cfe-commits 
rnk added a comment.

(sub)


Repository:
  rC Clang

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D53238/new/

https://reviews.llvm.org/D53238



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D53238: [Driver] Add -static-{rtlib, stdlib} and make -static-{libgcc, libstdc++} their aliases

2018-12-04 Thread Fangrui Song via Phabricator via cfe-commits 
MaskRay added a comment.

In D53238#1318349 , @martell wrote:

> Seems like a better solution than what I had in D37726 
> .
>  I'm not sully sure on the naming so I think someone else should also sign 
> off on this.


This is still not good enough. `--static=rtlib,stdlib` may be better. I'll also 
find some time to improve this one :)


Repository:
  rC Clang

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D53238/new/

https://reviews.llvm.org/D53238



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D53238: [Driver] Add -static-{rtlib, stdlib} and make -static-{libgcc, libstdc++} their aliases

2018-12-04 Thread Martell Malone via Phabricator via cfe-commits 
martell added a comment.

Also,  Sorry for the long time to reply, I don't LLVM often enough :)


Repository:
  rC Clang

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D53238/new/

https://reviews.llvm.org/D53238



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D53238: [Driver] Add -static-{rtlib, stdlib} and make -static-{libgcc, libstdc++} their aliases

2018-12-04 Thread Martell Malone via Phabricator via cfe-commits 
martell added a comment.

Seems like a better solution than what I had in D37726 
.
I'm not sully sure on the naming so I think someone else should also sign off 
on this.


Repository:
  rC Clang

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D53238/new/

https://reviews.llvm.org/D53238



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D53238: [Driver] Add -static-{rtlib, stdlib} and make -static-{libgcc, libstdc++} their aliases

2018-10-18 Thread Fangrui Song via Phabricator via cfe-commits 
MaskRay added a comment.

Greeting from a dev meeting attendee :)


Repository:
  rC Clang

https://reviews.llvm.org/D53238



___
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits

[PATCH] D53238: [Driver] Add -static-{rtlib, stdlib} and make -static-{libgcc, libstdc++} their aliases

2018-10-12 Thread Fangrui Song via Phabricator via cfe-commits 
MaskRay updated this revision to Diff 169538.
MaskRay added a comment.

Rename local variables


Repository:
  rC Clang

https://reviews.llvm.org/D53238

Files:
  include/clang/Driver/Options.td
  lib/Driver/ToolChains/CommonArgs.cpp
  lib/Driver/ToolChains/Darwin.cpp
  lib/Driver/ToolChains/DragonFly.cpp
  lib/Driver/ToolChains/Fuchsia.cpp
  lib/Driver/ToolChains/Gnu.cpp
  lib/Driver/ToolChains/Hexagon.cpp
  lib/Driver/ToolChains/MinGW.cpp
  lib/Driver/ToolChains/Myriad.cpp
  lib/Driver/ToolChains/NaCl.cpp

Index: lib/Driver/ToolChains/NaCl.cpp
===
--- lib/Driver/ToolChains/NaCl.cpp
+++ lib/Driver/ToolChains/NaCl.cpp
@@ -134,12 +134,12 @@
   if (D.CCCIsCXX() &&
   !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
 if (ToolChain.ShouldLinkCXXStdlib(Args)) {
-  bool OnlyLibstdcxxStatic =
-  Args.hasArg(options::OPT_static_libstdcxx) && !IsStatic;
-  if (OnlyLibstdcxxStatic)
+  bool StaticCXXStdlib =
+  Args.hasArg(options::OPT_static_stdlib) && !IsStatic;
+  if (StaticCXXStdlib)
 CmdArgs.push_back("-Bstatic");
   ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
-  if (OnlyLibstdcxxStatic)
+  if (StaticCXXStdlib)
 CmdArgs.push_back("-Bdynamic");
 }
 CmdArgs.push_back("-lm");
Index: lib/Driver/ToolChains/Myriad.cpp
===
--- lib/Driver/ToolChains/Myriad.cpp
+++ lib/Driver/ToolChains/Myriad.cpp
@@ -145,7 +145,7 @@
   // Eat some arguments that may be present but have no effect.
   Args.ClaimAllArgs(options::OPT_g_Group);
   Args.ClaimAllArgs(options::OPT_w);
-  Args.ClaimAllArgs(options::OPT_static_libgcc);
+  Args.ClaimAllArgs(options::OPT_static_rtlib);
 
   if (Args.hasArg(options::OPT_s)) // Pass the 'strip' option.
 CmdArgs.push_back("-s");
Index: lib/Driver/ToolChains/MinGW.cpp
===
--- lib/Driver/ToolChains/MinGW.cpp
+++ lib/Driver/ToolChains/MinGW.cpp
@@ -66,7 +66,7 @@
   // Make use of compiler-rt if --rtlib option is used
   ToolChain::RuntimeLibType RLT = getToolChain().GetRuntimeLibType(Args);
   if (RLT == ToolChain::RLT_Libgcc) {
-bool Static = Args.hasArg(options::OPT_static_libgcc) ||
+bool Static = Args.hasArg(options::OPT_static_rtlib) ||
   Args.hasArg(options::OPT_static);
 bool Shared = Args.hasArg(options::OPT_shared);
 bool CXX = getToolChain().getDriver().CCCIsCXX();
@@ -192,12 +192,12 @@
   // TODO: Add profile stuff here
 
   if (TC.ShouldLinkCXXStdlib(Args)) {
-bool OnlyLibstdcxxStatic = Args.hasArg(options::OPT_static_libstdcxx) &&
-   !Args.hasArg(options::OPT_static);
-if (OnlyLibstdcxxStatic)
+bool StaticCXXStdlib = Args.hasArg(options::OPT_static_stdlib) &&
+   !Args.hasArg(options::OPT_static);
+if (StaticCXXStdlib)
   CmdArgs.push_back("-Bstatic");
 TC.AddCXXStdlibLibArgs(Args, CmdArgs);
-if (OnlyLibstdcxxStatic)
+if (StaticCXXStdlib)
   CmdArgs.push_back("-Bdynamic");
   }
 
Index: lib/Driver/ToolChains/Hexagon.cpp
===
--- lib/Driver/ToolChains/Hexagon.cpp
+++ lib/Driver/ToolChains/Hexagon.cpp
@@ -218,7 +218,7 @@
   Args.ClaimAllArgs(options::OPT_emit_llvm);
   Args.ClaimAllArgs(options::OPT_w); // Other warning options are already
  // handled somewhere else.
-  Args.ClaimAllArgs(options::OPT_static_libgcc);
+  Args.ClaimAllArgs(options::OPT_static_rtlib);
 
   //
   //
Index: lib/Driver/ToolChains/Gnu.cpp
===
--- lib/Driver/ToolChains/Gnu.cpp
+++ lib/Driver/ToolChains/Gnu.cpp
@@ -445,12 +445,12 @@
   if (D.CCCIsCXX() &&
   !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
 if (ToolChain.ShouldLinkCXXStdlib(Args)) {
-  bool OnlyLibstdcxxStatic = Args.hasArg(options::OPT_static_libstdcxx) &&
- !Args.hasArg(options::OPT_static);
-  if (OnlyLibstdcxxStatic)
+  bool StaticCXXStdlib = Args.hasArg(options::OPT_static_stdlib) &&
+ !Args.hasArg(options::OPT_static);
+  if (StaticCXXStdlib)
 CmdArgs.push_back("-Bstatic");
   ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
-  if (OnlyLibstdcxxStatic)
+  if (StaticCXXStdlib)
 CmdArgs.push_back("-Bdynamic");
 }
 CmdArgs.push_back("-lm");
Index: lib/Driver/ToolChains/Fuchsia.cpp
===
--- lib/Driver/ToolChains/Fuchsia.cpp
+++ lib/Driver/ToolChains/Fuchsia.cpp
@@ -117,12 +117,12 @@
 
 if (D.CCCIsCXX()) {
   if (ToolChain.ShouldLinkCXXStdlib(Args)) {
-bool OnlyLibstdcxxStatic =

[PATCH] D53238: [Driver] Add -static-{rtlib, stdlib} and make -static-{libgcc, libstdc++} their aliases

2018-10-12 Thread Fangrui Song via Phabricator via cfe-commits 
MaskRay created this revision.
MaskRay added reviewers: martell, rsmith.
Herald added a subscriber: cfe-commits.

Repository:
  rC Clang

https://reviews.llvm.org/D53238

Files:
  include/clang/Driver/Options.td
  lib/Driver/ToolChains/CommonArgs.cpp
  lib/Driver/ToolChains/Darwin.cpp
  lib/Driver/ToolChains/DragonFly.cpp
  lib/Driver/ToolChains/Fuchsia.cpp
  lib/Driver/ToolChains/Gnu.cpp
  lib/Driver/ToolChains/Hexagon.cpp
  lib/Driver/ToolChains/MinGW.cpp
  lib/Driver/ToolChains/Myriad.cpp
  lib/Driver/ToolChains/NaCl.cpp

Index: lib/Driver/ToolChains/NaCl.cpp
===
--- lib/Driver/ToolChains/NaCl.cpp
+++ lib/Driver/ToolChains/NaCl.cpp
@@ -134,12 +134,12 @@
   if (D.CCCIsCXX() &&
   !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
 if (ToolChain.ShouldLinkCXXStdlib(Args)) {
-  bool OnlyLibstdcxxStatic =
-  Args.hasArg(options::OPT_static_libstdcxx) && !IsStatic;
-  if (OnlyLibstdcxxStatic)
+  bool OnlyCXXstdlib =
+  Args.hasArg(options::OPT_static_stdlib) && !IsStatic;
+  if (OnlyCXXstdlib)
 CmdArgs.push_back("-Bstatic");
   ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
-  if (OnlyLibstdcxxStatic)
+  if (OnlyCXXstdlib)
 CmdArgs.push_back("-Bdynamic");
 }
 CmdArgs.push_back("-lm");
Index: lib/Driver/ToolChains/Myriad.cpp
===
--- lib/Driver/ToolChains/Myriad.cpp
+++ lib/Driver/ToolChains/Myriad.cpp
@@ -145,7 +145,7 @@
   // Eat some arguments that may be present but have no effect.
   Args.ClaimAllArgs(options::OPT_g_Group);
   Args.ClaimAllArgs(options::OPT_w);
-  Args.ClaimAllArgs(options::OPT_static_libgcc);
+  Args.ClaimAllArgs(options::OPT_static_rtlib);
 
   if (Args.hasArg(options::OPT_s)) // Pass the 'strip' option.
 CmdArgs.push_back("-s");
Index: lib/Driver/ToolChains/MinGW.cpp
===
--- lib/Driver/ToolChains/MinGW.cpp
+++ lib/Driver/ToolChains/MinGW.cpp
@@ -66,7 +66,7 @@
   // Make use of compiler-rt if --rtlib option is used
   ToolChain::RuntimeLibType RLT = getToolChain().GetRuntimeLibType(Args);
   if (RLT == ToolChain::RLT_Libgcc) {
-bool Static = Args.hasArg(options::OPT_static_libgcc) ||
+bool Static = Args.hasArg(options::OPT_static_rtlib) ||
   Args.hasArg(options::OPT_static);
 bool Shared = Args.hasArg(options::OPT_shared);
 bool CXX = getToolChain().getDriver().CCCIsCXX();
@@ -192,12 +192,12 @@
   // TODO: Add profile stuff here
 
   if (TC.ShouldLinkCXXStdlib(Args)) {
-bool OnlyLibstdcxxStatic = Args.hasArg(options::OPT_static_libstdcxx) &&
-   !Args.hasArg(options::OPT_static);
-if (OnlyLibstdcxxStatic)
+bool OnlyCXXstdlib = Args.hasArg(options::OPT_static_stdlib) &&
+ !Args.hasArg(options::OPT_static);
+if (OnlyCXXstdlib)
   CmdArgs.push_back("-Bstatic");
 TC.AddCXXStdlibLibArgs(Args, CmdArgs);
-if (OnlyLibstdcxxStatic)
+if (OnlyCXXstdlib)
   CmdArgs.push_back("-Bdynamic");
   }
 
Index: lib/Driver/ToolChains/Hexagon.cpp
===
--- lib/Driver/ToolChains/Hexagon.cpp
+++ lib/Driver/ToolChains/Hexagon.cpp
@@ -218,7 +218,7 @@
   Args.ClaimAllArgs(options::OPT_emit_llvm);
   Args.ClaimAllArgs(options::OPT_w); // Other warning options are already
  // handled somewhere else.
-  Args.ClaimAllArgs(options::OPT_static_libgcc);
+  Args.ClaimAllArgs(options::OPT_static_rtlib);
 
   //
   //
Index: lib/Driver/ToolChains/Gnu.cpp
===
--- lib/Driver/ToolChains/Gnu.cpp
+++ lib/Driver/ToolChains/Gnu.cpp
@@ -445,12 +445,12 @@
   if (D.CCCIsCXX() &&
   !Args.hasArg(options::OPT_nostdlib, options::OPT_nodefaultlibs)) {
 if (ToolChain.ShouldLinkCXXStdlib(Args)) {
-  bool OnlyLibstdcxxStatic = Args.hasArg(options::OPT_static_libstdcxx) &&
- !Args.hasArg(options::OPT_static);
-  if (OnlyLibstdcxxStatic)
+  bool OnlyCXXstdlib = Args.hasArg(options::OPT_static_stdlib) &&
+   !Args.hasArg(options::OPT_static);
+  if (OnlyCXXstdlib)
 CmdArgs.push_back("-Bstatic");
   ToolChain.AddCXXStdlibLibArgs(Args, CmdArgs);
-  if (OnlyLibstdcxxStatic)
+  if (OnlyCXXstdlib)
 CmdArgs.push_back("-Bdynamic");
 }
 CmdArgs.push_back("-lm");
Index: lib/Driver/ToolChains/Fuchsia.cpp
===
--- lib/Driver/ToolChains/Fuchsia.cpp
+++ lib/Driver/ToolChains/Fuchsia.cpp
@@ -117,12 +117,12 @@
 
 if (D.CCCIsCXX()) {
   if (ToolChain.ShouldLinkCXXStdlib(Args)) {
-bool OnlyLibstdcxxStatic =