[NFC][RISCV] Simplify the dynamic linker construction logic #97383
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
Created using spr 1.3.6-beta.1 [skip ci]
Created using spr 1.3.6-beta.1
llvmbot
added
clang
|
@llvm/pr-subscribers-clang @llvm/pr-subscribers-clang-driver Author: Pengcheng Wang (wangpc-pp) ChangesThe format of dynamic linker is Full diff: https://github.com/llvm/llvm-project/pull/97383.diff 1 Files Affected:
diff --git a/clang/lib/Driver/ToolChains/Linux.cpp b/clang/lib/Driver/ToolChains/Linux.cpp
index 49e029e7c9ab7..98a878e1d764d 100644
--- a/clang/lib/Driver/ToolChains/Linux.cpp
+++ b/clang/lib/Driver/ToolChains/Linux.cpp
@@ -568,16 +568,12 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
Loader =
(tools::ppc::hasPPCAbiArg(Args, "elfv1")) ? "ld64.so.1" : "ld64.so.2";
break;
- case llvm::Triple::riscv32: {
- StringRef ABIName = tools::riscv::getRISCVABI(Args, Triple);
- LibDir = "lib";
- Loader = ("ld-linux-riscv32-" + ABIName + ".so.1").str();
- break;
- }
+ case llvm::Triple::riscv32:
case llvm::Triple::riscv64: {
+ StringRef ArchName = llvm::Triple::getArchTypeName(Arch);
StringRef ABIName = tools::riscv::getRISCVABI(Args, Triple);
LibDir = "lib";
- Loader = ("ld-linux-riscv64-" + ABIName + ".so.1").str();
+ Loader = ("ld-linux-" + ArchName + "-" + ABIName + ".so.1").str();
break;
}
case llvm::Triple::sparc:
|
MaskRay
approved these changes
Jul 2, 2024
Created using spr 1.3.6-beta.1
wangpc-pp
changed the base branch from
users/wangpc-pp/spr/main.nfcriscv-simplify-the-dynamic-linker-construction-logic
to
main
wangpc-pp
deleted the
users/wangpc-pp/spr/nfcriscv-simplify-the-dynamic-linker-construction-logic
branch
lravenclaw
pushed a commit
to lravenclaw/llvm-project
that referenced
this pull request
Jul 3, 2024
The format of dynamic linker is `ld-linux-{arch}-{abi}.so.1`, so
we can just get the arch name from arch type.
Reviewers: asb, kito-cheng, MaskRay
Reviewed By: MaskRay
Pull Request: llvm#97383
kbluck
pushed a commit
to kbluck/llvm-project
that referenced
this pull request
Jul 6, 2024
The format of dynamic linker is `ld-linux-{arch}-{abi}.so.1`, so
we can just get the arch name from arch type.
Reviewers: asb, kito-cheng, MaskRay
Reviewed By: MaskRay
Pull Request: llvm#97383
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.
The format of dynamic linker is
ld-linux-{arch}-{abi}.so.1, sowe can just get the arch name from arch type.