diff options
| author | bors <bors@rust-lang.org> | 2024-10-20 03:34:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-10-20 03:34:09 +0000 |
| commit | d68c32779627fcd72a928c9e89f65094dbcf7482 (patch) | |
| tree | f664187b0159d5a2466b5ccb27d5dde7d906c24e /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | 54791efd8235805dcfbdad3b8788e08f2142c50b (diff) | |
| parent | 456821be88146f2f94be26354576794b431fd83e (diff) | |
| download | rust-d68c32779627fcd72a928c9e89f65094dbcf7482.tar.gz rust-d68c32779627fcd72a928c9e89f65094dbcf7482.zip | |
Auto merge of #131958 - Zalathar:rollup-gkuk3n1, r=Zalathar
Rollup of 4 pull requests Successful merges: - #131876 (compiler: Use LLVM's Comdat support) - #131941 (compiletest: disambiguate html-tidy from rust tidy tool) - #131942 (compiler: Adopt rust-analyzer impls for `LayoutCalculatorError`) - #131945 (rustdoc: Clean up footnote handling) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
| -rw-r--r-- | compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index 72b03fa0560..910c27da954 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -1658,16 +1658,6 @@ extern "C" void LLVMRustPositionBuilderAtStart(LLVMBuilderRef B, unwrap(B)->SetInsertPoint(unwrap(BB), Point); } -extern "C" void LLVMRustSetComdat(LLVMModuleRef M, LLVMValueRef V, - const char *Name, size_t NameLen) { - Triple TargetTriple = Triple(unwrap(M)->getTargetTriple()); - GlobalObject *GV = unwrap<GlobalObject>(V); - if (TargetTriple.supportsCOMDAT()) { - StringRef NameRef(Name, NameLen); - GV->setComdat(unwrap(M)->getOrInsertComdat(NameRef)); - } -} - enum class LLVMRustLinkage { ExternalLinkage = 0, AvailableExternallyLinkage = 1, |