Skip to content

Rollup of 4 pull requests #136800

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

Jump to bottom
Closed
wants to merge 15 commits into from
Closed

Rollup of 4 pull requests #136800

wants to merge 15 commits into from

Conversation

workingjubilee
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

madsmtm and others added 15 commits January 31, 2025 04:07
@madsmtm
Bootstrap: Don't duplicate cc-rs flags
e790b92 
Commands that end up invoking cc-rs, i.e. Cargo (through build scripts)
and cmake-rs don't need the CFLAGS from cc-rs itself, as they will just
end up as duplicates.

We do still choose to pass them in certain places, but now it's at least
clear which flags are default, and which flags are extra flags added on.
@madsmtm
Always set the deployment target when building std
9318fbb
@madsmtm
Explain why MACOSX_STD_DEPLOYMENT_TARGET exist
0a3fd1f
@madsmtm
Update deployment target setup in jobs.yml
9fa819e 
Note that specifying MACOSX_STD_DEPLOYMENT_TARGET is still completely
unnecessary here, but it's nice to have for future changes where we
might want to version `std` and `rustc`'s deployment target separately.
@veera-sivarajan
Add Four Codegen Tests
dfca140
@madsmtm
Rename [default|extra]_cflags -> cc_[|un]handled_clags
d8e93c7 
Makes it explicit that these are in relation to the cc-rs crate.
@Zalathar
coverage: Store BCB node IDs in mappings, and resolve them in codegen
ee7dc06 
Even though the coverage graph itself is no longer available during codegen,
its nodes can still be used as opaque IDs.
@Zalathar
coverage: Defer part of counter-creation until codegen
20d051e
@Zalathar
coverage: Don't create counters for code that was removed by MIR opts
bf1f254
@Zalathar
coverage: Remove the old code for simplifying counters after MIR opts
bd855b6
@clubby789
Bump cc to v1.2.12 for the compiler workspace
97daf40
@workingjubilee
Rollup merge of rust-lang#133092 - madsmtm:bootstrap-deployment-targe…
6197543 
…t, r=Mark-Simulacrum

Always set the deployment target when building std

`cc` has [a bug/feature](rust-lang/cc-rs#1171) (I guess depending on how you look at it) where the default deployment target is taken from the SDK instead of from `rustc`. This causes `compiler-builtins` to build `compiler-rt` with the wrong deployment target on iOS.

I've been meaning to change how `cc` works in this regard, but that's a lengthy process, so let's fix it in bootstrap for now.

The behaviour can be seen locally with `./x build library --set build.optimized-compiler-builtins=true` for various target triples, and then inspecting with `otool -l build/host/stage1/lib/rustlib/*/lib/libcompiler_builtins-*.rlib | rg 'minos|version'`. I have added a rmake test that ensures that we now have the same version everywhere.

Fixes rust-lang#128419
Fixes rust-lang/compiler-builtins#650
Fixes rust-lang#136523
See also rust-lang/cargo#13115, rust-lang/cc-rs#1171, rust-lang#136113
See rust-lang#133092 (comment) for a description of how the change works.

try-job: i686-gnu
try-job: x86_64-apple-1
try-job: aarch64-apple
try-job: dist-apple-various
try-job: dist-aarch64-apple
@workingjubilee
Rollup merge of rust-lang#134626 - veera-sivarajan:five-codegen-tests…
aa42ce9 
…, r=Mark-Simulacrum

Add Four Codegen Tests

Closes rust-lang#74615
Closes rust-lang#123216
Closes rust-lang#49572
Closes rust-lang#93514

This PR adds four codegen tests. The FileCheck assertions were generated with the help of `update_test_checks.py` and `update_llc_test_checks.py` from the LLVM project.
@workingjubilee
Rollup merge of rust-lang#136053 - Zalathar:defer-counters, r=saethlin
fd50a27 
coverage: Defer part of counter-creation until codegen

Follow-up to rust-lang#135481 and rust-lang#135873.

One of the pleasant properties of the new counter-assignment algorithm is that we can stop partway through the process, store the intermediate state in MIR, and then resume the rest of the algorithm during codegen. This lets it take into account which parts of the control-flow graph were eliminated by MIR opts, resulting in fewer physical counters and simpler counter expressions.

Those improvements end up completely obsoleting much larger chunks of code that were previously responsible for cleaning up the coverage metadata after MIR opts, while also doing a more thorough cleanup job.

(That change also unlocks some further simplifications that I've kept out of this PR to limit its scope.)
@workingjubilee
Rollup merge of rust-lang#136707 - clubby789:cmake-bisect, r=jieyouxu
9324bf7 
Bump `cc` to v1.2.12 for the compiler workspace
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 10, 2025
@workingjubilee
Copy link
Member Author

I decided to rollup all the iffies for a last chance for them. Any PRs that fail in this should probably be upgraded to rollup=never.

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Feb 10, 2025

📌 Commit 9324bf7 has been approved by workingjubilee

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 10, 2025
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 10, 2025
@bors
Auto merge of rust-lang#136800 - workingjubilee:rollup-iqq77nv, r=wor…
665b2de 
…kingjubilee

Rollup of 4 pull requests

Successful merges:

 - rust-lang#133092 (Always set the deployment target when building std)
 - rust-lang#134626 (Add Four Codegen Tests)
 - rust-lang#136053 (coverage: Defer part of counter-creation until codegen)
 - rust-lang#136707 (Bump `cc` to v1.2.12 for the compiler workspace)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors
Copy link
Collaborator

bors commented Feb 10, 2025

⌛ Testing commit 9324bf7 with merge 665b2de...

@rust-log-analyzer
Copy link
Collaborator

The job dist-various-2 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
   Compiling libc v0.2.169
[RUSTC-TIMING] build_script_build test:false 0.191
   Compiling compiler_builtins v0.1.145
warning: [email protected]: In file included from /checkout/src/llvm-project/compiler-rt/lib/builtins/cpu_model/aarch64.c:44:
warning: [email protected]: /checkout/src/llvm-project/compiler-rt/lib/builtins/cpu_model/aarch64/lse_atomics/fuchsia.inc:1:10: fatal error: 'zircon/features.h' file not found
warning: [email protected]:     1 | #include <zircon/features.h>
warning: [email protected]: 1 error generated.
error: failed to run custom build command for `compiler_builtins v0.1.145`

Caused by:
Caused by:
  process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/release/build/compiler_builtins-0aa2e7bb4f1086a8/build-script-build` (exit status: 1)
  --- stdout
  cargo::rerun-if-changed=build.rs
  cargo::rerun-if-changed=configure.rs
  cargo::rustc-check-cfg=cfg(__ashldi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__ashlsi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__ashrdi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__ashrsi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__bswapsi2, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__bswapdi2, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__bswapti2, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__divdi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__divsi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__divmoddi4, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__divmodsi4, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__divmodsi4, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__divmodti4, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__lshrdi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__lshrsi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__moddi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__modsi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__muldi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__udivdi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__udivmoddi4, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__udivmodsi4, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__udivsi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__umoddi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__umodsi3, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas1_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas1_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas1_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas1_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas2_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas2_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas2_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas2_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas4_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas4_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas4_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas4_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas8_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas8_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas8_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas8_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas16_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas16_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas16_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_cas16_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd1_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd1_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd1_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd1_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd2_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd2_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd2_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd2_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd4_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd4_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd4_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd4_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd8_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd8_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd8_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldadd8_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr1_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr1_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr1_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr1_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr2_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr2_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr2_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr2_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr4_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr4_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr4_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr4_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr8_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr8_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr8_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldclr8_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor1_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor1_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor1_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor1_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor2_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor2_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor2_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor2_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor4_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor4_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor4_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor4_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor8_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor8_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor8_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldeor8_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset1_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset1_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset1_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset1_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset2_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset2_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset2_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset2_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset4_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset4_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset4_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset4_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset8_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset8_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset8_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_ldset8_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp1_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp1_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp1_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp1_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp2_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp2_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp2_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp2_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp4_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp4_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp4_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp4_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp8_relax, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp8_acq, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp8_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(__aarch64_swp8_acq_rel, values("optimized-c"))
  cargo::rustc-check-cfg=cfg(target_feature, values("vis3"))
  cargo::rustc-check-cfg=cfg(feature, values("checked"))
  cargo::rustc-check-cfg=cfg(assert_no_panic)
  cargo::rustc-check-cfg=cfg(f16_enabled)
  cargo::rustc-check-cfg=cfg(f128_enabled)
  cargo::rustc-cfg=f16_enabled
  cargo::rustc-cfg=f128_enabled
  cargo:rustc-check-cfg=cfg(intrinsics_enabled)
  cargo:rustc-check-cfg=cfg(arch_enabled)
  cargo:rustc-check-cfg=cfg(optimizations_enabled)
  cargo:rustc-check-cfg=cfg(feature, values("unstable-public-internals"))
  cargo:rustc-cfg=intrinsics_enabled
  cargo:rustc-cfg=arch_enabled
  cargo:rustc-check-cfg=cfg(optimizations_enabled)
  cargo:rustc-cfg=optimizations_enabled
  cargo:rustc-check-cfg=cfg(x86_no_sse)
  cargo:rustc-env=CFG_CARGO_FEATURES=["c", "cc", "compiler-builtins", "core", "default", "rustc-dep-of-std"]
  cargo:rustc-env=CFG_OPT_LEVEL=3
  cargo:rustc-env=CFG_TARGET_FEATURES=["neon"]
  cargo:rustc-cfg=feature="unstable-intrinsics"
  cargo:compiler-rt=/cargo/registry/src/index.crates.io-1949cf8c6b5b557f/compiler_builtins-0.1.145/compiler-rt
  cargo::rustc-check-cfg=cfg(feature, values("mem-unaligned"))
  cargo:rustc-cfg=feature="mem-unaligned"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/aarch64/lse.S
  cargo:rustc-cfg=__aarch64_cas1_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_cas1_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_cas1_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_cas1_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_cas2_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_cas2_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_cas2_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_cas2_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_cas4_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_cas4_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_cas4_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_cas4_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_cas8_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_cas8_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_cas8_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_cas8_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_cas16_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_cas16_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_cas16_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_cas16_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_swp1_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_swp1_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_swp1_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_swp1_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_swp2_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_swp2_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_swp2_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_swp2_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_swp4_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_swp4_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_swp4_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_swp4_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_swp8_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_swp8_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_swp8_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_swp8_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd1_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd1_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd1_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd1_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd2_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd2_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd2_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd2_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd4_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd4_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd4_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd4_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd8_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd8_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd8_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldadd8_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr1_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr1_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr1_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr1_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr2_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr2_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr2_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr2_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr4_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr4_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr4_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr4_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr8_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr8_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr8_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldclr8_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor1_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor1_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor1_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor1_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor2_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor2_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor2_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor2_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor4_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor4_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor4_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor4_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor8_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor8_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor8_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldeor8_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset1_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset1_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset1_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset1_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset2_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset2_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset2_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset2_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset4_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset4_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset4_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset4_acq_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset8_relax="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset8_acq="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset8_rel="optimized-c"
  cargo:rustc-cfg=__aarch64_ldset8_acq_rel="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/cpu_model/aarch64.c
  cargo:rustc-cfg=__aarch64_have_lse_atomics="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/absvdi2.c
  cargo:rustc-cfg=__absvdi2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/absvsi2.c
  cargo:rustc-cfg=__absvsi2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/absvti2.c
  cargo:rustc-cfg=__absvti2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/addvdi3.c
  cargo:rustc-cfg=__addvdi3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/addvsi3.c
  cargo:rustc-cfg=__addvsi3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/addvti3.c
  cargo:rustc-cfg=__addvti3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/cmpdi2.c
  cargo:rustc-cfg=__cmpdi2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/cmpti2.c
  cargo:rustc-cfg=__cmpti2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/comparetf2.c
  cargo:rustc-cfg=__comparetf2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/divdc3.c
  cargo:rustc-cfg=__divdc3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/divsc3.c
  cargo:rustc-cfg=__divsc3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/fp_mode.c
  cargo:rustc-cfg=__fe_getround="optimized-c"
  cargo:rustc-cfg=__fe_raise_inexact="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/ffsti2.c
  cargo:rustc-cfg=__ffsti2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/int_util.c
  cargo:rustc-cfg=__int_util="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/muldc3.c
  cargo:rustc-cfg=__muldc3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/mulsc3.c
  cargo:rustc-cfg=__mulsc3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/multc3.c
  cargo:rustc-cfg=__multc3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/mulvdi3.c
  cargo:rustc-cfg=__mulvdi3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/mulvsi3.c
  cargo:rustc-cfg=__mulvsi3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/mulvti3.c
  cargo:rustc-cfg=__mulvti3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/negdf2.c
  cargo:rustc-cfg=__negdf2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/negdi2.c
  cargo:rustc-cfg=__negdi2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/negsf2.c
  cargo:rustc-cfg=__negsf2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/negti2.c
  cargo:rustc-cfg=__negti2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/negvdi2.c
  cargo:rustc-cfg=__negvdi2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/negvsi2.c
  cargo:rustc-cfg=__negvsi2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/negvti2.c
  cargo:rustc-cfg=__negvti2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/paritydi2.c
  cargo:rustc-cfg=__paritydi2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/paritysi2.c
  cargo:rustc-cfg=__paritysi2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/parityti2.c
  cargo:rustc-cfg=__parityti2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/popcountdi2.c
  cargo:rustc-cfg=__popcountdi2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/popcountsi2.c
  cargo:rustc-cfg=__popcountsi2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/popcountti2.c
  cargo:rustc-cfg=__popcountti2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/subvdi3.c
  cargo:rustc-cfg=__subvdi3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/subvsi3.c
  cargo:rustc-cfg=__subvsi3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/subvti3.c
  cargo:rustc-cfg=__subvti3="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/ucmpdi2.c
  cargo:rustc-cfg=__ucmpdi2="optimized-c"
  cargo:rerun-if-changed=/checkout/src/llvm-project/compiler-rt/lib/builtins/ucmpti2.c
  cargo:rustc-cfg=__ucmpti2="optimized-c"
  OUT_DIR = Some(/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/aarch64-unknown-fuchsia/release/build/compiler_builtins-6830d4e928982f93/out)
  TARGET = Some(aarch64-unknown-fuchsia)
  HOST = Some(x86_64-unknown-linux-gnu)
  cargo:rerun-if-env-changed=CC_aarch64-unknown-fuchsia
  CC_aarch64-unknown-fuchsia = None
  CC_aarch64-unknown-fuchsia = None
  cargo:rerun-if-env-changed=CC_aarch64_unknown_fuchsia
  CC_aarch64_unknown_fuchsia = Some(sccache aarch64-unknown-fuchsia-clang)
  cargo:rerun-if-env-changed=CC_KNOWN_WRAPPER_CUSTOM
  CC_KNOWN_WRAPPER_CUSTOM = None
  cargo:rerun-if-env-changed=CC_ENABLE_DEBUG_OUTPUT
  CRATE_CC_NO_DEFAULTS = None
  DEBUG = Some(true)
  cargo:rerun-if-env-changed=CFLAGS_aarch64-unknown-fuchsia
  CFLAGS_aarch64-unknown-fuchsia = None
---
  cargo:rerun-if-env-changed=CFLAGS_aarch64-unknown-fuchsia
  CFLAGS_aarch64-unknown-fuchsia = None
  cargo:rerun-if-env-changed=CFLAGS_aarch64_unknown_fuchsia
  CFLAGS_aarch64_unknown_fuchsia = Some()
  cargo:rerun-if-env-changed=CC_SHELL_ESCAPED_FLAGS
  CC_SHELL_ESCAPED_FLAGS = None
  cargo:warning=In file included from /checkout/src/llvm-project/compiler-rt/lib/builtins/cpu_model/aarch64.c:44:
  cargo:warning=/checkout/src/llvm-project/compiler-rt/lib/builtins/cpu_model/aarch64/lse_atomics/fuchsia.inc:1:10: fatal error: 'zircon/features.h' file not found
  cargo:warning=    1 | #include <zircon/features.h>
  cargo:warning=      |          ^~~~~~~~~~~~~~~~~~~

  --- stderr



  error occurred: Command "sccache" "aarch64-unknown-fuchsia-clang" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "-g" "-fno-omit-frame-pointer" "--target=aarch64-unknown-fuchsia" "-I" "/checkout/src/llvm-project/compiler-rt/lib/builtins" "-fno-builtin" "-fvisibility=hidden" "-ffreestanding" "-fomit-frame-pointer" "-ffile-prefix-map=/checkout/src/llvm-project/compiler-rt=." "-DCOMPILER_RT_HAS_FLOAT16" "-DVISIBILITY_HIDDEN" "-o" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-std/aarch64-unknown-fuchsia/release/build/compiler_builtins-6830d4e928982f93/out/670c1ed24249df13-aarch64.o" "-c" "/checkout/src/llvm-project/compiler-rt/lib/builtins/cpu_model/aarch64.c" with args aarch64-unknown-fuchsia-clang did not execute successfully (status code exit status: 1).

warning: build failed, waiting for other jobs to finish...
[RUSTC-TIMING] core test:false 18.277
Build completed unsuccessfully in 0:34:48

@bors
Copy link
Collaborator

bors commented Feb 10, 2025

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 10, 2025
@workingjubilee workingjubilee mentioned this pull request Feb 10, 2025
Merged
@workingjubilee workingjubilee deleted the rollup-iqq77nv branch February 10, 2025 05:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@workingjubilee @bors @rust-log-analyzer @rustbot @madsmtm @veera-sivarajan @Zalathar @clubby789