diff --git a/gas/ChangeLog b/gas/ChangeLog
index c589c091d74..56bdc8ac1ca 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-16  Paul Brook  <paul@codesourcery.com>
+
+	* config/tc-arm.c (thumb32_negate_data_op): Consistently use
+	unsigned int to avoid 64-bit host problems.
+
 2006-09-15  Bernd Schmidt  <bernd.schmidt@analog.com>
 
 	* config/bfin-parse.y (binary): Do some more constant folding for
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 19244d7d5c2..e8fe7cfb916 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -17236,11 +17236,11 @@ negate_data_op (unsigned long * instruction,
 /* Like negate_data_op, but for Thumb-2.   */
 
 static unsigned int
-thumb32_negate_data_op (offsetT *instruction, offsetT value)
+thumb32_negate_data_op (offsetT *instruction, unsigned int value)
 {
   int op, new_inst;
   int rd;
-  offsetT negated, inverted;
+  unsigned int negated, inverted;
 
   negated = encode_thumb32_immediate (-value);
   inverted = encode_thumb32_immediate (~value);
@@ -17301,7 +17301,7 @@ thumb32_negate_data_op (offsetT *instruction, offsetT value)
       return FAIL;
     }
 
-  if (value == FAIL)
+  if (value == (unsigned int)FAIL)
     return FAIL;
 
   *instruction &= T2_OPCODE_MASK;