2010-07-22 Thomas Schwinge <thomas@codesourcery.com>

	Switch MIPS to 32-bit DWARF format.
	* config/tc-mips.h (DWARF2_FORMAT): Only define for [TE_IRIX].
	* config/tc-mips.c (mips_dwarf2_format): Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 8a2c3d8e94390d7ad5ac7a6fa41e7db0311c600e..5d543f9c436207210f088e6e5a0984e1a35407e4 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-22  Thomas Schwinge  <thomas@codesourcery.com>
+
+       Switch MIPS to 32-bit DWARF format.
+       * config/tc-mips.h (DWARF2_FORMAT): Only define for [TE_IRIX].
+       * config/tc-mips.c (mips_dwarf2_format): Likewise.
+
 2010-07-20  Alan Modra  <amodra@gmail.com>
 
        * config/tc-ppc.c (ppc_setup_opcodes): Add all macros for -many.

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 65ff6d416d700bdd7c460016a0f0cb24a343ac6f..21aedd9116e0bb5ef2feb07f912708f651fae7f6 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -15666,20 +15666,16 @@ MIPS options:\n\
 #endif
 }
 
+#ifdef TE_IRIX
 enum dwarf2_format
 mips_dwarf2_format (asection *sec ATTRIBUTE_UNUSED)
 {
   if (HAVE_64BIT_SYMBOLS)
-    {
-#ifdef TE_IRIX
-      return dwarf2_format_64bit_irix;
-#else
-      return dwarf2_format_64bit;
-#endif
-    }
+    return dwarf2_format_64bit_irix;
   else
     return dwarf2_format_32bit;
 }
+#endif
 
 int
 mips_dwarf2_addr_size (void)

diff --git a/gas/config/tc-mips.h b/gas/config/tc-mips.h
index 502fa8e3bf37765166ca1428c5c2528c71d54d89..8b174805d2b7e6a5c840ce218ddc32a560f7e618 100644 (file)
--- a/gas/config/tc-mips.h
+++ b/gas/config/tc-mips.h
@@ -162,9 +162,13 @@ extern void mips_emit_delays (void);
 extern void mips_enable_auto_align (void);
 #define md_elf_section_change_hook()   mips_enable_auto_align()
 
+#ifdef TE_IRIX
 enum dwarf2_format;
 extern enum dwarf2_format mips_dwarf2_format (asection *);
-#define DWARF2_FORMAT(SEC) mips_dwarf2_format (SEC)
+# define DWARF2_FORMAT(SEC) mips_dwarf2_format (SEC)
+#else
+/* Use GAS' defaults.  */
+#endif
 
 extern int mips_dwarf2_addr_size (void);
 #define DWARF2_ADDR_SIZE(bfd) mips_dwarf2_addr_size ()