Add the Clang tblgen backends to Clang, and flip the switch to cause
the build systems to use clang-tblgen.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@141291 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Makefile b/Makefile
index 7a98388..bf1a772 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@
 
 IS_TOP_LEVEL := 1
 CLANG_LEVEL := .
-DIRS := include lib tools runtime docs unittests
+DIRS := utils/TableGen include lib tools runtime docs unittests
 
 PARALLEL_DIRS :=
 
@@ -63,9 +63,9 @@
 # Set up Clang's tblgen.
 ifndef CLANG_TBLGEN
   ifeq ($(LLVM_CROSS_COMPILING),1)
-    CLANG_TBLGEN := $(BuildLLVMToolDir)/llvm-tblgen$(BUILD_EXEEXT)
+    CLANG_TBLGEN := $(BuildLLVMToolDir)/clang-tblgen$(BUILD_EXEEXT)
   else
-    CLANG_TBLGEN := $(LLVMToolDir)/llvm-tblgen$(EXEEXT)
+    CLANG_TBLGEN := $(LLVMToolDir)/clang-tblgen$(EXEEXT)
   endif
 endif
 ClangTableGen = $(CLANG_TBLGEN) $(TableGen.Flags)