gn build: (manually) merge r371834

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@371849 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/utils/gn/secondary/clang/lib/AST/BUILD.gn b/utils/gn/secondary/clang/lib/AST/BUILD.gn
index c98910691abec8d858b0cc007b38e3ef79afad64..0ccc1933cdb68291ee50fd38c65b1dd17c115ea8 100644 (file)
--- a/utils/gn/secondary/clang/lib/AST/BUILD.gn
+++ b/utils/gn/secondary/clang/lib/AST/BUILD.gn
@@ -65,6 +65,27 @@ 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/utils/gn/secondary/clang/lib/AST/Interp/BUILD.gn b/utils/gn/secondary/clang/lib/AST/Interp/BUILD.gn
deleted file mode 100644 (file)
index 5a84d37..0000000
--- a/utils/gn/secondary/clang/lib/AST/Interp/BUILD.gn
+++ /dev/null
@@ -1,39 +0,0 @@
-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",
-  ]
-}