diff options
| author | bors <bors@rust-lang.org> | 2025-02-08 12:57:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-02-08 12:57:59 +0000 |
| commit | 8ad2c9724d983cfb116baab0bb800edd17f31644 (patch) | |
| tree | a54e1d4011f5fdc76090a179cbc965b3c7801dc5 /compiler/rustc_codegen_llvm/src/base.rs | |
| parent | d2f335d58e6c346f94910d0f49baf185028b44be (diff) | |
| parent | a5b9e8ce837db7312026426c290b2db10248752b (diff) | |
| download | rust-8ad2c9724d983cfb116baab0bb800edd17f31644.tar.gz rust-8ad2c9724d983cfb116baab0bb800edd17f31644.zip | |
Auto merge of #136728 - matthiaskrgr:rollup-x2qh9yt, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #136640 (Debuginfo for function ZSTs should have alignment of 8 bits, not 1 bit) - #136648 (Add a missing `//@ needs-symlink` to `tests/run-make/libs-through-symlinks`) - #136651 (Label mismatched parameters at the def site for foreign functions) - #136691 (Remove Linkage::Private and Linkage::Appending) - #136692 (add module level doc for bootstrap:utils:exec) - #136700 (i686-unknown-hurd-gnu: bump baseline CPU to Pentium 4) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_llvm/src/base.rs')
| -rw-r--r-- | compiler/rustc_codegen_llvm/src/base.rs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_llvm/src/base.rs b/compiler/rustc_codegen_llvm/src/base.rs index d05faf5577b..d35c7945bae 100644 --- a/compiler/rustc_codegen_llvm/src/base.rs +++ b/compiler/rustc_codegen_llvm/src/base.rs @@ -157,9 +157,7 @@ pub(crate) fn linkage_to_llvm(linkage: Linkage) -> llvm::Linkage { Linkage::LinkOnceODR => llvm::Linkage::LinkOnceODRLinkage, Linkage::WeakAny => llvm::Linkage::WeakAnyLinkage, Linkage::WeakODR => llvm::Linkage::WeakODRLinkage, - Linkage::Appending => llvm::Linkage::AppendingLinkage, Linkage::Internal => llvm::Linkage::InternalLinkage, - Linkage::Private => llvm::Linkage::PrivateLinkage, Linkage::ExternalWeak => llvm::Linkage::ExternalWeakLinkage, Linkage::Common => llvm::Linkage::CommonLinkage, } |