Skip to content
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.

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

Don't build out of line atomics support code for uefi #752

Merged
merged 1 commit into from
Jan 28, 2025

Conversation

nikic
Copy link
Contributor

@nikic nikic commented Jan 28, 2025

llvm/llvm-project#116706 added Windows support to cpu_model. Compiling for UEFI also goes through that code path, because we treat it as a windows target. However, including windows.h is not actually going to work (and the used API would not be available in an UEFI environment).

Disable building of cpu_model on UEFI to fix this.

@nikic nikic mentioned this pull request Jan 28, 2025
5 tasks
@nikic
Copy link
Contributor Author

nikic commented Jan 28, 2025

See rust-lang/rust#135763 (comment) for the build failure this causes with LLVM 20.

@tgross35 tgross35 enabled auto-merge (rebase) January 28, 2025 19:59
llvm/llvm-project#116706 added Windows
support to cpu_model. Compiling for UEFI also goes through that
code path, because we treat it as a windows target. However,
including windows.h is not actually going to work (and the used
API would not be available in an UEFI environment).

Disable building of cpu_model on UEFI to fix this.
@tgross35 tgross35 merged commit a233db5 into rust-lang:master Jan 28, 2025
26 checks passed
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2025
Update to LLVM 20

LLVM 20 GA is scheduled for March 11th. Rust 1.86 will be stable on April 3rd.

* [x] rust-lang#135764
* [x] rust-lang#136134
* [x] rust-lang/compiler-builtins#752
* [ ] Update compiler-builtins

Tested: arm-android, test-various, x86_64-rust-for-linux, x86_64-fuchsia, dist-various-1, dist-various-2, dist-s390x-linux, dist-riscv64-linux, dist-loongarch64-musl

try-job: aarch64-gnu
try-job: aarch64-gnu-debug
try-job: dist-aarch64-linux
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2025
Update to LLVM 20

LLVM 20 GA is scheduled for March 11th. Rust 1.86 will be stable on April 3rd.

* [x] rust-lang#135764
* [x] rust-lang#136134
* [x] rust-lang/compiler-builtins#752
* [ ] Update compiler-builtins

Tested: arm-android, test-various, x86_64-rust-for-linux, x86_64-fuchsia, dist-various-1, dist-various-2, dist-s390x-linux, dist-riscv64-linux, dist-loongarch64-musl

try-job: dist-x86_64-apple
try-job: dist-apple-various
try-job: x86_64-apple-1
try-job: x86_64-apple-2
try-job: dist-aarch64-apple
try-job: aarch64-apple
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2025
Update to LLVM 20

LLVM 20 GA is scheduled for March 11th. Rust 1.86 will be stable on April 3rd.

* [x] rust-lang#135764
* [x] rust-lang#136134
* [x] rust-lang/compiler-builtins#752
* [ ] Update compiler-builtins

Tested: arm-android, test-various, x86_64-rust-for-linux, x86_64-fuchsia, dist-various-1, dist-various-2, dist-s390x-linux, dist-riscv64-linux, dist-loongarch64-musl

try-job: i686-mingw
try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
try-job: dist-i686-mingw
try-job: dist-x86_64-mingw
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 30, 2025
Update to LLVM 20

LLVM 20 GA is scheduled for March 11th. Rust 1.86 will be stable on April 3rd.

* [x] rust-lang#135764
* [x] rust-lang#136134
* [x] rust-lang/compiler-builtins#752
* [ ] Update compiler-builtins

Tested: arm-android, test-various, x86_64-rust-for-linux, x86_64-fuchsia, dist-various-1, dist-various-2, dist-s390x-linux, dist-riscv64-linux, dist-loongarch64-musl

try-job: i686-mingw
try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
try-job: dist-i686-mingw
try-job: dist-x86_64-mingw
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 31, 2025
Update to LLVM 20

LLVM 20 GA is scheduled for March 11th. Rust 1.86 will be stable on April 3rd.

* [x] rust-lang#135764
* [x] rust-lang#136134
* [x] rust-lang/compiler-builtins#752
* [ ] Update compiler-builtins

Tested: host-x86_64, host-aarch64

try-job: i686-mingw
try-job: x86_64-mingw-1
try-job: x86_64-mingw-2
try-job: dist-i686-mingw
try-job: dist-x86_64-mingw
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 31, 2025
Update to LLVM 20

LLVM 20 GA is scheduled for March 11th. Rust 1.86 will be stable on April 3rd.

* [x] rust-lang#135764
* [x] rust-lang#136134
* [x] rust-lang/compiler-builtins#752
* [ ] llvm/llvm-project#125287
* [ ] Update compiler-builtins

Tested: host-x86_64, host-aarch64, mingw

try-job: x86_64-msvc-1
try-job: x86_64-msvc-2
try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: dist-x86_64-msvc
try-job: dist-i686-msvc
try-job: dist-aarch64-msvc
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 3, 2025
Update to LLVM 20

LLVM 20 GA is scheduled for March 11th. Rust 1.86 will be stable on April 3rd.

* [x] rust-lang#135764
* [x] rust-lang#136134
* [x] rust-lang/compiler-builtins#752
* [ ] llvm/llvm-project#125287
* [ ] Update compiler-builtins (blocked on rust-lang#135501)

Tested: host-x86_64, host-aarch64, apple, mingw

try-job: x86_64-msvc-1
try-job: i686-msvc-1
try-job: dist-aarch64-msvc
try-job: x86_64-msvc-ext1
try-job: x86_64-msvc-ext2
try-job: x86_64-msvc-ext3
tgross35 added a commit to tgross35/rust that referenced this pull request Feb 4, 2025
This includes [1] which is required for LLVM 20.

[1]: rust-lang/compiler-builtins#752
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants