Merge pull request #105 from byeongkeunahn/fix-naked-align-incompat

Fix naked align incompat & macOS CI fail
boj-rs · Jul 31, 2024 · 629f697 · 629f697
2 parents cafaf26 + dcca7f0
commit 629f697
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -36,6 +36,7 @@ jobs:
       - name: Install System packages
         run: |
           brew update
+          brew upgrade
           brew install gcc
           rustup component add rust-src --toolchain nightly-aarch64-apple-darwin
       - name: Clippy

diff --git a/basm-std/src/platform/codegen.rs b/basm-std/src/platform/codegen.rs
@@ -252,7 +252,7 @@ pub extern "C" fn _basm_start() {
 #[cfg(target_arch = "aarch64")]
 #[no_mangle]
 #[naked]
-#[repr(align(8))]
+//#[repr(align(8))]
 pub unsafe extern "C" fn _basm_start() -> ! {
     asm!(
         "sub    sp, sp, #96",
@@ -288,7 +288,7 @@ fn _start_rust(platform_data: usize) -> i32 {
 
 #[no_mangle]
 #[naked]
-#[repr(align(4))]
+//#[repr(align(4))]
 #[cfg(all(target_arch = "x86_64", target_os = "windows"))]
 pub unsafe extern "win64" fn __chkstk() -> ! {
     asm!(