-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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
rust: update to 1.65.0 #13921
rust: update to 1.65.0 #13921
Conversation
@mati865 now it's time for me to ask what I was wondering when clangarm64 was enabled: what is the plan for building it moving forward? Turning off |
Previously this used to be problematic because you always needed N-1 version to build N version. So You could build 1.65 using 1.64 but not rebuild 1.65 using 1.65. I think nowadays you can use N-1 or N though.
No problem for me.
The only problem here is getting machines where that would run. Unlike many other projects Rust builds each commit for every target/host that is enabled to build them. So it needs a lot of relatively fast runners and currently they are already struggling. |
Yeah, windows arm64 runners are an issue 😬 |
So, OK to merge? |
I expect clangarm64 needs more work before it would build. I didn't see the patches for it updated here, so they most likely won't apply. |
oh, I see |
(We could also create a arm64 specific pkgbase of this, so it can be updated at a different pace?) |
they apply now, but totally untested
The |
Getting an error |
Either this, or we'll need to continue to inject new stage0 packages during rust updates. I left the patch and code to do that in place for now in case that turns out to be necessary or desirable.
We should probably add the same two lines that are under Todo in gnu targets spec to gnullvm targets spec. |
I've got a build running with the following patch. It's gotten further than the last run. --- rustc-1.65.0-src/compiler/rustc_target/src/spec/windows_gnullvm_base.rs.ori2022-11-02 14:36:24.000000000 +0000
+++ rustc-1.65.0-src/compiler/rustc_target/src/spec/windows_gnullvm_base.rs 2022-11-05 20:16:01.345559900 +0000
@@ -1,4 +1,5 @@
-use crate::spec::{cvs, LinkerFlavor, TargetOptions};
+use crate::spec::{cvs, DebuginfoKind, LinkerFlavor, SplitDebuginfo, TargetOptions};
+use std::borrow::Cow;
pub fn opts() -> TargetOptions {
// We cannot use `-nodefaultlibs` because compiler-rt has to be passed
@@ -34,7 +35,10 @@
eh_frame_header: false,
no_default_libraries: false,
has_thread_local: true,
-
+ // FIXME(davidtwco): Support Split DWARF on Windows GNU - may require LLVM changes to
+ // output DWO, despite using DWARF, doesn't use ELF..
+ debuginfo_kind: DebuginfoKind::Pdb,
+ supported_split_debuginfo: Cow::Borrowed(&[SplitDebuginfo::Off]),
..Default::default()
}
}
|
clangarm64 built successfully with that patch. I'll leave it to @mati865 to send it upstream, I imagine there are a few of the fixes for gnullvm that need to be sent. |
I don't think it's the problem. AFAIK Rust had special runners provided by Microsoft for a long time. The problem is more about getting more runners.
I'm sending them separately (some are already sent) so you can go ahead and open PR. |
fix debuginfo for windows_gnullvm_base.rs These lines (including the FIXME comment) were added to windows_gnu_base.rs in cf2c492 but windows_gnullvm_base.rs was not updated. This resulted in an error `LLVM ERROR: dwo only supported with ELF and Wasm` attempting to build on aarch64-pc-windows-gnullvm. See also msys2/MINGW-packages#13921 (comment) /cc `@mati865` `@davidtwco` r? `@davidtwco`
fix debuginfo for windows_gnullvm_base.rs These lines (including the FIXME comment) were added to windows_gnu_base.rs in cf2c492 but windows_gnullvm_base.rs was not updated. This resulted in an error `LLVM ERROR: dwo only supported with ELF and Wasm` attempting to build on aarch64-pc-windows-gnullvm. See also msys2/MINGW-packages#13921 (comment) /cc ``@mati865`` ``@davidtwco`` r? ``@davidtwco``
fix debuginfo for windows_gnullvm_base.rs These lines (including the FIXME comment) were added to windows_gnu_base.rs in cf2c492 but windows_gnullvm_base.rs was not updated. This resulted in an error `LLVM ERROR: dwo only supported with ELF and Wasm` attempting to build on aarch64-pc-windows-gnullvm. See also msys2/MINGW-packages#13921 (comment) /cc ```@mati865``` ```@davidtwco``` r? ```@davidtwco```
No description provided.