Skip to content

Rollup of 7 pull requests #134282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 16 commits into from
Closed

Rollup of 7 pull requests #134282

Changes from 2 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
2ce89ee
Add a test for mangling of named constants in const generics and arra…
oli-obk Dec 9, 2024
9ecdc54
Try to evaluate constants in legacy mangling
oli-obk Dec 9, 2024
de53fe2
coverage: Tidy up creation of covmap records
Zalathar Dec 12, 2024
5f5745b
coverage: Tidy up creation of covfun records
Zalathar Dec 12, 2024
2a6a7be
don't show the full linker args unless `--verbose` is passed
jyn514 Dec 25, 2023
37bb774
Reduce the need to set archiver via environment variables
flba-eb Dec 12, 2024
3a90c47
Fix powerpc64 big-endian FreeBSD ABI
taiki-e Oct 25, 2024
7fb2fc0
feat: clarify how to use `black_box()`
BD103 Dec 5, 2024
2e412fe
Remove `Lexer`'s dependency on `Parser`.
nnethercote Dec 12, 2024
21dc022
Rollup merge of #132150 - taiki-e:ppc64-freebsd-abi, r=pnkfelix
matthiaskrgr Dec 13, 2024
1a0a0ea
Rollup merge of #133633 - jyn514:hide-linker-args, r=bjorn3,jyn514
matthiaskrgr Dec 13, 2024
c798e11
Rollup merge of #133942 - BD103:black-box-docs, r=saethlin
matthiaskrgr Dec 13, 2024
a273d8c
Rollup merge of #134081 - oli-obk:push-prpsqxxynxnq, r=BoxyUwU
matthiaskrgr Dec 13, 2024
bf25833
Rollup merge of #134192 - nnethercote:rm-Lexer-Parser-dep, r=compiler…
matthiaskrgr Dec 13, 2024
a0fbf40
Rollup merge of #134208 - Zalathar:covmap-covfun, r=compiler-errors
matthiaskrgr Dec 13, 2024
9668539
Rollup merge of #134211 - flba-eb:add_qnx_archiver, r=compiler-errors
matthiaskrgr Dec 13, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/bootstrap/src/utils/cc_detect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,16 @@ fn cc2ar(cc: &Path, target: TargetSelection) -> Option<PathBuf> {
Some(PathBuf::from("ar"))
} else if target.contains("vxworks") {
Some(PathBuf::from("wr-ar"))
} else if target.contains("-nto-") {
if target.starts_with("i586") {
Some(PathBuf::from("ntox86-ar"))
} else if target.starts_with("aarch64") {
Some(PathBuf::from("ntoaarch64-ar"))
} else if target.starts_with("x86_64") {
Some(PathBuf::from("ntox86_64-ar"))
} else {
panic!("Unknown architecture, cannot determine archiver for Neutrino QNX");
}
} else if target.contains("android") || target.contains("-wasi") {
Some(cc.parent().unwrap().join(PathBuf::from("llvm-ar")))
} else {
Expand Down
Loading