From f7da4a99d4105687052257a9e752a278a97c1964 Mon Sep 17 00:00:00 2001
From: Ken Raeburn <raeburn@cygnus>
Date: Wed, 12 Jul 1995 20:45:57 +0000
Subject: [PATCH] fix more compilation bugs

---
 gas/ChangeLog | 22 ++++++++++++++++++++++
 gas/write.c   |  5 +++--
 2 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 00ce8703af..a82e8f0ab8 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,25 @@
+Wed Jul 12 01:12:12 1995  Ken Raeburn  <raeburn@kr-pc.cygnus.com>
+
+	* write.c (fix_new): Use int, not short int, for argument type.
+	(fix_new_exp): Ditto.
+
+	* configure.in (arm-*-riscix*): Don't set emulations.
+
+	* config/tc-mips.c (NO_ECOFF_DEBUGGING): Define if ECOFF_DEBUGGING
+	wasn't previously defined.
+	(s_extern): Don't set ecoff_extern_size if NO_ECOFF_DEBUGGING.
+	(nopic_need_relax): Don't check it if NO_ECOFF_DEBUGGING.
+	(macro_build) [!USE_STDARG]: Don't use variadic prototype.
+	(mips_local_label) [NO_ECOFF_DEBUGGING]: Don't preserve potential
+	ECOFF debugging symbols.
+
+	* emul.h (struct emulation): Use unsigned, not unsigned char, for
+	bitfields.
+	* obj.h (struct format_ops): Likewise.
+
+	* config/tc-arm.c (symbol_make_empty) [BFD_ASSEMBLER]: Set
+	udata.p, not udata.
+
 Tue Jul 11 14:30:19 1995  Ian Lance Taylor  <ian@cygnus.com>
 
 	* doc/c-mips.texi: Document -m4010 and -mno-4010.
diff --git a/gas/write.c b/gas/write.c
index 702aaa20d4..8e5015b7a6 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -196,7 +196,7 @@ fixS *
 fix_new (frag, where, size, add_symbol, offset, pcrel, r_type)
      fragS *frag;		/* Which frag? */
      int where;			/* Where in that frag? */
-     short int size;		/* 1, 2, or 4 usually. */
+     int size;			/* 1, 2, or 4 usually. */
      symbolS *add_symbol;	/* X_add_symbol. */
      offsetT offset;		/* X_add_number. */
      int pcrel;			/* TRUE if PC-relative relocation. */
@@ -218,7 +218,7 @@ fixS *
 fix_new_exp (frag, where, size, exp, pcrel, r_type)
      fragS *frag;		/* Which frag? */
      int where;			/* Where in that frag? */
-     short int size;		/* 1, 2, or 4 usually. */
+     int size;			/* 1, 2, or 4 usually. */
      expressionS *exp;		/* Expression.  */
      int pcrel;			/* TRUE if PC-relative relocation. */
 #ifdef BFD_ASSEMBLER
@@ -2149,6 +2149,7 @@ fixup_segment (fixP, this_segment_type)
       
       if (sub_symbolP)
 	{
+	  resolve_symbol_value (sub_symbolP);
 	  if (!add_symbolP)
 	    {
 	      /* Its just -sym */