Skip to content

Add more WASI libc bindings #1325

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
merged 14 commits into from
Apr 25, 2019
Merged

Add more WASI libc bindings #1325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
58ba812
Add more WASI libc bindings.
sunfishcode Apr 19, 2019
1168782
Define WASI libc errno constants.
sunfishcode Apr 19, 2019
3aa0188
Add headers for WASI to libc-test/build.rs
sunfishcode Apr 19, 2019
30ed983
Recognize WASI as either a target_env or a target_os.
sunfishcode Apr 19, 2019
49c0dc9
Don't add "struct" to "DIR" or "fd_set".
sunfishcode Apr 19, 2019
6b524b3
Don't make opaque types like FILE and DIR copyable.
sunfishcode Apr 19, 2019
a625c69
Make FD_ISSET's argument a pointer to const, to match the libc declar…
sunfishcode Apr 19, 2019
ef7ae73
Fix dirent to match WASI libc's definition.
sunfishcode Apr 19, 2019
8a5b230
Update to the latest wasi-sysroot.
sunfishcode Apr 24, 2019
edd541e
Remove FD_SET and related functions for now.
sunfishcode Apr 24, 2019
4d0e84b
Use the WASI layout for fd_set.
sunfishcode Apr 24, 2019
7ba5e34
Remove the definition of ULONG_SIZE which is no longer needed.
sunfishcode Apr 24, 2019
599c0f7
Remove fd_set, select, and pselect entirely for now.
sunfishcode Apr 24, 2019
13ddc16
Remove utsname and uname for now too.
sunfishcode Apr 24, 2019
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 ci/docker/wasm32-unknown-wasi/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN mv /clang+llvm-8.0.0-x86_64-linux-gnu-ubuntu-18.04 /wasmcc
# those breaking changes on `libc`'s own CI
RUN git clone https://github.com/CraneStation/wasi-sysroot && \
cd wasi-sysroot && \
git reset --hard e5f14be38362f1ab83302895a6e74b2ffd0e2302
git reset --hard 2201343c17b7149a75f543f523bea0c3243c6091
RUN make -C wasi-sysroot install -j $(nproc) WASM_CC=/wasmcc/bin/clang INSTALL_DIR=/wasi-sysroot

# This is a small wrapper script which executes the actual clang binary in
Expand Down
17 changes: 16 additions & 1 deletion libc-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1875,17 +1875,28 @@ fn test_wasi(target: &str) {
cfg.define("_GNU_SOURCE", None);

headers! { cfg:
"ctype.h",
"dirent.h",
"errno.h",
"fcntl.h",
"limits.h",
"locale.h",
"malloc.h",
"poll.h",
"stdbool.h",
"stddef.h",
"stdint.h",
"stdio.h",
"stdlib.h",
"string.h",
"sys/resource.h",
"sys/select.h",
"sys/socket.h",
"sys/stat.h",
"sys/times.h",
"sys/types.h",
"sys/uio.h",
"sys/utsname.h",
"time.h",
"unistd.h",
"wasi/core.h",
Expand All @@ -1895,7 +1906,7 @@ fn test_wasi(target: &str) {
}

cfg.type_name(move |ty, is_struct, is_union| match ty {
"FILE" => ty.to_string(),
"FILE" | "fd_set" | "DIR" => ty.to_string(),
t if is_union => format!("union {}", t),
t if t.starts_with("__wasi") && t.ends_with("_u") => {
format!("union {}", t)
Expand All @@ -1920,5 +1931,9 @@ fn test_wasi(target: &str) {
// import the same thing but have different function pointers
cfg.skip_fn_ptrcheck(|f| f.starts_with("__wasi"));

// d_name is declared as a flexible array in WASI libc, so it
// doesn't support sizeof.
cfg.skip_field(|s, field| s == "dirent" && field == "d_name");

cfg.generate("../src/lib.rs", "main.rs");
}
2 changes: 1 addition & 1 deletion src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ cfg_if! {
} else if #[cfg(all(target_env = "sgx", target_vendor = "fortanix"))] {
mod sgx;
pub use sgx::*;
} else if #[cfg(target_env = "wasi")] {
} else if #[cfg(any(target_env = "wasi", target_os = "wasi"))] {
mod wasi;
pub use wasi::*;
} else {
Expand Down
Loading