Skip to content

Move over relevant changes from main #6

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

Open
wants to merge 2 commits into
base: wasix-0.2.155
Choose a base branch
from
Open

Move over relevant changes from main #6

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
7730093
Fix wasi platform
Arshia001 Aug 29, 2024
8ee88ce
Use the new __wasm_signal_impl function from wasix-libc
Arshia001 Aug 29, 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 src/wasi/wasi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pub type sigset_t = c_uchar;
pub type sigset_t = ::c_uchar;
12 changes: 6 additions & 6 deletions src/wasi/wasix.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,7 +960,7 @@ extern "C" {
old: *mut sigaction,
_external_handler: ::Option<unsafe extern "C" fn(::c_int)>,
) -> ::c_int;
fn __wasm_signal(signum: ::c_int);
fn __wasm_signal_impl(signum: ::c_int);
}

pub unsafe fn sigaction(sig: ::c_int, sa: *const sigaction, old: *mut sigaction) -> ::c_int {
Expand All @@ -975,11 +975,11 @@ extern "C" fn default_handler(sig: ::c_int) {
}
}

mod wasm_signal {
#[no_mangle]
extern "C" fn __wasm_signal(signum: ::c_int) {
unsafe { super::__wasm_signal(signum) };
}
// Export the __wasm_signal function, used for receiving
// signals from a WASIX runtime by wasix-libc
#[no_mangle]
extern "C" fn __wasm_signal(signum: ::c_int) {
unsafe { __wasm_signal_impl(signum) };
}

/// mocked functions that dont do anything in WASI land
Expand Down
Loading