Skip to content

Commit 7f9e3bf

Browse files
committed
[gn] port 07c9189 (DWARFLinker/Classic)
1 parent 4b7e861 commit 7f9e3bf

File tree

7 files changed

+31
-16
lines changed

7 files changed

+31
-16
lines changed

llvm/utils/gn/secondary/bolt/lib/Rewrite/BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ static_library("Rewrite") {
1111
"//bolt/lib/Utils",
1212
"//llvm/lib/CodeGen/AsmPrinter",
1313
"//llvm/lib/DWARFLinker",
14+
"//llvm/lib/DWARFLinker/Classic",
1415
"//llvm/lib/DWP",
1516
"//llvm/lib/DebugInfo/DWARF",
1617
"//llvm/lib/ExecutionEngine/JITLink",
Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
static_library("DWARFLinker") {
2-
output_name = "LLVMDWARFLinker"
2+
output_name = "LLVMDWARFLinkerBase"
33
deps = [
4+
"//llvm/lib/BinaryFormat",
45
"//llvm/lib/CodeGen",
5-
"//llvm/lib/CodeGen/AsmPrinter",
66
"//llvm/lib/DebugInfo/DWARF",
7-
"//llvm/lib/MC",
87
"//llvm/lib/Object",
98
"//llvm/lib/Support",
10-
"//llvm/lib/TargetParser",
11-
]
12-
sources = [
13-
"DWARFLinker.cpp",
14-
"DWARFLinkerCompileUnit.cpp",
15-
"DWARFLinkerDeclContext.cpp",
16-
"DWARFStreamer.cpp",
179
]
10+
sources = [ "Utils.cpp" ]
1811
}
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
static_library("Classic") {
2+
output_name = "LLVMDWARFLinker"
3+
deps = [
4+
"//llvm/lib/BinaryFormat",
5+
"//llvm/lib/CodeGen",
6+
"//llvm/lib/CodeGen/AsmPrinter",
7+
"//llvm/lib/DWARFLinker",
8+
"//llvm/lib/DebugInfo/DWARF",
9+
"//llvm/lib/MC",
10+
"//llvm/lib/Object",
11+
"//llvm/lib/Support",
12+
"//llvm/lib/TargetParser",
13+
]
14+
sources = [
15+
"DWARFLinker.cpp",
16+
"DWARFLinkerCompileUnit.cpp",
17+
"DWARFLinkerDeclContext.cpp",
18+
"DWARFStreamer.cpp",
19+
]
20+
}
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
static_library("DWARFLinkerParallel") {
1+
static_library("Parallel") {
22
output_name = "LLVMDWARFLinkerParallel"
33
deps = [
44
"//llvm/lib/BinaryFormat",
55
"//llvm/lib/CodeGen",
66
"//llvm/lib/CodeGen/AsmPrinter",
7+
"//llvm/lib/DWARFLinker",
78
"//llvm/lib/DebugInfo/DWARF",
89
"//llvm/lib/MC",
910
"//llvm/lib/Object",
@@ -13,15 +14,13 @@ static_library("DWARFLinkerParallel") {
1314
"AcceleratorRecordsSaver.cpp",
1415
"DIEAttributeCloner.cpp",
1516
"DWARFEmitterImpl.cpp",
16-
"DWARFFile.cpp",
1717
"DWARFLinker.cpp",
1818
"DWARFLinkerCompileUnit.cpp",
1919
"DWARFLinkerImpl.cpp",
2020
"DWARFLinkerTypeUnit.cpp",
2121
"DWARFLinkerUnit.cpp",
2222
"DependencyTracker.cpp",
2323
"OutputSections.cpp",
24-
"StringPool.cpp",
2524
"SyntheticTypeNameBuilder.cpp",
2625
]
2726
}

llvm/utils/gn/secondary/llvm/tools/dsymutil/BUILD.gn

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ driver_executable("dsymutil") {
1111
":Options",
1212
"//llvm/lib/CodeGen/AsmPrinter",
1313
"//llvm/lib/DWARFLinker",
14-
"//llvm/lib/DWARFLinkerParallel",
14+
"//llvm/lib/DWARFLinker/Classic",
15+
"//llvm/lib/DWARFLinker/Parallel",
1516
"//llvm/lib/DebugInfo/DWARF",
1617
"//llvm/lib/MC",
1718
"//llvm/lib/Object",

llvm/utils/gn/secondary/llvm/tools/llvm-dwarfutil/BUILD.gn

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ executable("llvm-dwarfutil") {
1010
":Options",
1111
"//llvm/lib/CodeGen",
1212
"//llvm/lib/DWARFLinker",
13-
"//llvm/lib/DWARFLinkerParallel",
13+
"//llvm/lib/DWARFLinker/Classic",
14+
"//llvm/lib/DWARFLinker/Parallel",
1415
"//llvm/lib/DebugInfo/DWARF",
1516
"//llvm/lib/MC",
1617
"//llvm/lib/ObjCopy",

llvm/utils/gn/secondary/llvm/unittests/DWARFLinkerParallel/BUILD.gn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import("//third-party/unittest/unittest.gni")
22

33
unittest("DWARFLinkerParallelTests") {
44
deps = [
5-
"//llvm/lib/DWARFLinkerParallel",
5+
"//llvm/lib/DWARFLinker/Parallel",
66
"//llvm/lib/Support",
77
"//llvm/lib/Testing/Support",
88
]

0 commit comments

Comments
 (0)