[wasi-common]: add armv7 support to wasi-common (#1269)

* Add armv7 support to wasi-common

This commit enables `target_pointer_width = 32` compatibility for
`wasi-common` (and by transitivity, any crate found inside, e.g., `yanix`).
I've also added a simplistic (bare minimum) check to our CI to ensure
that `wasi-common` cross-compiles to `armv7-unknown-gnueabihf` fine.
While here, I've done the same for `wasm32-unknown-emscripten`.

* Clean arch-specific impls + reuse libc consts

* Make SeekLoc::from_raw platform independent

* Collapse CI cc jobs into one

crates/wasi-common/yanix/src/sys/bsd/dir.rs

@@ -57,10 +57,3 @@ impl EntryExt for Entry {
         Ok(self.0.loc)
     }
 }
-
-impl SeekLoc {
-    pub unsafe fn from_raw(loc: i64) -> Result<Self> {
-        let loc = loc.into();
-        Ok(Self(loc))
-    }
-}

crates/wasi-common/yanix/src/sys/bsd/filetime.rs

@@ -2,34 +2,11 @@
 //! with setting the file times specific to BSD-style *nixes.
 use crate::filetime::FileTime;
 use crate::from_success_code;
-use cfg_if::cfg_if;
 use std::ffi::CStr;
 use std::fs::File;
 use std::io::Result;
 use std::sync::atomic::{AtomicUsize, Ordering::SeqCst};
 
-cfg_if! {
-    if #[cfg(any(
-            target_os = "macos",
-            target_os = "freebsd",
-            target_os = "ios",
-            target_os = "dragonfly"
-    ))] {
-        pub(crate) const UTIME_NOW: i64 = -1;
-        pub(crate) const UTIME_OMIT: i64 = -2;
-    } else if #[cfg(target_os = "openbsd")] {
-        // These are swapped compared to macos, freebsd, ios, and dragonfly.
-        // https://github.com/openbsd/src/blob/master/sys/sys/stat.h#L187
-        pub(crate) const UTIME_NOW: i64 = -2;
-        pub(crate) const UTIME_OMIT: i64 = -1;
-    } else if #[cfg(target_os = "netbsd" )] {
-        // These are the same as for Linux.
-        // http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/stat.h?rev=1.69&content-type=text/x-cvsweb-markup&only_with_tag=MAIN
-        pub(crate) const UTIME_NOW: i64 = 1_073_741_823;
-        pub(crate) const UTIME_OMIT: i64 = 1_073_741_822;
-    }
-}
-
 /// Wrapper for `utimensat` syscall, however, with an added twist such that `utimensat` symbol
 /// is firstly resolved (i.e., we check whether it exists on the host), and only used if that is
 /// the case. Otherwise, the syscall resorts to a less accurate `utimesat` emulated syscall.

crates/wasi-common/yanix/src/sys/emscripten/filetime.rs

@@ -5,9 +5,6 @@ use crate::from_success_code;
 use std::fs::File;
 use std::io::Result;
 
-pub(crate) const UTIME_NOW: i32 = 1_073_741_823;
-pub(crate) const UTIME_OMIT: i32 = 1_073_741_822;
-
 /// Wrapper for `utimensat` syscall. In Emscripten, there is no point in dynamically resolving
 /// if `utimensat` is available as it always was and will be.
 pub fn utimensat(

crates/wasi-common/yanix/src/sys/emscripten/mod.rs

@@ -5,21 +5,3 @@ pub(crate) mod fadvise;
 #[path = "../linux/file.rs"]
 pub(crate) mod file;
 pub(crate) mod filetime;
-
-use crate::dir::SeekLoc;
-use std::convert::TryInto;
-use std::io::{Error, Result};
-
-impl SeekLoc {
-    pub unsafe fn from_raw(loc: i64) -> Result<Self> {
-        // The cookie (or `loc`) is an opaque value, and applications aren't supposed to do
-        // arithmetic on them or pick their own values or have any awareness of the numeric
-        // range of the values. They're just supposed to pass back in the values that we
-        // give them. And any value we give them will be convertable back to `long`,
-        // because that's the type the OS gives them to us in. So return an `EINVAL`.
-        let loc = loc
-            .try_into()
-            .map_err(|_| Error::from_raw_os_error(libc::EINVAL))?;
-        Ok(Self(loc))
-    }
-}

crates/wasi-common/yanix/src/sys/linux/filetime.rs

@@ -6,9 +6,6 @@ use std::fs::File;
 use std::io::Result;
 use std::sync::atomic::{AtomicBool, Ordering::Relaxed};
 
-pub(crate) const UTIME_NOW: i64 = 1_073_741_823;
-pub(crate) const UTIME_OMIT: i64 = 1_073_741_822;
-
 /// Wrapper for `utimensat` syscall, however, with an added twist such that `utimensat` symbol
 /// is firstly resolved (i.e., we check whether it exists on the host), and only used if that is
 /// the case. Otherwise, the syscall resorts to a less accurate `utimesat` emulated syscall.

crates/wasi-common/yanix/src/sys/linux/mod.rs

@@ -3,13 +3,3 @@ pub(crate) mod fadvise;
 pub(crate) mod file;
 pub(crate) mod filetime;
 pub(crate) mod utimesat;
-
-use crate::dir::SeekLoc;
-use std::io::Result;
-
-impl SeekLoc {
-    pub unsafe fn from_raw(loc: i64) -> Result<Self> {
-        let loc = loc.into();
-        Ok(Self(loc))
-    }
-}

crates/wasi-common/yanix/src/sys/linux/utimesat.rs

@@ -1,4 +1,5 @@
 use crate::filetime::FileTime;
+use crate::filetime::FileTimeExt;
 use crate::from_success_code;
 use std::fs;
 use std::io::Result;
@@ -26,19 +27,16 @@ pub fn utimesat(
     let fd = unsafe { libc::openat(dirfd.as_raw_fd(), p.as_ptr(), flags) };
     let f = unsafe { fs::File::from_raw_fd(fd) };
     let (atime, mtime) = get_times(atime, mtime, || f.metadata().map_err(Into::into))?;
-    let times = [to_timeval(atime), to_timeval(mtime)];
+    let times = [to_timeval(atime)?, to_timeval(mtime)?];
     from_success_code(unsafe { libc::futimes(f.as_raw_fd(), times.as_ptr()) })
 }
 
-/// Converts `filetime::FileTime` to `libc::timeval`. This function was taken directly from
-/// [filetime] crate.
-///
-/// [filetime]: https://github.com/alexcrichton/filetime/blob/master/src/unix/utimes.rs#L93
-fn to_timeval(ft: filetime::FileTime) -> libc::timeval {
-    libc::timeval {
-        tv_sec: ft.seconds(),
-        tv_usec: (ft.nanoseconds() / 1000) as libc::suseconds_t,
-    }
+/// Converts `filetime::FileTime` to `libc::timeval`.
+fn to_timeval(ft: filetime::FileTime) -> Result<libc::timeval> {
+    Ok(libc::timeval {
+        tv_sec: ft.seconds_()?,
+        tv_usec: (ft.nanoseconds_() / 1000) as libc::suseconds_t,
+    })
 }
 
 /// For a provided pair of access and modified `FileTime`s, converts the input to