Skip to content

upgrade to emscripten 3.1.41 #3307

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

Closed
benjamin-sieffert wants to merge 7 commits into from
Closed

upgrade to emscripten 3.1.41 #3307

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8fd42b5
widen emscripten time_t to 64-bit
benjamin-sieffert Jul 21, 2023
7995907
docker emscripten tests passing
benjamin-sieffert Jul 21, 2023
2a6a0dc
update all outdated emscripten consts
benjamin-sieffert Jul 21, 2023
a2f1879
cleanup
benjamin-sieffert Jul 21, 2023
225eead
run cargo fmt in libc-test after all
benjamin-sieffert Jul 21, 2023
339dfd6
Merge remote-tracking branch 'upstream/main'
benjamin-sieffert Aug 21, 2023
54b5b6b
Merge remote-tracking branch 'upstream/main'
benjamin-sieffert Oct 9, 2023
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
Prev Previous commit
Next Next commit
update all outdated emscripten consts
  • Loading branch information
@benjamin-sieffert
benjamin-sieffert committed Jul 21, 2023
commit 2a6a0dc9ae3e654903d62778f954ade2602b78a6
13 changes: 2 additions & 11 deletions libc-test/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2759,17 +2759,8 @@ fn test_emscripten(target: &str) {
| "Q_SETQUOTA"
=> true,

// FIXME: These values have been changed
| "POSIX_MADV_DONTNEED" // to 4
| "RLIMIT_NLIMITS" // to 16
| "RLIM_NLIMITS" // to 16
| "IPPROTO_MAX" // to 263
| "F_GETLK" // to 5
| "F_SETLK" // to 6
| "F_SETLKW" // to 7
| "O_TMPFILE" // to 65
| "SIG_IGN" // -1
=> true,
// FIXME: https://github.com/emscripten-core/emscripten/pull/14883
"SIG_IGN" => true,

_ => false,
}
Expand Down
1 change: 1 addition & 0 deletions libc-test/semver/emscripten.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
getentropy
clock_gettime
16 changes: 8 additions & 8 deletions src/unix/linux_like/emscripten/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub type loff_t = i64;
pub type pthread_key_t = ::c_uint;

pub type clock_t = c_long;
// https://github.com/emscripten-core/emscripten/pull/17401
// 64-bit time_t since July 2022: https://github.com/emscripten-core/emscripten/pull/17401
pub type time_t = i64;
pub type suseconds_t = c_long;
pub type ino_t = u64;
Expand Down Expand Up @@ -1326,10 +1326,10 @@ pub const PTHREAD_STACK_MIN: ::size_t = 2048;
pub const POSIX_FADV_DONTNEED: ::c_int = 4;
pub const POSIX_FADV_NOREUSE: ::c_int = 5;

pub const POSIX_MADV_DONTNEED: ::c_int = 0;
pub const POSIX_MADV_DONTNEED: ::c_int = 4;

pub const RLIM_INFINITY: ::rlim_t = !0;
pub const RLIMIT_NLIMITS: ::c_int = 15;
pub const RLIMIT_NLIMITS: ::c_int = 16;
pub const RLIM_NLIMITS: ::c_int = RLIMIT_NLIMITS;

pub const MAP_ANONYMOUS: ::c_int = MAP_ANON;
Expand Down Expand Up @@ -1539,7 +1539,7 @@ pub const SOCK_STREAM: ::c_int = 1;
pub const SOCK_DGRAM: ::c_int = 2;
pub const SOCK_SEQPACKET: ::c_int = 5;

pub const IPPROTO_MAX: ::c_int = 256;
pub const IPPROTO_MAX: ::c_int = 263;

pub const SOL_SOCKET: ::c_int = 1;

Expand Down Expand Up @@ -1595,10 +1595,10 @@ pub const EXTPROC: ::tcflag_t = 0x00010000;

pub const MAP_HUGETLB: ::c_int = 0x040000;

pub const F_GETLK: ::c_int = 12;
pub const F_GETLK: ::c_int = 5;
pub const F_GETOWN: ::c_int = 9;
pub const F_SETLK: ::c_int = 13;
pub const F_SETLKW: ::c_int = 14;
pub const F_SETLK: ::c_int = 6;
pub const F_SETLKW: ::c_int = 7;
pub const F_SETOWN: ::c_int = 8;
pub const F_OFD_GETLK: ::c_int = 36;
pub const F_OFD_SETLK: ::c_int = 37;
Expand Down Expand Up @@ -1659,7 +1659,7 @@ pub const TIOCM_RNG: ::c_int = 0x080;
pub const TIOCM_DSR: ::c_int = 0x100;
pub const TIOCM_CD: ::c_int = TIOCM_CAR;
pub const TIOCM_RI: ::c_int = TIOCM_RNG;
pub const O_TMPFILE: ::c_int = 0x400000;
pub const O_TMPFILE: ::c_int = 0x410000;

pub const MAX_ADDR_LEN: usize = 7;
pub const ARPD_UPDATE: ::c_ushort = 0x01;
Expand Down