2000-04-18 H.J. Lu (hjl@gnu.org)

	* config/tc-i386.c (offset_in_range): Use addressT instead of
	bfd_vma for none bfd assemblers.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index b756396b59a06412f2072d704b3ed74230ab0664..9bc15bb109f1ea7d68773b062786adfa8cda85f5 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2000-04-18  H.J. Lu  (hjl@gnu.org)
+
+       * config/tc-i386.c (offset_in_range): Use addressT instead of
+       bfd_vma for none bfd assemblers.
+
 2000-04-17  Alan Modra  <alan@linuxcare.com.au>
 
        * config/tc-i386.c (offset_in_range): Sign extend val so BFD64

diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 638bbd041459c95b562bb2d4e74b31d77ff2708e..f7e3c3485f7e525b6744b58c7e7db47da0a44458 100644 (file)
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -465,19 +465,19 @@ offset_in_range (val, size)
      offsetT val;
      int size;
 {
-  bfd_vma mask;
+  addressT mask;
 
   switch (size)
     {
-    case 1: mask = ((bfd_vma) 1 <<  8) - 1; break;
-    case 2: mask = ((bfd_vma) 1 << 16) - 1; break;
-    case 4: mask = ((bfd_vma) 1 << 32) - 1; break;
+    case 1: mask = ((addressT) 1 <<  8) - 1; break;
+    case 2: mask = ((addressT) 1 << 16) - 1; break;
+    case 4: mask = ((addressT) 1 << 32) - 1; break;
     default: abort();
     }
 
   /* If BFD64, sign extend val.  */
-  if ((val & ~ (((bfd_vma) 1 << 32) - 1)) == 0)
-    val = (val ^ ((bfd_vma) 1 << 31)) - ((bfd_vma) 1 << 31);
+  if ((val & ~ (((addressT) 1 << 32) - 1)) == 0)
+    val = (val ^ ((addressT) 1 << 31)) - ((addressT) 1 << 31);
 
   if ((val & ~ mask) != 0 && (val & ~ mask) != ~ mask)
     {