x32.patch

   1 --- rustc-1.25.0-src/src/vendor/parking_lot_core/src/thread_parker/linux.rs~    2018-03-25 17:53:26.000000000 +0200
   2 +++ rustc-1.25.0-src/src/vendor/parking_lot_core/src/thread_parker/linux.rs     2018-04-01 10:17:03.297595480 +0200
   3 @@ -68,7 +68,7 @@
   4              }
   5              let ts = libc::timespec {
   6                  tv_sec: diff.as_secs() as libc::time_t,
   7 -                tv_nsec: diff.subsec_nanos() as libc::c_long,
   8 +                tv_nsec: diff.subsec_nanos() as libc::c_longlong,
   9              };
  10              let r = libc::syscall(libc::SYS_futex, &self.futex, FUTEX_WAIT | FUTEX_PRIVATE, 1, &ts);
  11              debug_assert!(r == 0 || r == -1);
  12 --- rustc-1.25.0-src/src/vendor/parking_lot/src/elision.rs~     2018-03-25 17:53:25.000000000 +0200
  13 +++ rustc-1.25.0-src/src/vendor/parking_lot/src/elision.rs      2018-04-01 10:23:02.095389442 +0200
  14 @@ -101,7 +101,7 @@
  15      fn elision_acquire(&self, current: usize, new: usize) -> Result<usize, usize> {
  16          unsafe {
  17              let prev: usize;
  18 -            asm!("xacquire; lock; cmpxchgq $2, $1"
  19 +            asm!("xacquire; lock; cmpxchg $2, $1"
  20                   : "={rax}" (prev), "+*m" (self)
  21                   : "r" (new), "{rax}" (current)
  22                   : "memory"
  23 @@ -118,7 +118,7 @@
  24      fn elision_release(&self, current: usize, new: usize) -> Result<usize, usize> {
  25          unsafe {
  26              let prev: usize;
  27 -            asm!("xrelease; lock; cmpxchgq $2, $1"
  28 +            asm!("xrelease; lock; cmpxchg $2, $1"
  29                   : "={rax}" (prev), "+*m" (self)
  30                   : "r" (new), "{rax}" (current)
  31                   : "memory"
  32 --- rustc-1.25.0-src/src/vendor/filetime/src/unix/mod.rs~       2018-03-25 17:53:25.000000000 +0200
  33 +++ rustc-1.25.0-src/src/vendor/filetime/src/unix/mod.rs        2018-04-01 23:34:09.811654820 +0200
  34 @@ -72,7 +72,7 @@
  35      fn to_timespec(ft: &FileTime) -> timespec {
  36          timespec {
  37              tv_sec: ft.seconds() as time_t,
  38 -            tv_nsec: ft.nanoseconds() as c_long,
  39 +            tv_nsec: ft.nanoseconds() as libc::c_longlong,
  40          }
  41      }
  42  }
  43 --- rustc-1.25.0-src/src/vendor/time/src/sys.rs~        2018-03-25 17:53:24.000000000 +0200
  44 +++ rustc-1.25.0-src/src/vendor/time/src/sys.rs 2018-04-01 23:40:21.243254373 +0200
  45 @@ -491,13 +491,13 @@
  46                  let nanoseconds = other - Duration::seconds(seconds);
  47                  let nanoseconds = nanoseconds.num_nanoseconds().unwrap();
  48                  self.t.tv_sec += seconds as libc::time_t;
  49 -                self.t.tv_nsec += nanoseconds as libc::c_long;
  50 -                if self.t.tv_nsec >= ::NSEC_PER_SEC as libc::c_long {
  51 -                    self.t.tv_nsec -= ::NSEC_PER_SEC as libc::c_long;
  52 +                self.t.tv_nsec += nanoseconds as libc::c_longlong;
  53 +                if self.t.tv_nsec >= ::NSEC_PER_SEC as libc::c_longlong {
  54 +                    self.t.tv_nsec -= ::NSEC_PER_SEC as libc::c_longlong;
  55                      self.t.tv_sec += 1;
  56                  } else if self.t.tv_nsec < 0 {
  57                      self.t.tv_sec -= 1;
  58 -                    self.t.tv_nsec += ::NSEC_PER_SEC as libc::c_long;
  59 +                    self.t.tv_nsec += ::NSEC_PER_SEC as libc::c_longlong;
  60                  }
  61                  self
  62              }