From: Peter Collingbourne <peter@pcc.me.uk>
Date: Fri, 5 Jul 2019 01:11:14 +0000 (+0000)
Subject: gn build: Merge r365091.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5cb79c7a279c1b6ce6773139acefaaa75b4f7bff;p=llvm

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 a7ecdf1f4e6..3d58aa802ce 100644
--- 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
index 00000000000..302ae2be536
--- /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 ca38e56a14c..e2f813dcb42 100644
--- 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 9cb78946e82..9a3817ebd35 100644
--- 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
index 00000000000..373a26bafcc
--- /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",
+  ]
+}