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_target/src | |
| 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_target/src')
| -rw-r--r-- | compiler/rustc_target/src/spec/mod.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs index 82e11a3afce..f4b45a08195 100644 --- a/compiler/rustc_target/src/spec/mod.rs +++ b/compiler/rustc_target/src/spec/mod.rs @@ -2515,6 +2515,13 @@ fn add_link_args(link_args: &mut LinkArgs, flavor: LinkerFlavor, args: &[&'stati } impl TargetOptions { + pub fn supports_comdat(&self) -> bool { + // XCOFF and MachO don't support COMDAT. + !self.is_like_aix && !self.is_like_osx + } +} + +impl TargetOptions { fn link_args(flavor: LinkerFlavor, args: &[&'static str]) -> LinkArgs { let mut link_args = LinkArgs::new(); add_link_args(&mut link_args, flavor, args); |