From 695165feac9337806c135eda537b40a86333314c Mon Sep 17 00:00:00 2001
From: Jonathan Bastien-Filiatrault <jonathan@zerospam.ca>
Date: Fri, 20 Sep 2019 16:25:49 -0400
Subject: [PATCH] timer: 32 bit ARM only has 32 bit atomics. (#1581)

---
 ci/azure-cross-compile.yml | 3 +++
 tokio-timer/src/atomic.rs  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ci/azure-cross-compile.yml b/ci/azure-cross-compile.yml
index f0e83f031..cd53474a5 100644
--- a/ci/azure-cross-compile.yml
+++ b/ci/azure-cross-compile.yml
@@ -15,6 +15,9 @@ jobs:
       mips:
         vmImage: ubuntu-16.04
         target: mips-unknown-linux-gnu
+      arm:
+        vmImage: ubuntu-16.04
+        target: arm-unknown-linux-gnueabi
   pool:
     vmImage: $(vmImage)
   steps:
diff --git a/tokio-timer/src/atomic.rs b/tokio-timer/src/atomic.rs
index 6a592edb4..e051c8560 100644
--- a/tokio-timer/src/atomic.rs
+++ b/tokio-timer/src/atomic.rs
@@ -7,12 +7,12 @@ pub(crate) use self::imp::AtomicU64;
 // `AtomicU64` can only be used on targets with `target_has_atomic` is 64 or greater.
 // Once `cfg_target_has_atomic` feature is stable, we can replace it with
 // `#[cfg(target_has_atomic = "64")]`.
-#[cfg(not(any(target_arch = "mips", target_arch = "powerpc")))]
+#[cfg(not(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc")))]
 mod imp {
     pub(crate) use std::sync::atomic::AtomicU64;
 }
 
-#[cfg(any(target_arch = "mips", target_arch = "powerpc"))]
+#[cfg(any(target_arch = "arm", target_arch = "mips", target_arch = "powerpc"))]
 mod imp {
     use std::sync::atomic::Ordering;
     use std::sync::Mutex;