Reverting r204968 and r204969; while more build bots are happy with the results, some still have link errors.

llvm-svn: 204974
diff --git a/clang/utils/TableGen/TableGen.cpp b/clang/utils/TableGen/TableGen.cpp
index 4484e65..6737f77 100644
--- a/clang/utils/TableGen/TableGen.cpp
+++ b/clang/utils/TableGen/TableGen.cpp
@@ -29,7 +29,7 @@
   GenClangAttrList,
   GenClangAttrPCHRead,
   GenClangAttrPCHWrite,
-  GenClangAttrHasAttributeImpl,
+  GenClangAttrSpellingList,
   GenClangAttrSpellingListIndex,
   GenClangAttrASTVisitor,
   GenClangAttrTemplateInstantiate,
@@ -72,8 +72,7 @@
                    "Generate clang PCH attribute reader"),
         clEnumValN(GenClangAttrPCHWrite, "gen-clang-attr-pch-write",
                    "Generate clang PCH attribute writer"),
-        clEnumValN(GenClangAttrHasAttributeImpl,
-                   "gen-clang-attr-has-attribute-impl",
+        clEnumValN(GenClangAttrSpellingList, "gen-clang-attr-spelling-list",
                    "Generate a clang attribute spelling list"),
         clEnumValN(GenClangAttrSpellingListIndex,
                    "gen-clang-attr-spelling-index",
@@ -160,8 +159,8 @@
   case GenClangAttrPCHWrite:
     EmitClangAttrPCHWrite(Records, OS);
     break;
-  case GenClangAttrHasAttributeImpl:
-    EmitClangAttrHasAttrImpl(Records, OS);
+  case GenClangAttrSpellingList:
+    EmitClangAttrSpellingList(Records, OS);
     break;
   case GenClangAttrSpellingListIndex:
     EmitClangAttrSpellingListIndex(Records, OS);