Skip to content

Commit 20ab682

Browse files
committed
Auto merge of #1478 - tlively:update-emscripten-types, r=<try>
Update Emscripten system types These changes bring the types up to parity with recent Emscripten versions using the upstream LLVM wasm backend. These changes should be coordinated with the upgrade of rustc's Emscripten support. See https://internals.rust-lang.org/t/upgrading-rust-s-emscripten-support/10684
2 parents 3875052 + d3c7de8 commit 20ab682

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

ci/emscripten.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ curl --retry 5 -L https://s3.amazonaws.com/mozilla-games/emscripten/releases/ems
3434

3535
cd /emsdk-portable
3636
./emsdk update
37-
hide_output ./emsdk install sdk-1.38.15-64bit
38-
./emsdk activate sdk-1.38.15-64bit
37+
hide_output ./emsdk install 1.38.37
38+
./emsdk activate 1.38.37
3939

4040
# Compile and cache libc
4141
# shellcheck disable=SC1091
@@ -53,4 +53,3 @@ chmod a+rxw -R /emsdk-portable
5353
cd /
5454
curl --retry 5 -L https://nodejs.org/dist/v12.3.1/node-v12.3.1-linux-x64.tar.xz | \
5555
tar -xJ
56-

src/unix/linux_like/emscripten/mod.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ pub type dev_t = u32;
55
pub type socklen_t = u32;
66
pub type pthread_t = c_ulong;
77
pub type mode_t = u32;
8-
pub type ino64_t = u32;
9-
pub type off64_t = i32;
8+
pub type ino64_t = u64;
9+
pub type off64_t = i64;
1010
pub type blkcnt64_t = i32;
1111
pub type rlim64_t = u64;
1212
pub type shmatt_t = ::c_ulong;
@@ -16,14 +16,14 @@ pub type msglen_t = ::c_ulong;
1616
pub type nfds_t = ::c_ulong;
1717
pub type nl_item = ::c_int;
1818
pub type idtype_t = ::c_uint;
19-
pub type loff_t = i32;
19+
pub type loff_t = i64;
2020
pub type pthread_key_t = ::c_uint;
2121

2222
pub type clock_t = c_long;
2323
pub type time_t = c_long;
2424
pub type suseconds_t = c_long;
2525
pub type ino_t = u32;
26-
pub type off_t = i32;
26+
pub type off_t = i64;
2727
pub type blkcnt_t = i32;
2828

2929
pub type blksize_t = c_long;

0 commit comments

Comments
 (0)