diff --git a/clang/include/clang/Driver/Tool.h b/clang/include/clang/Driver/Tool.h
index fea753e8ebe6..070a16295765 100644
--- a/clang/include/clang/Driver/Tool.h
+++ b/clang/include/clang/Driver/Tool.h
@@ -54,7 +54,8 @@ public:
   /// \param LinkingOutput - If this output will eventually feed the
   /// linker, then this is the final output name of the linked image.
   virtual void ConstructJob(Compilation &C, const JobAction &JA,
-                            InputInfo &Output, InputInfoList &Inputs, 
+                            const InputInfo &Output, 
+                            const InputInfoList &Inputs, 
                             const ArgList &TCArgs, 
                             const char *LinkingOutput) const = 0;
 };
diff --git a/clang/lib/Driver/Driver.cpp b/clang/lib/Driver/Driver.cpp
index a3cd55fe5f5f..35b206600d91 100644
--- a/clang/lib/Driver/Driver.cpp
+++ b/clang/lib/Driver/Driver.cpp
@@ -446,7 +446,6 @@ void Driver::BuildActions(const ArgList &Args, ActionList &Actions) const {
     } else if (A->getOption().isLinkerInput()) {
       // Just treat as object type, we could make a special type for
       // this if necessary.
-      A->claim();
       Inputs.push_back(std::make_pair(types::TY_Object, A));
 
     } else if (A->getOption().getId() == options::OPT_x) {
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index f849c2beac28..25023c16eff2 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -13,42 +13,47 @@ using namespace clang::driver;
 using namespace clang::driver::tools;
 
 void Clang::ConstructJob(Compilation &C, const JobAction &JA,
-                         InputInfo &Output, InputInfoList &Inputs,
+                         const InputInfo &Output, 
+                         const InputInfoList &Inputs,
                          const ArgList &TCArgs,
                          const char *LinkingOutput) const {
-
 }
 
 void gcc::Preprocess::ConstructJob(Compilation &C, const JobAction &JA,
-                                   InputInfo &Output, InputInfoList &Inputs,
+                                   const InputInfo &Output, 
+                                   const InputInfoList &Inputs,
                                    const ArgList &TCArgs,
                                    const char *LinkingOutput) const {
 
 }
 
 void gcc::Precompile::ConstructJob(Compilation &C, const JobAction &JA,
-                                   InputInfo &Output, InputInfoList &Inputs,
+                                   const InputInfo &Output, 
+                                   const InputInfoList &Inputs,
                                    const ArgList &TCArgs,
                                    const char *LinkingOutput) const {
 
 }
 
 void gcc::Compile::ConstructJob(Compilation &C, const JobAction &JA,
-                                InputInfo &Output, InputInfoList &Inputs,
+                                const InputInfo &Output, 
+                                const InputInfoList &Inputs,
                                 const ArgList &TCArgs,
                                 const char *LinkingOutput) const {
 
 }
 
 void gcc::Assemble::ConstructJob(Compilation &C, const JobAction &JA,
-                                 InputInfo &Output, InputInfoList &Inputs,
+                                 const InputInfo &Output, 
+                                 const InputInfoList &Inputs,
                                  const ArgList &TCArgs,
                                  const char *LinkingOutput) const {
 
 }
 
 void gcc::Link::ConstructJob(Compilation &C, const JobAction &JA,
-                             InputInfo &Output, InputInfoList &Inputs,
+                             const InputInfo &Output, 
+                             const InputInfoList &Inputs,
                              const ArgList &TCArgs,
                              const char *LinkingOutput) const {
 
diff --git a/clang/lib/Driver/Tools.h b/clang/lib/Driver/Tools.h
index da9d3e2ea5af..d774e02ff0ce 100644
--- a/clang/lib/Driver/Tools.h
+++ b/clang/lib/Driver/Tools.h
@@ -27,7 +27,8 @@ namespace tools {
     virtual bool hasIntegratedCPP() const { return true; }
 
     virtual void ConstructJob(Compilation &C, const JobAction &JA,
-                              InputInfo &Output, InputInfoList &Inputs, 
+                              const InputInfo &Output, 
+                              const InputInfoList &Inputs, 
                               const ArgList &TCArgs, 
                               const char *LinkingOutput) const;
   };
@@ -43,7 +44,8 @@ namespace gcc {
     virtual bool hasIntegratedCPP() const { return false; }
 
     virtual void ConstructJob(Compilation &C, const JobAction &JA,
-                              InputInfo &Output, InputInfoList &Inputs, 
+                              const InputInfo &Output, 
+                              const InputInfoList &Inputs, 
                               const ArgList &TCArgs, 
                               const char *LinkingOutput) const;
   };
@@ -57,7 +59,8 @@ namespace gcc {
     virtual bool hasIntegratedCPP() const { return true; }
 
     virtual void ConstructJob(Compilation &C, const JobAction &JA,
-                              InputInfo &Output, InputInfoList &Inputs, 
+                              const InputInfo &Output, 
+                              const InputInfoList &Inputs, 
                               const ArgList &TCArgs, 
                               const char *LinkingOutput) const;
   };
@@ -71,7 +74,8 @@ namespace gcc {
     virtual bool hasIntegratedCPP() const { return true; }
 
     virtual void ConstructJob(Compilation &C, const JobAction &JA,
-                              InputInfo &Output, InputInfoList &Inputs, 
+                              const InputInfo &Output, 
+                              const InputInfoList &Inputs, 
                               const ArgList &TCArgs, 
                               const char *LinkingOutput) const;
   };
@@ -85,7 +89,8 @@ namespace gcc {
     virtual bool hasIntegratedCPP() const { return false; }
 
     virtual void ConstructJob(Compilation &C, const JobAction &JA,
-                              InputInfo &Output, InputInfoList &Inputs, 
+                              const InputInfo &Output, 
+                              const InputInfoList &Inputs, 
                               const ArgList &TCArgs, 
                               const char *LinkingOutput) const;
   };
@@ -99,7 +104,8 @@ namespace gcc {
     virtual bool hasIntegratedCPP() const { return false; }
 
     virtual void ConstructJob(Compilation &C, const JobAction &JA,
-                              InputInfo &Output, InputInfoList &Inputs, 
+                              const InputInfo &Output, 
+                              const InputInfoList &Inputs, 
                               const ArgList &TCArgs, 
                               const char *LinkingOutput) const;
   };