gn build: Merge r365091.

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

diff --git a/utils/gn/secondary/llvm/lib/Bitcode/Reader/BUILD.gn b/utils/gn/secondary/llvm/lib/Bitcode/Reader/BUILD.gn
index a7ecdf1f4e63ae4c3ca10dc417595190d65f5e86..3d58aa802ce4b33b836475643e3606d6b0d74d40 100644 (file)
--- a/utils/gn/secondary/llvm/lib/Bitcode/Reader/BUILD.gn
+++ b/utils/gn/secondary/llvm/lib/Bitcode/Reader/BUILD.gn
@@ -2,6 +2,7 @@ static_library("Reader") {
   output_name = "LLVMBitReader"
   deps = [
     "//llvm/include/llvm/Config:llvm-config",
+    "//llvm/lib/Bitstream/Reader",
     "//llvm/lib/IR",
     "//llvm/lib/Support",
   ]
@@ -9,7 +10,6 @@ static_library("Reader") {
   sources = [
     "BitReader.cpp",
     "BitcodeReader.cpp",
-    "BitstreamReader.cpp",
     "MetadataLoader.cpp",
     "ValueList.cpp",
   ]

diff --git a/utils/gn/secondary/llvm/lib/Bitstream/Reader/BUILD.gn b/utils/gn/secondary/llvm/lib/Bitstream/Reader/BUILD.gn
new file mode 100644 (file)
index 0000000..302ae2b
--- /dev/null
+++ b/utils/gn/secondary/llvm/lib/Bitstream/Reader/BUILD.gn
@@ -0,0 +1,10 @@
+static_library("Reader") {
+  output_name = "LLVMBitstreamReader"
+  deps = [
+    "//llvm/lib/Support",
+  ]
+
+  sources = [
+    "BitstreamReader.cpp",
+  ]
+}

diff --git a/utils/gn/secondary/llvm/unittests/BUILD.gn b/utils/gn/secondary/llvm/unittests/BUILD.gn
index ca38e56a14c33a697e027771a9f56a9cb254a343..e2f813dcb42539a5d27900fb37c1ddcbee23df0d 100644 (file)
--- a/utils/gn/secondary/llvm/unittests/BUILD.gn
+++ b/utils/gn/secondary/llvm/unittests/BUILD.gn
@@ -7,6 +7,7 @@ group("unittests") {
     "AsmParser:AsmParserTests",
     "BinaryFormat:BinaryFormatTests",
     "Bitcode:BitcodeTests",
+    "Bitstream:BitstreamTests",
     "CodeGen:CodeGenTests",
     "CodeGen/GlobalISel:GlobalISelTests",
     "DebugInfo/CodeView:DebugInfoCodeViewTests",

diff --git a/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn b/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn
index 9cb78946e829d62ef906e6f1397f5fb7ea76847b..9a3817ebd35ae61b28d715113c30d58d970546af 100644 (file)
--- a/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn
+++ b/utils/gn/secondary/llvm/unittests/Bitcode/BUILD.gn
@@ -10,7 +10,5 @@ unittest("BitcodeTests") {
   ]
   sources = [
     "BitReaderTest.cpp",
-    "BitstreamReaderTest.cpp",
-    "BitstreamWriterTest.cpp",
   ]
 }

diff --git a/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn b/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn
new file mode 100644 (file)
index 0000000..373a26b
--- /dev/null
+++ b/utils/gn/secondary/llvm/unittests/Bitstream/BUILD.gn
@@ -0,0 +1,11 @@
+import("//llvm/utils/unittest/unittest.gni")
+
+unittest("BitstreamTests") {
+  deps = [
+    "//llvm/lib/Bitstream/Reader",
+  ]
+  sources = [
+    "BitstreamReaderTest.cpp",
+    "BitstreamWriterTest.cpp",
+  ]
+}