diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cf31da6958bf..8f76145135a6 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2014-10-16  DJ Delorie  <dj@redhat.com>
 
+	* flag-types.h (sanitize_code): Don't assume targets have 32-bit
+	integers.
+
 	* config/rs6000/rs6000-c.c (rid_int128): New.
 	(rs6000_macro_to_expand): Use instead of RID_INT128.
 
diff --git a/gcc/flag-types.h b/gcc/flag-types.h
index 3d01c4981eb2..cacc1bfa7965 100644
--- a/gcc/flag-types.h
+++ b/gcc/flag-types.h
@@ -232,11 +232,11 @@ enum sanitize_code {
   SANITIZE_ENUM = 1 << 13,
   SANITIZE_FLOAT_DIVIDE = 1 << 14,
   SANITIZE_FLOAT_CAST = 1 << 15,
-  SANITIZE_BOUNDS = 1 << 16,
-  SANITIZE_ALIGNMENT = 1 << 17,
-  SANITIZE_NONNULL_ATTRIBUTE = 1 << 18,
-  SANITIZE_RETURNS_NONNULL_ATTRIBUTE = 1 << 19,
-  SANITIZE_OBJECT_SIZE = 1 << 20,
+  SANITIZE_BOUNDS = 1UL << 16,
+  SANITIZE_ALIGNMENT = 1UL << 17,
+  SANITIZE_NONNULL_ATTRIBUTE = 1UL << 18,
+  SANITIZE_RETURNS_NONNULL_ATTRIBUTE = 1UL << 19,
+  SANITIZE_OBJECT_SIZE = 1UL << 20,
   SANITIZE_UNDEFINED = SANITIZE_SHIFT | SANITIZE_DIVIDE | SANITIZE_UNREACHABLE
 		       | SANITIZE_VLA | SANITIZE_NULL | SANITIZE_RETURN
 		       | SANITIZE_SI_OVERFLOW | SANITIZE_BOOL | SANITIZE_ENUM