[cfe-commits] r156771 - in /cfe/trunk: lib/Driver/Tools.cpp test/Driver/nodefaultlib.c
Chandler Carruth
chandlerc at gmail.com
Mon May 14 11:31:18 PDT 2012
Author: chandlerc
Date: Mon May 14 13:31:18 2012
New Revision: 156771
URL: http://llvm.org/viewvc/llvm-project?rev=156771&view=rev
Log:
Teach the driver on Linux to respect -nodefaultlibs.
Patch from Andrew C. Morrow.
Added:
cfe/trunk/test/Driver/nodefaultlib.c
Modified:
cfe/trunk/lib/Driver/Tools.cpp
Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=156771&r1=156770&r2=156771&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Mon May 14 13:31:18 2012
@@ -5313,7 +5313,9 @@
AddLinkerInputs(ToolChain, Inputs, Args, CmdArgs);
- if (D.CCCIsCXX && !Args.hasArg(options::OPT_nostdlib)) {
+ if (D.CCCIsCXX &&
+ !Args.hasArg(options::OPT_nostdlib) &&
+ !Args.hasArg(options::OPT_nodefaultlibs)) {
bool OnlyLibstdcxxStatic = Args.hasArg(options::OPT_static_libstdcxx) &&
!Args.hasArg(options::OPT_static);
if (OnlyLibstdcxxStatic)
@@ -5328,22 +5330,23 @@
addAsanRTLinux(getToolChain(), Args, CmdArgs);
if (!Args.hasArg(options::OPT_nostdlib)) {
- if (Args.hasArg(options::OPT_static))
- CmdArgs.push_back("--start-group");
-
- AddLibgcc(ToolChain.getTriple(), D, CmdArgs, Args);
+ if (!Args.hasArg(options::OPT_nodefaultlibs)) {
+ if (Args.hasArg(options::OPT_static))
+ CmdArgs.push_back("--start-group");
- if (Args.hasArg(options::OPT_pthread) ||
- Args.hasArg(options::OPT_pthreads))
- CmdArgs.push_back("-lpthread");
+ AddLibgcc(ToolChain.getTriple(), D, CmdArgs, Args);
- CmdArgs.push_back("-lc");
+ if (Args.hasArg(options::OPT_pthread) ||
+ Args.hasArg(options::OPT_pthreads))
+ CmdArgs.push_back("-lpthread");
- if (Args.hasArg(options::OPT_static))
- CmdArgs.push_back("--end-group");
- else
- AddLibgcc(ToolChain.getTriple(), D, CmdArgs, Args);
+ CmdArgs.push_back("-lc");
+ if (Args.hasArg(options::OPT_static))
+ CmdArgs.push_back("--end-group");
+ else
+ AddLibgcc(ToolChain.getTriple(), D, CmdArgs, Args);
+ }
if (!Args.hasArg(options::OPT_nostartfiles)) {
const char *crtend;
Added: cfe/trunk/test/Driver/nodefaultlib.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/nodefaultlib.c?rev=156771&view=auto
==============================================================================
--- cfe/trunk/test/Driver/nodefaultlib.c (added)
+++ cfe/trunk/test/Driver/nodefaultlib.c Mon May 14 13:31:18 2012
@@ -0,0 +1,8 @@
+// RUN: %clang -target i686-pc-linux-gnu -### -nodefaultlibs %s 2> %t
+// RUN: FileCheck < %t %s
+//
+// CHECK-NOT: start-group
+// CHECK-NOT: -lgcc
+// CHECK-NOT: -lc
+// CHECK: crtbegin
+// CHECK: crtend
More information about the cfe-commits
mailing list