From 7f9e3bf062a4aa36ed5350282cc1c307641145f0 Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Tue, 9 Jan 2024 10:50:28 -0500 Subject: [gn] port 07c9189fcc06 (DWARFLinker/Classic) --- llvm/utils/gn/secondary/bolt/lib/Rewrite/BUILD.gn | 1 + .../gn/secondary/llvm/lib/DWARFLinker/BUILD.gn | 13 +++-------- .../llvm/lib/DWARFLinker/Classic/BUILD.gn | 20 ++++++++++++++++ .../llvm/lib/DWARFLinker/Parallel/BUILD.gn | 26 +++++++++++++++++++++ .../llvm/lib/DWARFLinkerParallel/BUILD.gn | 27 ---------------------- .../gn/secondary/llvm/tools/dsymutil/BUILD.gn | 3 ++- .../secondary/llvm/tools/llvm-dwarfutil/BUILD.gn | 3 ++- .../llvm/unittests/DWARFLinkerParallel/BUILD.gn | 2 +- 8 files changed, 55 insertions(+), 40 deletions(-) create mode 100644 llvm/utils/gn/secondary/llvm/lib/DWARFLinker/Classic/BUILD.gn create mode 100644 llvm/utils/gn/secondary/llvm/lib/DWARFLinker/Parallel/BUILD.gn delete mode 100644 llvm/utils/gn/secondary/llvm/lib/DWARFLinkerParallel/BUILD.gn diff --git a/llvm/utils/gn/secondary/bolt/lib/Rewrite/BUILD.gn b/llvm/utils/gn/secondary/bolt/lib/Rewrite/BUILD.gn index 364e2c5..13fd39c 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 58829e9..1540e7b 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 0000000..b3a8e03 --- /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/DWARFLinker/Parallel/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/Parallel/BUILD.gn new file mode 100644 index 0000000..117508a --- /dev/null +++ b/llvm/utils/gn/secondary/llvm/lib/DWARFLinker/Parallel/BUILD.gn @@ -0,0 +1,26 @@ +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", + "//llvm/lib/Support", + ] + sources = [ + "AcceleratorRecordsSaver.cpp", + "DIEAttributeCloner.cpp", + "DWARFEmitterImpl.cpp", + "DWARFLinker.cpp", + "DWARFLinkerCompileUnit.cpp", + "DWARFLinkerImpl.cpp", + "DWARFLinkerTypeUnit.cpp", + "DWARFLinkerUnit.cpp", + "DependencyTracker.cpp", + "OutputSections.cpp", + "SyntheticTypeNameBuilder.cpp", + ] +} diff --git a/llvm/utils/gn/secondary/llvm/lib/DWARFLinkerParallel/BUILD.gn b/llvm/utils/gn/secondary/llvm/lib/DWARFLinkerParallel/BUILD.gn deleted file mode 100644 index 919e07d..0000000 --- a/llvm/utils/gn/secondary/llvm/lib/DWARFLinkerParallel/BUILD.gn +++ /dev/null @@ -1,27 +0,0 @@ -static_library("DWARFLinkerParallel") { - output_name = "LLVMDWARFLinkerParallel" - deps = [ - "//llvm/lib/BinaryFormat", - "//llvm/lib/CodeGen", - "//llvm/lib/CodeGen/AsmPrinter", - "//llvm/lib/DebugInfo/DWARF", - "//llvm/lib/MC", - "//llvm/lib/Object", - "//llvm/lib/Support", - ] - sources = [ - "AcceleratorRecordsSaver.cpp", - "DIEAttributeCloner.cpp", - "DWARFEmitterImpl.cpp", - "DWARFFile.cpp", - "DWARFLinker.cpp", - "DWARFLinkerCompileUnit.cpp", - "DWARFLinkerImpl.cpp", - "DWARFLinkerTypeUnit.cpp", - "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 e962d10..d22d043 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 4f75212..3654acef 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 48daaed..9a39de4 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", ] -- cgit v1.1