Driver: Claim -arch options when pipelining, and claim arguments that

are forwarded to GCC.
 - The later is unfortunate, as it prevents us from generally warning
   about anything interesting on platforms that use a generic
   toolchain. However, we can't do much better without significantly
   complicating things, and generally we should have proper tool chain
   definitions.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67293 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Driver/Driver.cpp b/lib/Driver/Driver.cpp
index c330707d34cb0684c9c3349898c0efa50d2abcf5..8a7f2463eb4f7fe9a4ecb7e19a6e0d185878d528 100644 (file)
--- a/lib/Driver/Driver.cpp
+++ b/lib/Driver/Driver.cpp
@@ -328,6 +328,7 @@ void Driver::BuildUniversalActions(const ArgList &Args,
       // FIXME: We need to handle canonicalization of the specified
       // arch?
 
+      A->claim();
       if (ArchNames.insert(Name))
         Archs.push_back(Name);
     }
@@ -374,7 +375,7 @@ void Driver::BuildUniversalActions(const ArgList &Args,
         << types::getTypeName(Act->getType());
 
     ActionList Inputs;
-    for (unsigned i = 0, e = Archs.size(); i != e; ++i )
+    for (unsigned i = 0, e = Archs.size(); i != e; ++i)
       Inputs.push_back(new BindArchAction(Act, Archs[i]));
 
     // Lipo if necessary, We do it this way because we need to set the

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 5cba62619567739332fc60d2f54814c3e245d60f..7000590654039a214bce3678e0fecaf1515be9b6 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -354,8 +354,13 @@ void gcc::Common::ConstructJob(Compilation &C, const JobAction &JA,
   for (ArgList::const_iterator 
          it = Args.begin(), ie = Args.end(); it != ie; ++it) {
     Arg *A = *it;
-    if (A->getOption().hasForwardToGCC())
+    if (A->getOption().hasForwardToGCC()) {
+      // It is unfortunate that we have to claim here, as this means
+      // we will basically never report anything interesting for
+      // platforms using a generic gcc.
+      A->claim();
       A->render(Args, CmdArgs);
+    }
   }
   
   RenderExtraToolArgs(CmdArgs);