diff options
| author | bors <bors@rust-lang.org> | 2015-08-25 03:04:30 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-08-25 03:04:30 +0000 |
| commit | 19aadd51a89f8d6f706e1eabd746039a748fa9e6 (patch) | |
| tree | 5a5a5e4b99b46366e41a3870f0ff86beb677b0d1 /src/libstd | |
| parent | fd7344c4fea081657fff75b9bd112adb22839890 (diff) | |
| parent | 6887d8cdabbba06b55c2c27206e10d6f0099eee8 (diff) | |
| download | rust-19aadd51a89f8d6f706e1eabd746039a748fa9e6.tar.gz rust-19aadd51a89f8d6f706e1eabd746039a748fa9e6.zip | |
Auto merge of #27957 - overminder:aug23-i686-android, r=alexcrichton
- All the libstd tests are passing in the optimized build against a Zenfone2 and the x86 Android emulator. I haven't tested the other libraries though.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/os/android/raw.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/os/android/raw.rs b/src/libstd/os/android/raw.rs index e5e89ad800a..cad80c55140 100644 --- a/src/libstd/os/android/raw.rs +++ b/src/libstd/os/android/raw.rs @@ -15,7 +15,7 @@ #[doc(inline)] pub use self::arch::{dev_t, mode_t, blkcnt_t, blksize_t, ino_t, nlink_t, off_t, stat, time_t}; -#[cfg(target_arch = "arm")] +#[cfg(any(target_arch = "arm", target_arch = "x86"))] mod arch { use os::raw::{c_uint, c_uchar, c_ulonglong, c_longlong, c_ulong}; use os::unix::raw::{uid_t, gid_t}; @@ -150,3 +150,4 @@ mod arch { pub st_ino: ino_t, } } + |