* config/ho-irix.h: New file; if not gcc, define BROKEN_ASSERT.

	* configure.in (mips-sgi-irix*): Set gas_host to irix.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index ce9a9dbb000f214ebac0e31d4fc85a443466cbc1..252a19e8104cb4c9b58d6037d9b68832f8256aaf 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,8 @@
+Fri Apr  2 08:54:57 1993  Ian Lance Taylor  (ian@cygnus.com)
+
+       * config/ho-irix.h: New file; if not gcc, define BROKEN_ASSERT.
+       * configure.in (mips-sgi-irix*): Set gas_host to irix.
+
 Wed Mar 31 17:53:54 1993  Ian Lance Taylor  (ian@cygnus.com)
 
        * subsegs.c (subseg_new): Set output_section of new section.

diff --git a/gas/config/.Sanitize b/gas/config/.Sanitize
index 14a2476c15c9213dd758c52b357774a0317d419f..19e7a3bd842171af211a620eeff1b6922e03cc6b 100644 (file)
--- a/gas/config/.Sanitize
+++ b/gas/config/.Sanitize
@@ -44,6 +44,7 @@ ho-go32.h
 ho-hpux.h
 ho-i386.h
 ho-i386aix.h
+ho-irix.h
 ho-mipsbsd.h
 ho-rs6000.h
 ho-sun3.h

diff --git a/gas/config/ho-irix.h b/gas/config/ho-irix.h
new file mode 100644 (file)
index 0000000..cd7560f
--- /dev/null
+++ b/gas/config/ho-irix.h
@@ -0,0 +1,25 @@
+/* ho-irix.h  Irix host-specific header file.
+   Copyright (C) 1993 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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
+/* The assert.h macros don't work if the argument contains a newline.  */
+#ifndef __GNUC__
+#define BROKEN_ASSERT
+#endif
+
+/* end of ho-irix.h */

diff --git a/gas/configure.in b/gas/configure.in
index 3ce9d81b1cf6b54f1a08db4e337175fddc283659..9fbf0f870c1b48634f2e61e7415cd533f3d6ad43 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -50,6 +50,9 @@ case "${host}" in
   mips-*-bsd*)
     gas_host=mipsbsd
     ;;
+  mips-sgi-irix*)
+    gas_host=irix
+    ;;
   i[34]86-ibm-aix*)
     gas_host=i386aix
     ;;
@@ -258,7 +261,11 @@ links="host.h targ-cpu.c targ-cpu.h targ-env.h obj-format.h obj-format.c atof-ta
 
 case ${bfd_gas} in
   yes)
-    echo BFDDEF=-DBFD_ASSEMBLER >> Makefile
+    rm -f Makefile.tem
+    mv Makefile Makefile.tem
+    echo BFDDEF=-DBFD_ASSEMBLER > Makefile
+    cat Makefile.tem >> Makefile
+    rm -f Makefile.tem
     need_bfd=yes
     ;;
   *)
@@ -267,7 +274,11 @@ esac
 
 case ${need_bfd} in
   yes)
-    echo BFDLIB=../bfd/libbfd.a >> Makefile
+    rm -f Makefile.tem
+    mv Makefile Makefile.tem
+    echo BFDLIB=../bfd/libbfd.a > Makefile
+    cat Makefile.tem >> Makefile
+    rm -f Makefile.tem
     ;;
   *)
     ;;