[llvm-branch-commits] [cfe-branch] r143929 - in /cfe/branches/release_30: ./ include/clang/Driver/ToolChain.h lib/Driver/ToolChain.cpp

[Chandler Carruth]

Author: chandlerc
Date: Mon Nov  7 04:15:01 2011
New Revision: 143929

URL: http://llvm.org/viewvc/llvm-project?rev=143929&view=rev
Log:
Merging r143751:
------------------------------------------------------------------------
r143751 | chandlerc | 2011-11-04 16:49:01 -0700 (Fri, 04 Nov 2011) | 3 lines

Switch the C++ include interface in the ToolChain to use the same naming
as the system include interface before I start adding implementations of
it to individual ToolChain implementations.
------------------------------------------------------------------------

Modified:
    cfe/branches/release_30/   (props changed)
    cfe/branches/release_30/include/clang/Driver/ToolChain.h
    cfe/branches/release_30/lib/Driver/ToolChain.cpp

Propchange: cfe/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Nov  7 04:15:01 2011
@@ -1,3 +1,3 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687
+/cfe/trunk:142113,142133-142134,142187,142349,142474,142476,142918,143344-143345,143684,143686-143687,143751
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_30/include/clang/Driver/ToolChain.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/include/clang/Driver/ToolChain.h?rev=143929&r1=143928&r2=143929&view=diff
==============================================================================
--- cfe/branches/release_30/include/clang/Driver/ToolChain.h (original)
+++ cfe/branches/release_30/include/clang/Driver/ToolChain.h Mon Nov  7 04:15:01 2011
@@ -208,8 +208,8 @@
 
   /// AddClangCXXStdlibIncludeArgs - Add the clang -cc1 level arguments to set
   /// the include paths to use for the given C++ standard library type.
-  virtual void AddClangCXXStdlibIncludeArgs(const ArgList &Args,
-                                            ArgStringList &CmdArgs) const;
+  virtual void AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
+                                            ArgStringList &CC1Args) const;
 
   /// AddCXXStdlibLibArgs - Add the system specific linker arguments to use
   /// for the given C++ standard library type.

Modified: cfe/branches/release_30/lib/Driver/ToolChain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_30/lib/Driver/ToolChain.cpp?rev=143929&r1=143928&r2=143929&view=diff
==============================================================================
--- cfe/branches/release_30/lib/Driver/ToolChain.cpp (original)
+++ cfe/branches/release_30/lib/Driver/ToolChain.cpp Mon Nov  7 04:15:01 2011
@@ -230,8 +230,8 @@
   return ToolChain::CST_Libstdcxx;
 }
 
-void ToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &Args,
-                                             ArgStringList &CmdArgs) const {
+void ToolChain::AddClangCXXStdlibIncludeArgs(const ArgList &DriverArgs,
+                                             ArgStringList &CC1Args) const {
   // Header search paths should be handled by each of the subclasses.
   // Historically, they have not been, and instead have been handled inside of
   // the CC1-layer frontend. As the logic is hoisted out, this generic function
@@ -241,7 +241,7 @@
   // '-stdlib=' flag down to CC1 so that it can in turn customize the C++
   // header search paths with it. Once all systems are overriding this
   // function, the CC1 flag and this line can be removed.
-  Args.AddAllArgs(CmdArgs, options::OPT_stdlib_EQ);
+  DriverArgs.AddAllArgs(CC1Args, options::OPT_stdlib_EQ);
 }
 
 void ToolChain::AddCXXStdlibLibArgs(const ArgList &Args,