From 961815e432a36e08f4e599fcc2412a27fc9f1b87 Mon Sep 17 00:00:00 2001
From: Michael Tiemann <tiemann@cygnus>
Date: Sun, 1 Mar 1992 12:45:17 +0000
Subject: [PATCH] Make the declarations of fix_new consistent under __STDC__. 
 It might be better to #define NEED_FX_R_TYPE in TC_A29K and TC_SPARC instead
 of having this complicated conditional, but that's not my call.

---
 gas/write.c | 12 ++++++++----
 gas/write.h |  9 ++++++---
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/gas/write.c b/gas/write.c
index 71004474..8f9a574 100644
--- a/gas/write.c
+++ b/gas/write.c
@@ -75,7 +75,11 @@ void relax_segment();
  *
  * Create a fixS in obstack 'notes'.
  */
-fixS *fix_new(frag, where, size, add_symbol, sub_symbol, offset, pcrel, r_type)
+fixS *fix_new(frag, where, size, add_symbol, sub_symbol, offset, pcrel
+#if defined(TC_SPARC) || defined(TC_A29K) || defined(NEED_FX_R_TYPE)
+	      , r_type
+#endif
+	      )
 fragS *frag;		/* Which frag? */
 int where;		/* Where in that frag? */
 short int size;		/* 1, 2, or 4 usually. */
@@ -83,7 +87,7 @@ symbolS *add_symbol;	/* X_add_symbol. */
 symbolS *sub_symbol;	/* X_subtract_symbol. */
 long offset;		/* X_add_number. */
 int pcrel;		/* TRUE if PC-relative relocation. */
-#if defined(TC_SPARC) || defined(TC_A29K)
+#if defined(TC_SPARC) || defined(TC_A29K) || defined(NEED_FX_R_TYPE)
 int 	r_type;	/* Relocation type */
 #endif
 {
@@ -98,7 +102,7 @@ int 	r_type;	/* Relocation type */
 	fixP->fx_subsy	= sub_symbol;
 	fixP->fx_offset	= offset;
 	fixP->fx_pcrel	= pcrel;
-#if defined(TC_SPARC) || defined(TC_A29K)
+#if defined(TC_SPARC) || defined(TC_A29K) || defined( NEED_FX_R_TYPE)
 	fixP->fx_r_type	= r_type;
 #endif
 	/* JF these 'cuz of the NS32K stuff */
@@ -384,7 +388,7 @@ void write_object_file()
 					  lie->sub,
 					  lie->addnum,
 					  0, 0, 2, 0, 0);
-#elif defined(TC_SPARC) || defined(TC_A29K)
+#elif defined(TC_SPARC) || defined(TC_A29K) || defined(NEED_FX_R_TYPE)
 			    fix_new(	lie->frag,  lie->word_goes_here - lie->frag->fr_literal,
 				    2,  lie->add,
 				    lie->sub,  lie->addnum,
diff --git a/gas/write.h b/gas/write.h
index 9ce6529..0b47dcb 100644
--- a/gas/write.h
+++ b/gas/write.h
@@ -54,7 +54,7 @@ struct fix {
 	char fx_im_disp;	   /* TRUE: value is a displacement */
 	bit_fixS *fx_bit_fixP;	   /* IF NULL no bitfix's to do */  
 	char fx_bsr;		   /* sequent-hack */
-#if defined(TC_SPARC) || defined(TC_A29K)
+#if defined(TC_SPARC) || defined(TC_A29K) || defined(NEED_FX_R_TYPE)
 	/* Hacks for machines where the type of reloc can't be
 	   worked out by looking at how big it is */
 
@@ -90,8 +90,11 @@ fixS *fix_new(fragS *frag,
 	      symbolS *add_symbol,
 	      symbolS *sub_symbol,
 	      long offset,
-	      int pcrel,
-	      enum reloc_type r_type);
+	      int pcrel
+#if defined(TC_SPARC) || defined(TC_A29K) || defined(NEED_FX_R_TYPE)
+	      , int r_type
+#endif
+);
 
 #else /* not __STDC__ */
 
-- 
2.7.4