2004-02-26 Eric Christopher <echristo@redhat.com>

	* config/tc-mips.c (mips_dwarf2_addr_size): New.
	* config/tc-mips.h (DWARF2_ADDR_SIZE): Use.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 12f03bf..60d17ae 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-26  Eric Christopher  <echristo@redhat.com>
+
+       * config/tc-mips.c (mips_dwarf2_addr_size): New.
+       * config/tc-mips.h (DWARF2_ADDR_SIZE): Use.
+
 2004-02-26  Andrew Stubbs <andrew.stubbs@superh.com>
 
        * config/tc-sh.c (build_Mytes): Add REG_N_D and REG_N_B01
@@ -198,7 +203,7 @@
 2004-01-11  Tom Rix   <tcrix@worldnet.att.net>
 
        * config/tc-m68hc11.c (build_indexed_byte): movb and movw cannot
-       be relaxed, use fixup. 
+       be relaxed, use fixup.
        (md_apply_fix3): Use 5 bit reloc from movb and movw fixup.
 
 2004-01-19  Jakub Jelinek  <jakub@redhat.com>
@@ -220,7 +225,7 @@
        * configure: Regenerate.
 
 2004-01-12  Anil Paranjpe  <anilp1@KPITCummins.com>
-       
+
        * config/tc-h8300.c (build_bytes): Apply relaxation to bit
        manipulation insns.
 

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 66f52b0..beaa11a 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -14419,3 +14419,16 @@ mips_dwarf2_format (void)
   else
     return dwarf2_format_32bit;
 }
+
+int
+mips_dwarf2_addr_size (void)
+{
+  if (mips_abi == N64_ABI)
+    return 8;
+  /* GCC for 64-bit targets turns on mlong64 giving
+     us 64-bit addresses.  */
+  else if (mips_abi == EABI_ABI && !file_mips_gp32)
+    return 8;
+  else
+    return 4;
+}

diff --git a/gas/config/tc-mips.h b/gas/config/tc-mips.h
index 110dc09..46a7653 100644 (file)
--- a/gas/config/tc-mips.h
+++ b/gas/config/tc-mips.h
@@ -183,7 +183,6 @@ extern void mips_enable_auto_align (void);
 extern enum dwarf2_format mips_dwarf2_format (void);
 #define DWARF2_FORMAT() mips_dwarf2_format ()
 
-#define DWARF2_ADDR_SIZE(bfd) \
-  (DWARF2_FORMAT () == dwarf2_format_32bit ? 4 : 8)
+#define DWARF2_ADDR_SIZE(bfd) mips_dwarf2_addr_size ()
 
 #endif /* TC_MIPS */