[llvm] [DWARFLinker][NFC] Rename libraries to match with directories name. (PR #77592)

[via llvm-commits]

https://github.com/avl-llvm updated https://github.com/llvm/llvm-project/pull/77592

>From 53e759684e7db1afef233d5c7996e1537f04364f Mon Sep 17 00:00:00 2001
From: Alexey Lapshin <a.v.lapshin at mail.ru>
Date: Tue, 9 Jan 2024 22:37:22 +0300
Subject: [PATCH 1/2] [DWARFLinker][NFC] Rename libraries to match with
 directories name.

Rename LLVMDWARFLinkerBase library into the LLVMDWARFLinker.
Rename LLVMDWARFLinker library into the LLVMDWARFLinkerClassic.
Correct include path according to the new directory structure.
---
 bolt/lib/Rewrite/CMakeLists.txt                   | 2 +-
 llvm/lib/DWARFLinker/CMakeLists.txt               | 2 +-
 llvm/lib/DWARFLinker/Classic/CMakeLists.txt       | 6 +++---
 llvm/lib/DWARFLinker/Parallel/CMakeLists.txt      | 4 ++--
 llvm/tools/dsymutil/CMakeLists.txt                | 2 +-
 llvm/tools/llvm-dwarfutil/CMakeLists.txt          | 2 +-
 llvm/unittests/DWARFLinkerParallel/CMakeLists.txt | 1 +
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/bolt/lib/Rewrite/CMakeLists.txt b/bolt/lib/Rewrite/CMakeLists.txt
index fb21c13c654b3e..6890f52e2b28bb 100644
--- a/bolt/lib/Rewrite/CMakeLists.txt
+++ b/bolt/lib/Rewrite/CMakeLists.txt
@@ -5,8 +5,8 @@ set(LLVM_LINK_COMPONENTS
   MC
   Object
   Support
-  DWARFLinkerBase
   DWARFLinker
+  DWARFLinkerClassic
   AsmPrinter
   TargetParser
   )
diff --git a/llvm/lib/DWARFLinker/CMakeLists.txt b/llvm/lib/DWARFLinker/CMakeLists.txt
index 73055a96d4a947..66bbf72165d642 100644
--- a/llvm/lib/DWARFLinker/CMakeLists.txt
+++ b/llvm/lib/DWARFLinker/CMakeLists.txt
@@ -1,4 +1,4 @@
-add_llvm_component_library(LLVMDWARFLinkerBase
+add_llvm_component_library(LLVMDWARFLinker
   Utils.cpp
 
   ADDITIONAL_HEADER_DIRS
diff --git a/llvm/lib/DWARFLinker/Classic/CMakeLists.txt b/llvm/lib/DWARFLinker/Classic/CMakeLists.txt
index b173d42eb01539..8865091722b777 100644
--- a/llvm/lib/DWARFLinker/Classic/CMakeLists.txt
+++ b/llvm/lib/DWARFLinker/Classic/CMakeLists.txt
@@ -1,11 +1,11 @@
-add_llvm_component_library(LLVMDWARFLinker
+add_llvm_component_library(LLVMDWARFLinkerClassic
   DWARFLinkerCompileUnit.cpp
   DWARFLinkerDeclContext.cpp
   DWARFLinker.cpp
   DWARFStreamer.cpp
 
   ADDITIONAL_HEADER_DIRS
-  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DWARFLinker
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DWARFLinker/Classic
 
   DEPENDS
   intrinsics_gen
@@ -16,7 +16,7 @@ add_llvm_component_library(LLVMDWARFLinker
   CodeGen
   CodeGenTypes
   DebugInfoDWARF
-  DWARFLinkerBase
+  DWARFLinker
   MC
   Object
   Support
diff --git a/llvm/lib/DWARFLinker/Parallel/CMakeLists.txt b/llvm/lib/DWARFLinker/Parallel/CMakeLists.txt
index 5d38062975135f..02fbbd6274104a 100644
--- a/llvm/lib/DWARFLinker/Parallel/CMakeLists.txt
+++ b/llvm/lib/DWARFLinker/Parallel/CMakeLists.txt
@@ -12,7 +12,7 @@ add_llvm_component_library(LLVMDWARFLinkerParallel
   SyntheticTypeNameBuilder.cpp
 
   ADDITIONAL_HEADER_DIRS
-  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DWARFLinkerParallel
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DWARFLinker/Parallel
 
   DEPENDS
   intrinsics_gen
@@ -22,7 +22,7 @@ add_llvm_component_library(LLVMDWARFLinkerParallel
   BinaryFormat
   CodeGen
   DebugInfoDWARF
-  DWARFLinkerBase
+  DWARFLinker
   MC
   Object
   Support
diff --git a/llvm/tools/dsymutil/CMakeLists.txt b/llvm/tools/dsymutil/CMakeLists.txt
index 0e407f6fa1db43..53f882e90b4e92 100644
--- a/llvm/tools/dsymutil/CMakeLists.txt
+++ b/llvm/tools/dsymutil/CMakeLists.txt
@@ -9,8 +9,8 @@ set(LLVM_LINK_COMPONENTS
   AsmPrinter
   CodeGen
   CodeGenTypes
-  DWARFLinkerBase
   DWARFLinker
+  DWARFLinkerClassic
   DWARFLinkerParallel
   DebugInfoDWARF
   MC
diff --git a/llvm/tools/llvm-dwarfutil/CMakeLists.txt b/llvm/tools/llvm-dwarfutil/CMakeLists.txt
index 91b25207b4f728..23a526782dd7b8 100644
--- a/llvm/tools/llvm-dwarfutil/CMakeLists.txt
+++ b/llvm/tools/llvm-dwarfutil/CMakeLists.txt
@@ -7,8 +7,8 @@ set(LLVM_LINK_COMPONENTS
   AllTargetsDescs
   AllTargetsInfos
   CodeGenTypes
-  DWARFLinkerBase
   DWARFLinker
+  DWARFLinkerClassic
   DWARFLinkerParallel
   DebugInfoDWARF
   MC
diff --git a/llvm/unittests/DWARFLinkerParallel/CMakeLists.txt b/llvm/unittests/DWARFLinkerParallel/CMakeLists.txt
index 5eeec23df4edba..22c6539f48bfb5 100644
--- a/llvm/unittests/DWARFLinkerParallel/CMakeLists.txt
+++ b/llvm/unittests/DWARFLinkerParallel/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(LLVM_LINK_COMPONENTS
+  DWARFLinker
   DWARFLinkerParallel
   Support
   )

>From bca11cb010177f007a476e79d30e29f359b8d353 Mon Sep 17 00:00:00 2001
From: Alexey Lapshin <a.v.lapshin at mail.ru>
Date: Thu, 11 Jan 2024 00:02:24 +0300
Subject: [PATCH 2/2] remove changes for include directories.

---
 llvm/lib/DWARFLinker/Classic/CMakeLists.txt  | 2 +-
 llvm/lib/DWARFLinker/Parallel/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/llvm/lib/DWARFLinker/Classic/CMakeLists.txt b/llvm/lib/DWARFLinker/Classic/CMakeLists.txt
index 8865091722b777..4a3ac0d2220829 100644
--- a/llvm/lib/DWARFLinker/Classic/CMakeLists.txt
+++ b/llvm/lib/DWARFLinker/Classic/CMakeLists.txt
@@ -5,7 +5,7 @@ add_llvm_component_library(LLVMDWARFLinkerClassic
   DWARFStreamer.cpp
 
   ADDITIONAL_HEADER_DIRS
-  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DWARFLinker/Classic
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DWARFLinker
 
   DEPENDS
   intrinsics_gen
diff --git a/llvm/lib/DWARFLinker/Parallel/CMakeLists.txt b/llvm/lib/DWARFLinker/Parallel/CMakeLists.txt
index 02fbbd6274104a..209d971be062a2 100644
--- a/llvm/lib/DWARFLinker/Parallel/CMakeLists.txt
+++ b/llvm/lib/DWARFLinker/Parallel/CMakeLists.txt
@@ -12,7 +12,7 @@ add_llvm_component_library(LLVMDWARFLinkerParallel
   SyntheticTypeNameBuilder.cpp
 
   ADDITIONAL_HEADER_DIRS
-  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DWARFLinker/Parallel
+  ${LLVM_MAIN_INCLUDE_DIR}/llvm/DWARFLinkerParallel
 
   DEPENDS
   intrinsics_gen