4 files changed, 5 insertions, 11 deletions
diff --git a/include/clang/Driver/ToolChain.h b/include/clang/Driver/ToolChain.h
index 082d8762d4..fbc0ac27a4 100644
--- a/include/clang/Driver/ToolChain.h
+++ b/include/clang/Driver/ToolChain.h
@@ -166,7 +166,7 @@ public:
 
   /// IsUnwindTablesDefault - Does this tool chain use -funwind-tables
   /// by default.
-  virtual bool IsUnwindTablesDefault() const = 0;
+  virtual bool IsUnwindTablesDefault() const;
 
   /// GetDefaultRelocationModel - Return the LLVM name of the default
   /// relocation model for this tool chain.
diff --git a/lib/Driver/ToolChain.cpp b/lib/Driver/ToolChain.cpp
index df09c20c18..913c5e00f5 100644
--- a/lib/Driver/ToolChain.cpp
+++ b/lib/Driver/ToolChain.cpp
@@ -32,6 +32,10 @@ const Driver &ToolChain::getDriver() const {
  return D;
 }
 
+bool ToolChain::IsUnwindTablesDefault() const {
+  return false;
+}
+
 std::string ToolChain::GetFilePath(const char *Name) const {
   return D.GetFilePath(Name, *this);
 
diff --git a/lib/Driver/ToolChains.cpp b/lib/Driver/ToolChains.cpp
index 1276915c70..7e19551cd8 100644
--- a/lib/Driver/ToolChains.cpp
+++ b/lib/Driver/ToolChains.cpp
@@ -1479,10 +1479,6 @@ Tool &Hexagon_TC::SelectTool(const Compilation &C,
   return *T;
 }
 
-bool Hexagon_TC::IsUnwindTablesDefault() const {
-  return false;
-}
-
 const char *Hexagon_TC::GetDefaultRelocationModel() const {
   return "static";
 }
@@ -1515,10 +1511,6 @@ bool TCEToolChain::IsMathErrnoDefault() const {
   return true;
 }
 
-bool TCEToolChain::IsUnwindTablesDefault() const {
-  return false;
-}
-
 const char *TCEToolChain::GetDefaultRelocationModel() const {
   return "static";
 }
diff --git a/lib/Driver/ToolChains.h b/lib/Driver/ToolChains.h
index 752cdfdcaa..c3c874aa50 100644
--- a/lib/Driver/ToolChains.h
+++ b/lib/Driver/ToolChains.h
@@ -155,7 +155,6 @@ public:
   virtual Tool &SelectTool(const Compilation &C, const JobAction &JA,
                            const ActionList &Inputs) const;
 
-  virtual bool IsUnwindTablesDefault() const;
   virtual const char *GetDefaultRelocationModel() const;
   virtual const char *GetForcedPicModel() const;
 };
@@ -540,7 +539,6 @@ public:
   virtual Tool &SelectTool(const Compilation &C, const JobAction &JA,
                            const ActionList &Inputs) const;
   bool IsMathErrnoDefault() const;
-  bool IsUnwindTablesDefault() const;
   const char* GetDefaultRelocationModel() const;
   const char* GetForcedPicModel() const;