diff --git a/gas/ChangeLog b/gas/ChangeLog
index e425bd43aaa..2d11c7d792a 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-04  Nick Clifton  <nickc@redhat.com>
+
+	* config/tc-i386.c (tc_x86_regname_to_dw2regnum): Use ARRAY_SIZE
+	macro to compute size of selected register name array.
+
 2003-07-01  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* config/tc-s390.c (md_parse_option): Add cpu type z990.
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 22db238649a..da747e3332f 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -6366,12 +6366,12 @@ tc_x86_regname_to_dw2regnum (const char *regname)
   if (flag_code == CODE_64BIT)
     {
       regnames = regnames_64;
-      regnames_count = sizeof (regnames_64);
+      regnames_count = ARRAY_SIZE (regnames_64);
     }
   else
     {
       regnames = regnames_32;
-      regnames_count = sizeof (regnames_32);
+      regnames_count = ARRAY_SIZE (regnames_32);
     }
 
   for (regnum = 0; regnum < regnames_count; regnum++)