Merge from Chromium at DEPS revision r198571

This commit was generated by merge_to_master.py.

Change-Id: I44585d5d2c69fb28fb8907c2d5eb61016187472f

2 files changed, 2 insertions, 2 deletions

diff --git a/City.cpp b/City.cpp
index 4d70dd2..d7c33bc 100644
--- a/City.cpp
+++ b/City.cpp
@@ -351,7 +351,7 @@ uint128 CityHash128(const char *s, size_t len) {
   }
 }
 
-#ifdef __SSE4_2__
+#if defined(__SSE4_2__) && defined(__x86_64__)
 #include <nmmintrin.h>
 
 // Requires len >= 240.
diff --git a/City.h b/City.h
index fe2d3e2..c12c1bb 100644
--- a/City.h
+++ b/City.h
@@ -90,7 +90,7 @@ inline uint64 Hash128to64(const uint128& x) {
 
 // Conditionally include declarations for versions of City that require SSE4.2
 // instructions to be available.
-#ifdef __SSE4_2__
+#if defined(__SSE4_2__) && defined(__x86_64__)
 
 // Hash function for a byte array.
 uint128 CityHashCrc128(const char *s, size_t len);