Revert "gn build: (manually) merge r371834"

This reverts commit abc7e2b6004cd693cf3b6dedbc7908e099c7ac6a.
The commit was incomplete. I'll revert and reland the full commit,
so that the correct change is a single commit.

llvm-svn: 371850

2 files changed, 39 insertions, 21 deletions

diff --git a/llvm/utils/gn/secondary/clang/lib/AST/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/AST/BUILD.gn
index 0ccc1933cdb..c98910691ab 100644
--- a/llvm/utils/gn/secondary/clang/lib/AST/BUILD.gn
+++ b/llvm/utils/gn/secondary/clang/lib/AST/BUILD.gn
@@ -65,27 +65,6 @@ static_library("AST") {
     "ExternalASTSource.cpp",
     "FormatString.cpp",
     "InheritViz.cpp",
-    "Interp/Block.cpp",
-    "Interp/ByteCodeEmitter.cpp",
-    "Interp/ByteCodeExprGen.cpp",
-    "Interp/ByteCodeGenError.cpp",
-    "Interp/ByteCodeStmtGen.cpp",
-    "Interp/Context.cpp",
-    "Interp/Descriptor.cpp",
-    "Interp/Disasm.cpp",
-    "Interp/EvalEmitter.cpp",
-    "Interp/Frame.cpp",
-    "Interp/Function.cpp",
-    "Interp/Interp.cpp",
-    "Interp/InterpFrame.cpp",
-    "Interp/InterpStack.cpp",
-    "Interp/InterpState.cpp",
-    "Interp/Pointer.cpp",
-    "Interp/PrimType.cpp",
-    "Interp/Program.cpp",
-    "Interp/Record.cpp",
-    "Interp/Source.cpp",
-    "Interp/State.cpp",
     "ItaniumCXXABI.cpp",
     "ItaniumMangle.cpp",
     "JSONNodeDumper.cpp",
diff --git a/llvm/utils/gn/secondary/clang/lib/AST/Interp/BUILD.gn b/llvm/utils/gn/secondary/clang/lib/AST/Interp/BUILD.gn
new file mode 100644
index 00000000000..5a84d37847f
--- /dev/null
+++ b/llvm/utils/gn/secondary/clang/lib/AST/Interp/BUILD.gn
@@ -0,0 +1,39 @@
+import("//clang/utils/TableGen/clang_tablegen.gni")
+
+clang_tablegen("Opcodes") {
+  args = [ "-gen-clang-opcodes" ]
+  td_file = "Opcodes.td"
+}
+
+static_library("Interp") {
+  output_name = "clangInterp"
+  configs += [ "//llvm/utils/gn/build:clang_code" ]
+  deps = [
+    "//clang/lib/AST/Interp:Opcodes",
+    "//clang/lib/Basic",
+    "//llvm/lib/Support",
+  ]
+  sources = [
+    "Block.cpp",
+    "ByteCodeEmitter.cpp",
+    "ByteCodeExprGen.cpp",
+    "ByteCodeGenError.cpp",
+    "ByteCodeStmtGen.cpp",
+    "Context.cpp",
+    "Descriptor.cpp",
+    "Disasm.cpp",
+    "EvalEmitter.cpp",
+    "Frame.cpp",
+    "Function.cpp",
+    "Interp.cpp",
+    "InterpFrame.cpp",
+    "InterpStack.cpp",
+    "InterpState.cpp",
+    "Pointer.cpp",
+    "Program.cpp",
+    "Record.cpp",
+    "Source.cpp",
+    "State.cpp",
+    "Type.cpp",
+  ]
+}