[gn] port 07c9189fcc06 (DWARFLinker/Classic)

7 files changed, 31 insertions, 16 deletions

diff --git a/llvm/utils/gn/secondary/bolt/lib/Rewrite/BUILD.gn b/llvm/utils/gn/secondary/bolt/lib/Rewrite/BUILD.gn
index 364e2c52953d..13fd39c13023 100644
--- a/llvm/utils/gn/secondary/bolt/lib/Rewrite/BUILD.gn
+++ b/llvm/utils/gn/secondary/bolt/lib/Rewrite/BUILD.gn
@@ -11,6 +11,7 @@ static_library("Rewrite") {
     "//bolt/lib/Utils",
     "//llvm/lib/CodeGen/AsmPrinter",
     "//llvm/lib/DWARFLinker",
+    "//llvm/lib/DWARFLinker/Classic",
     "//llvm/lib/DWP",
     "//llvm/lib/DebugInfo/DWARF",
     "//llvm/lib/ExecutionEngine/JITLink",
diff --git a/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/BUILD.gn
index 58829e924cea..1540e7b4165b 100644
--- a/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/BUILD.gn
@@ -1,18 +1,11 @@
 static_library("DWARFLinker") {
-  output_name = "LLVMDWARFLinker"
+  output_name = "LLVMDWARFLinkerBase"
   deps = [
+    "//llvm/lib/BinaryFormat",
     "//llvm/lib/CodeGen",
-    "//llvm/lib/CodeGen/AsmPrinter",
     "//llvm/lib/DebugInfo/DWARF",
-    "//llvm/lib/MC",
     "//llvm/lib/Object",
     "//llvm/lib/Support",
-    "//llvm/lib/TargetParser",
-  ]
-  sources = [
-    "DWARFLinker.cpp",
-    "DWARFLinkerCompileUnit.cpp",
-    "DWARFLinkerDeclContext.cpp",
-    "DWARFStreamer.cpp",
   ]
+  sources = [ "Utils.cpp" ]
 }
diff --git a/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/Classic/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/Classic/BUILD.gn
new file mode 100644
index 000000000000..b3a8e0331e68
--- /dev/null
+++ b/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/Classic/BUILD.gn
@@ -0,0 +1,20 @@
+static_library("Classic") {
+  output_name = "LLVMDWARFLinker"
+  deps = [
+    "//llvm/lib/BinaryFormat",
+    "//llvm/lib/CodeGen",
+    "//llvm/lib/CodeGen/AsmPrinter",
+    "//llvm/lib/DWARFLinker",
+    "//llvm/lib/DebugInfo/DWARF",
+    "//llvm/lib/MC",
+    "//llvm/lib/Object",
+    "//llvm/lib/Support",
+    "//llvm/lib/TargetParser",
+  ]
+  sources = [
+    "DWARFLinker.cpp",
+    "DWARFLinkerCompileUnit.cpp",
+    "DWARFLinkerDeclContext.cpp",
+    "DWARFStreamer.cpp",
+  ]
+}
diff --git a/llvm/utils/gn/secondary/llvm/lib/DWARFLinkerParallel/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/Parallel/BUILD.gn
index 919e07d6e33c..117508a5cc92 100644
--- a/llvm/utils/gn/secondary/llvm/lib/DWARFLinkerParallel/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/Parallel/BUILD.gn
@@ -1,9 +1,10 @@
-static_library("DWARFLinkerParallel") {
+static_library("Parallel") {
   output_name = "LLVMDWARFLinkerParallel"
   deps = [
     "//llvm/lib/BinaryFormat",
     "//llvm/lib/CodeGen",
     "//llvm/lib/CodeGen/AsmPrinter",
+    "//llvm/lib/DWARFLinker",
     "//llvm/lib/DebugInfo/DWARF",
     "//llvm/lib/MC",
     "//llvm/lib/Object",
@@ -13,7 +14,6 @@ static_library("DWARFLinkerParallel") {
     "AcceleratorRecordsSaver.cpp",
     "DIEAttributeCloner.cpp",
     "DWARFEmitterImpl.cpp",
-    "DWARFFile.cpp",
     "DWARFLinker.cpp",
     "DWARFLinkerCompileUnit.cpp",
     "DWARFLinkerImpl.cpp",
@@ -21,7 +21,6 @@ static_library("DWARFLinkerParallel") {
     "DWARFLinkerUnit.cpp",
     "DependencyTracker.cpp",
     "OutputSections.cpp",
-    "StringPool.cpp",
     "SyntheticTypeNameBuilder.cpp",
   ]
 }
diff --git a/llvm/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn
index e962d100f217..d22d0433656e 100644
--- a/llvm/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn
@@ -11,7 +11,8 @@ driver_executable("dsymutil") {
     ":Options",
     "//llvm/lib/CodeGen/AsmPrinter",
     "//llvm/lib/DWARFLinker",
-    "//llvm/lib/DWARFLinkerParallel",
+    "//llvm/lib/DWARFLinker/Classic",
+    "//llvm/lib/DWARFLinker/Parallel",
     "//llvm/lib/DebugInfo/DWARF",
     "//llvm/lib/MC",
     "//llvm/lib/Object",
diff --git a/llvm/utils/gn/secondary/llvm/tools/llvm-dwarfutil/BUILD.gn b/llvm/utils/gn/secondary/llvm/tools/llvm-dwarfutil/BUILD.gn
index 4f75212b4091..3654acef9fdf 100644
--- a/llvm/utils/gn/secondary/llvm/tools/llvm-dwarfutil/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/tools/llvm-dwarfutil/BUILD.gn
@@ -10,7 +10,8 @@ executable("llvm-dwarfutil") {
     ":Options",
     "//llvm/lib/CodeGen",
     "//llvm/lib/DWARFLinker",
-    "//llvm/lib/DWARFLinkerParallel",
+    "//llvm/lib/DWARFLinker/Classic",
+    "//llvm/lib/DWARFLinker/Parallel",
     "//llvm/lib/DebugInfo/DWARF",
     "//llvm/lib/MC",
     "//llvm/lib/ObjCopy",
diff --git a/llvm/utils/gn/secondary/llvm/unittests/DWARFLinkerParallel/BUILD.gn b/llvm/utils/gn/secondary/llvm/unittests/DWARFLinkerParallel/BUILD.gn
index 48daaed3af76..9a39de49b95c 100644
--- a/llvm/utils/gn/secondary/llvm/unittests/DWARFLinkerParallel/BUILD.gn
+++ b/llvm/utils/gn/secondary/llvm/unittests/DWARFLinkerParallel/BUILD.gn
@@ -2,7 +2,7 @@ import("//third-party/unittest/unittest.gni")
 
 unittest("DWARFLinkerParallelTests") {
   deps = [
-    "//llvm/lib/DWARFLinkerParallel",
+    "//llvm/lib/DWARFLinker/Parallel",
     "//llvm/lib/Support",
     "//llvm/lib/Testing/Support",
   ]