diff --git a/gas/ChangeLog b/gas/ChangeLog
index 10870bea8d..f216d868bc 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+2003-01-27  Alexandre Oliva  <aoliva@redhat.com>
+
+	* configure.in (em): Set to irix on all Irix systems.
+	* configure: Rebuilt.
+	* config/te-irix.h: New file.
+	* config/tc-mips.c (mips_dwarf2_format): Use TE_IRIX to decide
+	whether to use Irix-specific 64-bit format.
+
 2003-01-27  Martin Schwidefsky  <schwidefsky@de.ibm.com>
 
 	* config/tc-s390.c (s390_elf_cons): Avoid designated initializers.
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 2d5440ef85..446f95f4e6 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -14788,7 +14788,13 @@ enum dwarf2_format
 mips_dwarf2_format ()
 {
   if (mips_abi == N64_ABI)
-    return dwarf2_format_64bit_irix;
+    {
+#ifdef TE_IRIX
+      return dwarf2_format_64bit_irix;
+#else
+      return dwarf2_format_64bit;
+#endif
+    }
   else
     return dwarf2_format_32bit;
 }
diff --git a/gas/config/te-irix.h b/gas/config/te-irix.h
new file mode 100644
index 0000000000..49fa26179a
--- /dev/null
+++ b/gas/config/te-irix.h
@@ -0,0 +1,31 @@
+/* IRIX targets
+   Copyright 2002 Free Software Foundation, Inc.
+
+   This file is part of GAS, the GNU Assembler.
+
+   GAS is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   GAS is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GAS; see the file COPYING.  If not, write to the Free
+   Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.  */
+
+/* This file is te-irix.h and is intended to provide support for
+   IRIX targets.  Created by Alexandre Oliva <aoliva@redhat.com>.  */
+
+#define TE_IRIX 1
+
+/* these define interfaces */
+#ifdef OBJ_HEADER
+#include OBJ_HEADER
+#else
+#include "obj-format.h"
+#endif
diff --git a/gas/configure b/gas/configure
index 71b1142b0f..a4d0681b67 100755
--- a/gas/configure
+++ b/gas/configure
@@ -2515,9 +2515,9 @@ EOF
       mips-*-osf*)			fmt=ecoff endian=little ;;
       mips-*-ecoff*)			fmt=ecoff ;;
       mips-*-pe*)			fmt=coff endian=little em=pe ;;
-      mips-*-irix6*)			fmt=elf ;;
-      mips-*-irix5*)			fmt=elf ;;
-      mips-*-irix*)			fmt=ecoff ;;
+      mips-*-irix6*)			fmt=elf em=irix ;;
+      mips-*-irix5*)			fmt=elf em=irix ;;
+      mips-*-irix*)			fmt=ecoff em=irix ;;
       mips-*-lnews*)			fmt=ecoff em=lnews ;;
       mips-*-riscos*)			fmt=ecoff ;;
       mips*-*-linux*)			fmt=elf em=tmips ;;
diff --git a/gas/configure.in b/gas/configure.in
index 8f0d53114a..da336f85f5 100644
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -361,9 +361,9 @@ changequote([,])dnl
       mips-*-osf*)			fmt=ecoff endian=little ;;
       mips-*-ecoff*)			fmt=ecoff ;;
       mips-*-pe*)			fmt=coff endian=little em=pe ;;
-      mips-*-irix6*)			fmt=elf ;;
-      mips-*-irix5*)			fmt=elf ;;
-      mips-*-irix*)			fmt=ecoff ;;
+      mips-*-irix6*)			fmt=elf em=irix ;;
+      mips-*-irix5*)			fmt=elf em=irix ;;
+      mips-*-irix*)			fmt=ecoff em=irix ;;
       mips-*-lnews*)			fmt=ecoff em=lnews ;;
       mips-*-riscos*)			fmt=ecoff ;;
       mips*-*-linux*)			fmt=elf em=tmips ;;