diff options
| author | bors <bors@rust-lang.org> | 2020-11-26 14:14:57 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-26 14:14:57 +0000 |
| commit | 0beba9333754ead8febc5101fc5c35f7dcdfaadf (patch) | |
| tree | dd05baf407cc40304a2b8be15fe3ce3e4b3c7374 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | aefcf1f3427a5e522a8c665d7e25529cf971bc93 (diff) | |
| parent | 89ab56344d560f63481359c2687cf4819f2341be (diff) | |
| download | rust-0beba9333754ead8febc5101fc5c35f7dcdfaadf.tar.gz rust-0beba9333754ead8febc5101fc5c35f7dcdfaadf.zip | |
Auto merge of #79441 - jonas-schievink:rollup-l9v00bl, r=jonas-schievink
Rollup of 10 pull requests Successful merges: - #77758 (suggest turbofish syntax for uninferred const arguments) - #79000 (Move lev_distance to rustc_ast, make non-generic) - #79362 (Lower patterns before using the bound variable) - #79365 (Upgrades the coverage map to Version 4) - #79402 (Fix typos) - #79412 (Clean up rustdoc tests by removing unnecessary features) - #79413 (Fix persisted doctests on Windows / when using workspaces) - #79420 (Fixes a word typo in librustdoc) - #79421 (Fix docs formatting for `thir::pattern::_match`) - #79428 (Fixup compiler docs) Failed merges: 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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp index 9b0c176b692..e17f933932e 100644 --- a/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp +++ b/compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp @@ -1462,7 +1462,7 @@ extern "C" void LLVMRustSetComdat(LLVMModuleRef M, LLVMValueRef V, const char *Name, size_t NameLen) { Triple TargetTriple(unwrap(M)->getTargetTriple()); GlobalObject *GV = unwrap<GlobalObject>(V); - if (!TargetTriple.isOSBinFormatMachO()) { + if (TargetTriple.supportsCOMDAT()) { StringRef NameRef(Name, NameLen); GV->setComdat(unwrap(M)->getOrInsertComdat(NameRef)); } |