diff --git a/gas/ChangeLog b/gas/ChangeLog
index 784ca765e0..cd86a5d2aa 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-11  Daniel Jacobowitz  <dan@codesourcery.com>
+
+	* config/tc-mips.c (mips_dwarf2_format, mips_dwarf2_addr_size): Use
+	HAVE_64BIT_SYMBOLS.
+
 2007-07-04  Richard Sandiford  <richard@codesourcery.com>
 
 	* config/tc-mips.c (mips_cpu_info_table): Add new entries for
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 42626ab630..8c071fb2ef 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -15104,7 +15104,7 @@ MIPS options:\n\
 enum dwarf2_format
 mips_dwarf2_format (void)
 {
-  if (mips_abi == N64_ABI)
+  if (HAVE_64BIT_SYMBOLS)
     {
 #ifdef TE_IRIX
       return dwarf2_format_64bit_irix;
@@ -15119,7 +15119,7 @@ mips_dwarf2_format (void)
 int
 mips_dwarf2_addr_size (void)
 {
-  if (mips_abi == N64_ABI)
+  if (HAVE_64BIT_SYMBOLS)
     return 8;
   else
     return 4;