From a5779e5d37a9efce7b55914d9cc56e38bc260444 Mon Sep 17 00:00:00 2001 From: theKidOfArcrania Date: Mon, 13 May 2024 11:17:07 -0700 Subject: [PATCH 1/5] Fix paths for Windows arm64 build --- library/compiler-builtins/build.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/compiler-builtins/build.rs b/library/compiler-builtins/build.rs index bafbf75d0681..c6af5a9e7b2f 100644 --- a/library/compiler-builtins/build.rs +++ b/library/compiler-builtins/build.rs @@ -1,4 +1,4 @@ -use std::{collections::BTreeMap, env, sync::atomic::Ordering}; +use std::{collections::BTreeMap, env, path::PathBuf, sync::atomic::Ordering}; fn main() { println!("cargo:rerun-if-changed=build.rs"); @@ -141,8 +141,8 @@ fn generate_aarch64_outlined_atomics() { buf += macro_def; buf += "}; }\n"; } - let dst = std::env::var("OUT_DIR").unwrap() + "/outlined_atomics.rs"; - std::fs::write(dst, buf).unwrap(); + let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap()); + std::fs::write(out_dir.join("outlined_atomics.rs"), buf).unwrap(); } #[cfg(feature = "c")] @@ -612,7 +612,7 @@ mod c { fn build_aarch64_out_of_line_atomics_libraries(builtins_dir: &Path, cfg: &mut cc::Build) { let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap()); - let outlined_atomics_file = builtins_dir.join("aarch64/lse.S"); + let outlined_atomics_file = builtins_dir.join("aarch64").join("lse.S"); println!("cargo:rerun-if-changed={}", outlined_atomics_file.display()); cfg.include(&builtins_dir); From 4edceece666ff008a61bc645469ee792de087ecf Mon Sep 17 00:00:00 2001 From: theKidOfArcrania Date: Mon, 13 May 2024 11:29:55 -0700 Subject: [PATCH 2/5] Add aarch64 target --- library/compiler-builtins/.github/workflows/main.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/library/compiler-builtins/.github/workflows/main.yml b/library/compiler-builtins/.github/workflows/main.yml index 57497e050016..f1c63e4f93f7 100644 --- a/library/compiler-builtins/.github/workflows/main.yml +++ b/library/compiler-builtins/.github/workflows/main.yml @@ -83,6 +83,9 @@ jobs: - target: x86_64-pc-windows-gnu os: windows-latest rust: nightly-x86_64-gnu + - target: aarch64-pc-windows-gnu + os: windows-latest + rust: nightly steps: - name: Print runner information run: uname -a From 6ef61fd85a795ba688a383b018765f730a995c37 Mon Sep 17 00:00:00 2001 From: theKidOfArcrania Date: Mon, 13 May 2024 11:31:23 -0700 Subject: [PATCH 3/5] Update target --- library/compiler-builtins/.github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/compiler-builtins/.github/workflows/main.yml b/library/compiler-builtins/.github/workflows/main.yml index f1c63e4f93f7..7a799eaed5c8 100644 --- a/library/compiler-builtins/.github/workflows/main.yml +++ b/library/compiler-builtins/.github/workflows/main.yml @@ -83,7 +83,7 @@ jobs: - target: x86_64-pc-windows-gnu os: windows-latest rust: nightly-x86_64-gnu - - target: aarch64-pc-windows-gnu + - target: aarch64-pc-windows-msvc os: windows-latest rust: nightly steps: From 8c27bcb11acc4f505699521051111853354de5ed Mon Sep 17 00:00:00 2001 From: theKidOfArcrania Date: Mon, 13 May 2024 11:38:43 -0700 Subject: [PATCH 4/5] Maybe try arm64 --- library/compiler-builtins/.github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library/compiler-builtins/.github/workflows/main.yml b/library/compiler-builtins/.github/workflows/main.yml index 7a799eaed5c8..ba555387978f 100644 --- a/library/compiler-builtins/.github/workflows/main.yml +++ b/library/compiler-builtins/.github/workflows/main.yml @@ -15,6 +15,9 @@ jobs: - target: aarch64-unknown-linux-gnu os: ubuntu-latest rust: nightly + - target: aarch64-pc-windows-msvc + os: [windows-latest, arm64] + rust: nightly - target: arm-unknown-linux-gnueabi os: ubuntu-latest rust: nightly @@ -83,9 +86,6 @@ jobs: - target: x86_64-pc-windows-gnu os: windows-latest rust: nightly-x86_64-gnu - - target: aarch64-pc-windows-msvc - os: windows-latest - rust: nightly steps: - name: Print runner information run: uname -a From 4c35dc3b1e436750ad3a04c867bdb531db713193 Mon Sep 17 00:00:00 2001 From: theKidOfArcrania Date: Tue, 14 May 2024 15:47:07 -0700 Subject: [PATCH 5/5] Remove aarch64 CI --- library/compiler-builtins/.github/workflows/main.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/library/compiler-builtins/.github/workflows/main.yml b/library/compiler-builtins/.github/workflows/main.yml index ba555387978f..57497e050016 100644 --- a/library/compiler-builtins/.github/workflows/main.yml +++ b/library/compiler-builtins/.github/workflows/main.yml @@ -15,9 +15,6 @@ jobs: - target: aarch64-unknown-linux-gnu os: ubuntu-latest rust: nightly - - target: aarch64-pc-windows-msvc - os: [windows-latest, arm64] - rust: nightly - target: arm-unknown-linux-gnueabi os: ubuntu-latest rust: nightly