Skip to content

CI: Fix macOS errors #435

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

Merged
phil-opp merged 2 commits into from
Apr 26, 2024
Merged

CI: Fix macOS errors #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
074e17a
CI: Also test on x86_64-based `macos-12`
phil-opp Apr 26, 2024
a263358
Make the `entry_point` macro only available on `x86_64`
phil-opp Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-12, windows-latest, macos-latest]
runs-on: ${{ matrix.os }}
timeout-minutes: 30

Expand Down
2 changes: 2 additions & 0 deletions api/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ mod version_info {
/// `#[link_section = ".bootloader-config"]`, which instructs the Rust compiler to store it
/// in a special section of the resulting ELF executable. From there, the bootloader will
/// automatically read it when loading the kernel.
#[cfg(target_arch = "x86_64")]
#[macro_export]
macro_rules! entry_point {
($path:path) => {
Expand Down Expand Up @@ -139,6 +140,7 @@ macro_rules! entry_point {
}

#[doc(hidden)]
#[cfg(target_arch = "x86_64")]
pub fn __force_use(slice: &&[u8; BootloaderConfig::SERIALIZED_LEN]) {
let force_use = slice as *const _ as usize;
unsafe { core::arch::asm!("add {0}, 0", in(reg) force_use, options(nomem, nostack)) };
Expand Down