[DWARFLinker][NFC] Rename libraries to match with directories name. #77592
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Rename LLVMDWARFLinkerBase library into the LLVMDWARFLinker. Rename LLVMDWARFLinker library into the LLVMDWARFLinkerClassic. Correct include path according to the new directory structure.
|
@llvm/pr-subscribers-debuginfo Author: None (avl-llvm) ChangesIt was noted that new DWARFLinker libraries do not follow naming agreement - #75925 (comment) This patch rename libraries to match with the agreement. Rename LLVMDWARFLinkerBase library into the LLVMDWARFLinker. Rename LLVMDWARFLinker library into the LLVMDWARFLinkerClassic. Correct include path according to the new directory structure. Full diff: https://github.com/llvm/llvm-project/pull/77592.diff 7 Files Affected:
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
)
|
nico
approved these changes
Jan 10, 2024
| DWARFLinkerCompileUnit.cpp | ||
| DWARFLinkerDeclContext.cpp | ||
| DWARFLinker.cpp | ||
| DWARFStreamer.cpp | ||
|
|
||
| ADDITIONAL_HEADER_DIRS | ||
| ${LLVM_MAIN_INCLUDE_DIR}/llvm/DWARFLinker | ||
| ${LLVM_MAIN_INCLUDE_DIR}/llvm/DWARFLinker/Classic |
There was a problem hiding this comment.
unrelated; maybe this line isn't needed at all?
There was a problem hiding this comment.
Ok, will change this and next comment with a separate patch.
| @@ -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 | |||
There was a problem hiding this comment.
same comment – since things worked with the old, wrong, name, maybe we can toss it altogether? (but seems like something for a different pr)
| @@ -1,4 +1,5 @@ | |||
| set(LLVM_LINK_COMPONENTS | |||
| DWARFLinker | |||
There was a problem hiding this comment.
This is necessary in general even if everything is working currently without DWARFLinker(as LLVMDWARFLinker contains base functionality).
|
Looks good to me. I'll wait a day for Adrian or Jonas to shout, else I'll hit the merge button tomorrow afternoon, thanks :) |
|
Thank you for the review! |
justinfargnoli
pushed a commit
to justinfargnoli/llvm-project
that referenced
this pull request
Jan 28, 2024
…lvm#77592) It was noted that new DWARFLinker libraries do not follow naming agreement - llvm#75925 (comment) This patch rename libraries to match with the agreement. Rename LLVMDWARFLinkerBase library into the LLVMDWARFLinker. Rename LLVMDWARFLinker library into the LLVMDWARFLinkerClassic. Correct include path according to the new directory structure.
felipepiovezan
pushed a commit
to felipepiovezan/llvm-project
that referenced
this pull request
Feb 2, 2024
…lvm#77592) It was noted that new DWARFLinker libraries do not follow naming agreement - llvm#75925 (comment) This patch rename libraries to match with the agreement. Rename LLVMDWARFLinkerBase library into the LLVMDWARFLinker. Rename LLVMDWARFLinker library into the LLVMDWARFLinkerClassic. Correct include path according to the new directory structure. (cherry picked from commit 35708b0)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
It was noted that new DWARFLinker libraries do not follow naming agreement - #75925 (comment) This patch rename libraries to match with the agreement.
Rename LLVMDWARFLinkerBase library into the LLVMDWARFLinker. Rename LLVMDWARFLinker library into the LLVMDWARFLinkerClassic. Correct include path according to the new directory structure.