1 files changed, 6 insertions, 2 deletions
diff --git a/utils/TableGen/LLVMCCConfigurationEmitter.cpp b/utils/TableGen/LLVMCCConfigurationEmitter.cpp
index fe8e50695c..b0ecab35b7 100644
--- a/utils/TableGen/LLVMCCConfigurationEmitter.cpp
+++ b/utils/TableGen/LLVMCCConfigurationEmitter.cpp
@@ -782,8 +782,12 @@ void EmitToolClassDefinition (const ToolProperties& P, std::ostream& O) {
     return;
 
   // Header
-  O << "class " << P.Name << " : public Tool {\n"
-    << "public:\n";
+  O << "class " << P.Name << " : public ";
+  if (P.isJoin())
+    O << "JoinTool";
+  else
+    O << "Tool";
+  O << "{\npublic:\n";
 
   EmitNameMethod(P, O);
   EmitInOutLanguageMethods(P, O);