make it compile on rs6k: declare free, disable assertions, don't define M_RS6000

diff --git a/gas/ChangeLog b/gas/ChangeLog
index e1026b79de8cdc256f6ac842d67cbe95cdf5bac1..85e6698853ef2b5217c7c437d5780ea462be7a35 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,11 @@
+Thu Aug 13 13:53:19 1992  Ken Raeburn  (raeburn@cygnus.com)
+
+       * as.h [BROKEN_ASSERT]: If defined, turn off all assertion checks.
+
+       * config/ho-rs6000.h (M_RS6000): Don't define it.
+       (free): Declare it.
+       (BROKEN_ASSERT): Define it if not __STDC__.
+
 Thu Aug  6 12:10:39 1992  Steve Chamberlain  (sac@thepub.cygnus.com)
 
        * read.c (s_fill): make the .fill size clamped error a warn and
@@ -26,8 +34,6 @@ Fri Jul 31 21:53:28 1992  Ken Raeburn  (raeburn@cygnus.com)
        characteristics have been), default to 68020.  Don't need extra
        quotes around error string.
 
-
-
 Fri Jul 31 12:26:34 1992  Jim Wilson  (wilson@sphagnum.cygnus.com)
 
        * read.c (potable): Revert sac's incorrect change made Jul 13.

diff --git a/gas/as.h b/gas/as.h
index ca65a0bf8dd1cc4a71a22f3a41431e8e656670d6..9787f211d12afd776e3cf40a7b49551979d24093 100644 (file)
--- a/gas/as.h
+++ b/gas/as.h
@@ -91,6 +91,12 @@
 /* COMMON now defined */
 #define DEBUG /* temporary */
 
+#ifdef BROKEN_ASSERT
+/* turn off all assertion checks */
+#undef DEBUG
+#define NDEBUG
+#endif
+
 #ifdef DEBUG
 #undef NDEBUG
 #ifndef know
@@ -141,6 +147,7 @@
 
 
 #ifdef MANY_SEGMENTS
+#include "bfd.h"
 #define N_SEGMENTS 10
 #define SEG_NORMAL(x) ((x) >= SEG_E0 && (x) <= SEG_E9)
 #define SEG_LIST SEG_E0,SEG_E1,SEG_E2,SEG_E3,SEG_E4,SEG_E5,SEG_E6,SEG_E7,SEG_E8,SEG_E9

diff --git a/gas/config/ho-rs6000.h b/gas/config/ho-rs6000.h
index fe57e8e3cd9edfc5a05fdabba3d56994a76db748..614914cc5ca60c36020f627a9a831f890d713156 100644 (file)
--- a/gas/config/ho-rs6000.h
+++ b/gas/config/ho-rs6000.h
@@ -17,6 +17,18 @@
    along with GAS; see the file COPYING.  If not, write to
    the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
-#define M_RS6000 1
+/* M_RS6000 is used in aout_gnu.h as an enumerator.
+   Nothing tests for the macro being defined, so don't bother defining it.  */
+/* #define M_RS6000 1 */
+
+/* The assert.h macros assume that cpp DTRT when substituting for
+   a macro argument inside a string, including requoting.  The non-STDC
+   cpp on the rs6k botches the requoting.  (Many non-STDC cpps do, but
+   the assert.h here relies on it working.)  */
+#ifndef __STDC__
+#define BROKEN_ASSERT
+#endif
+
+extern void free ();
 
 /* end of ho-rs6000.h */