diff --git a/gas/ChangeLog b/gas/ChangeLog
index 83f867c21c..0c5ba2ab43 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2009-09-15  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/tc-i386.c (offset_in_range): Sign extend offset only
+	if BFD64 is defined.
+
 2009-09-15  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/tc-i386-intel.c (i386_intel_operand): Initialize
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index e5ff75f18c..0e561e30a4 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -1766,9 +1766,9 @@ offset_in_range (offsetT val, int size)
   /* If BFD64, sign extend val for 32bit address mode.  */
   if (flag_code != CODE_64BIT
       || i.prefix[ADDR_PREFIX])
-#endif
     if ((val & ~(((addressT) 2 << 31) - 1)) == 0)
       val = (val ^ ((addressT) 1 << 31)) - ((addressT) 1 << 31);
+#endif
 
   if ((val & ~mask) != 0 && (val & ~mask) != ~mask)
     {