gas:

	* cgen.c, cgen.h, tc.h, write.c, config/obj-coff.c
	* config/tc-a29k.c, config/tc-alpha.c, config/tc-alpha.h
	* config/tc-arc.c, config/tc-arc.h, config/tc-arm.c
	* config/tc-arm.h, config/tc-avr.c, config/tc-avr.h
	* config/tc-cris.c, config/tc-crx.c, config/tc-d10v.c
	* config/tc-d10v.h, config/tc-d30v.c, config/tc-d30v.h
	* config/tc-dlx.c, config/tc-dlx.h, config/tc-fr30.h
	* config/tc-frv.c, config/tc-frv.h, config/tc-h8300.c
	* config/tc-h8500.c, config/tc-hppa.c, config/tc-hppa.h
	* config/tc-i370.c, config/tc-i370.h, config/tc-i386.c
	* config/tc-i386.h, config/tc-i860.c, config/tc-i860.h
	* config/tc-i960.c, config/tc-i960.h, config/tc-ia64.c
	* config/tc-ip2k.c, config/tc-ip2k.h, config/tc-iq2000.c
	* config/tc-iq2000.h, config/tc-m32r.c, config/tc-m32r.h
	* config/tc-m68hc11.c, config/tc-m68hc11.h, config/tc-m68k.c
	* config/tc-m68k.h, config/tc-m88k.c, config/tc-maxq.c
	* config/tc-mcore.c, config/tc-mcore.h, config/tc-mips.c
	* config/tc-mips.h, config/tc-mmix.c, config/tc-mn10200.c
	* config/tc-mn10300.c, config/tc-msp430.c, config/tc-ns32k.c
	* config/tc-openrisc.h, config/tc-or32.c, config/tc-or32.h
	* config/tc-pdp11.c, config/tc-pj.c, config/tc-pj.h
	* config/tc-ppc.c, config/tc-ppc.h, config/tc-s390.c
	* config/tc-s390.h, config/tc-sh64.c, config/tc-sh.c
	* config/tc-sh.h, config/tc-sparc.c, config/tc-sparc.h
	* config/tc-tahoe.c, config/tc-tic30.c, config/tc-tic4x.c
	* config/tc-tic54x.c, config/tc-tic80.c, config/tc-v850.c
	* config/tc-v850.h, config/tc-vax.c, config/tc-vax.h
	* config/tc-w65.c, config/tc-xstormy16.c, config/tc-xstormy16.h
	* config/tc-xtensa.c, config/tc-z8k.c:
	Replace all instances of the string "_apply_fix3" with
	"_apply_fix".
	* po/POTFILES.in, po/gas.pot: Regenerate.
bfd:
	* coff-i386.c: Change md_apply_fix3 to md_apply_fix in comment.
cgen:
	* doc/porting.texi: Change all mention of md_apply_fix3 and
	gas_cgen_md_apply_fix3 to md_apply_fix and gas_cgen_md_apply_fix
	respectively.

84 files changed, 149 insertions, 151 deletions

diff --git a/gas/config/obj-coff.c b/gas/config/obj-coff.c
index 4ab083c..6054726 100644
--- a/gas/config/obj-coff.c
+++ b/gas/config/obj-coff.c
@@ -3882,7 +3882,7 @@ fixup_segment (segment_info_type * segP, segT this_segment_type)
 #endif
 	}
 
-      md_apply_fix3 (fixP, (valueT *) & add_number, this_segment_type);
+      md_apply_fix (fixP, (valueT *) & add_number, this_segment_type);
 
       if (!fixP->fx_bit_fixP && ! fixP->fx_no_overflow)
 	{
diff --git a/gas/config/tc-a29k.c b/gas/config/tc-a29k.c
index 5af51a7..26b02ca 100644
--- a/gas/config/tc-a29k.c
+++ b/gas/config/tc-a29k.c
@@ -732,7 +732,7 @@ md_number_to_chars (char *buf, valueT val, int n)
 }
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 {
   valueT val = *valP;
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
diff --git a/gas/config/tc-alpha.c b/gas/config/tc-alpha.c
index 2559bee..2eb0adf 100644
--- a/gas/config/tc-alpha.c
+++ b/gas/config/tc-alpha.c
@@ -5204,7 +5204,7 @@ md_pcrel_from (fixS *fixP)
    GPDISP.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT * valP, segT seg)
+md_apply_fix (fixS *fixP, valueT * valP, segT seg)
 {
   char * const fixpos = fixP->fx_frag->fr_literal + fixP->fx_where;
   valueT value = * valP;
diff --git a/gas/config/tc-alpha.h b/gas/config/tc-alpha.h
index 9756700..42e004e 100644
--- a/gas/config/tc-alpha.h
+++ b/gas/config/tc-alpha.h
@@ -60,7 +60,7 @@ extern valueT alpha_gp_value;
 #define tc_fix_adjustable(FIX)		alpha_fix_adjustable (FIX)
 #define RELOC_REQUIRES_SYMBOL
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 #define md_convert_frag(b,s,f)		as_fatal ("alpha convert_frag\n")
diff --git a/gas/config/tc-arc.c b/gas/config/tc-arc.c
index 8aff9ba..0dd0ac7 100644
--- a/gas/config/tc-arc.c
+++ b/gas/config/tc-arc.c
@@ -1269,7 +1269,7 @@ md_pcrel_from (fixS *fixP)
    that, we determine the correct reloc code and put it back in the fixup.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT * valP, segT seg)
+md_apply_fix (fixS *fixP, valueT * valP, segT seg)
 {
   valueT value = * valP;
 
@@ -1884,7 +1884,7 @@ md_assemble (char *str)
 		 operands residing in the insn, but instead just use the
 		 operand index.  This lets us easily handle fixups for any
 		 operand type, although that is admittedly not a very exciting
-		 feature.  We pick a BFD reloc type in md_apply_fix3.
+		 feature.  We pick a BFD reloc type in md_apply_fix.
 
 		 Limm values (4 byte immediate "constants") must be treated
 		 normally because they're not part of the actual insn word
diff --git a/gas/config/tc-arc.h b/gas/config/tc-arc.h
index 5d30ad7..4c3d9c2 100644
--- a/gas/config/tc-arc.h
+++ b/gas/config/tc-arc.h
@@ -65,7 +65,7 @@ extern void arc_cons_fix_new (struct frag *, int, int, struct expressionS *);
 
 #define DWARF2_LINE_MIN_INSN_LENGTH 4
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 /* No shared lib support, so we don't need to ensure externally
diff --git a/gas/config/tc-arm.c b/gas/config/tc-arm.c
index 13108ed..5e7fb74 100644
--- a/gas/config/tc-arm.c
+++ b/gas/config/tc-arm.c
@@ -1414,9 +1414,11 @@ find_real_start (symbolS * symbolP)
   if (name == NULL)
     abort ();
 
-  /* Names that start with '.' are local labels, not function entry points.
-     The compiler may generate BL instructions to these labels because it
-     needs to perform a branch to a far away location.	*/
+  /* The compiler may generate BL instructions to local labels because
+     it needs to perform a branch to a far away location. These labels
+     do not have a corresponding ".real_start_of" label.  To accomodate
+     hand-written assembly, we don't insist on a leading ".L", just a
+     leading dot.  */
   if (name[0] == '.')
     return symbolP;
 
@@ -3071,7 +3073,7 @@ parse_shift (char **str, int i, enum parse_shift_mode mode)
 
    where <shift> is defined by parse_shift above, and <rotate> is a
    multiple of 2 between 0 and 30.  Validation of immediate operands
-   is deferred to md_apply_fix3.  */
+   is deferred to md_apply_fix.  */
 
 static int
 parse_shifter_operand (char **str, int i)
@@ -3122,7 +3124,7 @@ parse_shifter_operand (char **str, int i)
 	  return FAIL;
 	}
 
-      /* Convert to decoded value.  md_apply_fix3 will put it back.  */
+      /* Convert to decoded value.  md_apply_fix will put it back.  */
       inst.reloc.exp.X_add_number
 	= (((inst.reloc.exp.X_add_number << (32 - value))
 	    | (inst.reloc.exp.X_add_number >> value)) & 0xffffffff);
@@ -3977,7 +3979,7 @@ encode_arm_vfp_sp_reg (int reg, enum vfp_sp_reg_pos pos)
 }
 
 /* Encode a <shift> in an ARM-format instruction.  The immediate,
-   if any, is handled by md_apply_fix3.	 */
+   if any, is handled by md_apply_fix.	 */
 static void
 encode_arm_shift (int i)
 {
@@ -9963,7 +9965,7 @@ md_undefined_symbol (char * name ATTRIBUTE_UNUSED)
   return 0;
 }
 
-/* Subroutine of md_apply_fix3.	 Check to see if an immediate can be
+/* Subroutine of md_apply_fix.	 Check to see if an immediate can be
    computed as two separate immediate values, added together.  We
    already know that this value cannot be computed by just one ARM
    instruction.	 */
@@ -10010,7 +10012,7 @@ validate_offset_imm (unsigned int val, int hwse)
   return val;
 }
 
-/* Subroutine of md_apply_fix3.	 Do those data_ops which can take a
+/* Subroutine of md_apply_fix.	 Do those data_ops which can take a
    negative immediate constant by altering the instruction.  A bit of
    a hack really.
 	MOV <-> MVN
@@ -10100,7 +10102,7 @@ negate_data_op (unsigned long * instruction,
 }
 
 void
-md_apply_fix3 (fixS *	fixP,
+md_apply_fix (fixS *	fixP,
 	       valueT * valP,
 	       segT	seg)
 {
@@ -10513,7 +10515,8 @@ md_apply_fix3 (fixS *	fixP,
 #define SEXT24(x)	((((x) & 0xffffff) ^ (~ 0x7fffff)) + 0x800000)
 
 #ifdef OBJ_ELF
-      value = fixP->fx_offset;
+      if (!fixP->fx_done)
+	value = fixP->fx_offset;
 #endif
 
       /* We are going to store value (shifted right by two) in the
@@ -10583,7 +10586,8 @@ md_apply_fix3 (fixS *	fixP,
 	newval = md_chars_to_number (buf, INSN_SIZE);
 
 #ifdef OBJ_ELF
-	value = fixP->fx_offset;
+	if (!fixP->fx_done)
+	  value = fixP->fx_offset;
 #endif
 	hbit   = (value >> 1) & 1;
 	value  = (value >> 2) & 0x00ffffff;
@@ -10742,7 +10746,8 @@ md_apply_fix3 (fixS *	fixP,
 	if (diff & 0x400000)
 	  diff |= ~0x3fffff;
 #ifdef OBJ_ELF
-	value = fixP->fx_offset;
+	if (!fixP->fx_done)
+	  value = fixP->fx_offset;
 #endif
 	value += diff;
 
@@ -11353,13 +11358,6 @@ arm_force_relocation (struct fix * fixp)
   if (fixp->fx_r_type == BFD_RELOC_RVA)
     return 1;
 #endif
-#ifdef OBJ_ELF
-  if (fixp->fx_r_type == BFD_RELOC_ARM_PCREL_BRANCH
-      || fixp->fx_r_type == BFD_RELOC_ARM_PCREL_BLX
-      || fixp->fx_r_type == BFD_RELOC_THUMB_PCREL_BLX
-      || fixp->fx_r_type == BFD_RELOC_THUMB_PCREL_BRANCH23)
-    return 1;
-#endif
 
   /* Resolve these relocations even if the symbol is extern or weak.  */
   if (fixp->fx_r_type == BFD_RELOC_ARM_IMMEDIATE
diff --git a/gas/config/tc-arm.h b/gas/config/tc-arm.h
index 4f52f43..de23b62 100644
--- a/gas/config/tc-arm.h
+++ b/gas/config/tc-arm.h
@@ -127,8 +127,9 @@ struct fix;
 
 #define OPTIONAL_REGISTER_PREFIX '%'
 
-#define LOCAL_LABEL(name) (name[0] == '.' && (name[1] == 'L'))
-#define LOCAL_LABELS_FB   1
+#define LOCAL_LABEL(name)  (name[0] == '.' && name[1] == 'L')
+#define LOCAL_LABELS_FB    1
+#define LOCAL_LABEL_PREFIX '.'
 
 /* This expression evaluates to true if the relocation is for a local
    object for which we still want to do the relocation at runtime.
@@ -168,7 +169,6 @@ struct fix;
 # define md_elf_section_change_hook()	arm_elf_change_section ()
 # define md_elf_section_type(str, len)	arm_elf_section_type (str, len)
 # define GLOBAL_OFFSET_TABLE_NAME	"_GLOBAL_OFFSET_TABLE_"
-# define LOCAL_LABEL_PREFIX 		'.'
 # define TC_SEGMENT_INFO_TYPE 		struct arm_segment_info_type
 
 enum mstate
@@ -206,7 +206,7 @@ struct arm_segment_info_type
 
 # define EXTERN_FORCE_RELOC 			1
 # define tc_fix_adjustable(FIX) 		arm_fix_adjustable (FIX)
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 # define MD_APPLY_SYM_VALUE(FIX) 		0
 # define TC_VALIDATE_FIX(FIX, SEGTYPE, LABEL)	arm_validate_fix (FIX)
 
diff --git a/gas/config/tc-avr.c b/gas/config/tc-avr.c
index 34565b7..39e695f 100644
--- a/gas/config/tc-avr.c
+++ b/gas/config/tc-avr.c
@@ -863,7 +863,7 @@ md_pcrel_from_section (fixp, sec)
    value in the object file.  */
 
 void
-md_apply_fix3 (fixP, valP, seg)
+md_apply_fix (fixP, valP, seg)
      fixS *fixP;
      valueT * valP;
      segT seg;
diff --git a/gas/config/tc-avr.h b/gas/config/tc-avr.h
index dceb0b7..d667ebb 100644
--- a/gas/config/tc-avr.h
+++ b/gas/config/tc-avr.h
@@ -96,7 +96,7 @@ void avr_cons_fix_new(fragS *frag,int where, int nbytes, expressionS *exp);
    visible symbols can be overridden.  */
 #define EXTERN_FORCE_RELOC 0
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 /* If you define this macro, it should return the offset between the
diff --git a/gas/config/tc-cris.c b/gas/config/tc-cris.c
index 04dfe4f..b01c3f6 100644
--- a/gas/config/tc-cris.c
+++ b/gas/config/tc-cris.c
@@ -3904,7 +3904,7 @@ md_show_usage (FILE *stream)
    enough info to complete immediately) to the data in a frag.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg)
 {
   /* This assignment truncates upper bits if valueT is 64 bits (as with
      --enable-64-bit-bfd), which is fine here, though we cast to avoid
diff --git a/gas/config/tc-crx.c b/gas/config/tc-crx.c
index 988610b..3f0c767 100644
--- a/gas/config/tc-crx.c
+++ b/gas/config/tc-crx.c
@@ -523,7 +523,7 @@ md_atof (int type, char *litP, int *sizeP)
    fixuping relocations of debug sections.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg)
 {
   valueT val = * valP;
   char *buf = fixP->fx_frag->fr_literal + fixP->fx_where;
diff --git a/gas/config/tc-d10v.c b/gas/config/tc-d10v.c
index f8f2f75..6c94edb 100644
--- a/gas/config/tc-d10v.c
+++ b/gas/config/tc-d10v.c
@@ -1523,7 +1523,7 @@ md_pcrel_from_section (fixS *fixp, segT sec)
 }
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 {
   char *where;
   unsigned long insn;
diff --git a/gas/config/tc-d10v.h b/gas/config/tc-d10v.h
index f9f451c..4453bf6 100644
--- a/gas/config/tc-d10v.h
+++ b/gas/config/tc-d10v.h
@@ -65,7 +65,7 @@ int d10v_cleanup (void);
 #define tc_fix_adjustable(FIX) d10v_fix_adjustable(FIX)
 bfd_boolean d10v_fix_adjustable (struct fix *);
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 /* No shared lib support, so we don't need to ensure externally
diff --git a/gas/config/tc-d30v.c b/gas/config/tc-d30v.c
index 5944e0c..848ad03 100644
--- a/gas/config/tc-d30v.c
+++ b/gas/config/tc-d30v.c
@@ -1924,7 +1924,7 @@ d30v_cons_align (int size)
 }
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 {
   char *where;
   unsigned long insn, insn2;
diff --git a/gas/config/tc-d30v.h b/gas/config/tc-d30v.h
index dbd55b1..4c80301 100644
--- a/gas/config/tc-d30v.h
+++ b/gas/config/tc-d30v.h
@@ -62,7 +62,7 @@ void d30v_frob_label (symbolS *);
 void d30v_cons_align (int);
 #define md_cons_align(nbytes)	     d30v_cons_align (nbytes)
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 /* No shared lib support, so we don't need to ensure externally
diff --git a/gas/config/tc-dlx.c b/gas/config/tc-dlx.c
index d97f5f6..ac0aaba 100644
--- a/gas/config/tc-dlx.c
+++ b/gas/config/tc-dlx.c
@@ -1056,7 +1056,7 @@ md_dlx_fix_adjustable (fixS *fixP)
 }
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 {
   long val = *valP;
   char *place = fixP->fx_where + fixP->fx_frag->fr_literal;
diff --git a/gas/config/tc-dlx.h b/gas/config/tc-dlx.h
index e3b7bb6..e675649 100644
--- a/gas/config/tc-dlx.h
+++ b/gas/config/tc-dlx.h
@@ -74,7 +74,7 @@ extern bfd_boolean md_dlx_fix_adjustable  (struct fix *);
 
 #define tc_fix_adjustable(FIX) md_dlx_fix_adjustable (FIX)
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 #define NEED_FX_R_TYPE
diff --git a/gas/config/tc-fr30.h b/gas/config/tc-fr30.h
index 799cc20..edbddf7 100644
--- a/gas/config/tc-fr30.h
+++ b/gas/config/tc-fr30.h
@@ -43,10 +43,10 @@
 /* We don't need to handle .word strangely.  */
 #define WORKING_DOT_WORD
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
-#define md_apply_fix3 gas_cgen_md_apply_fix3
+#define md_apply_fix gas_cgen_md_apply_fix
 
 #define tc_fix_adjustable(FIX) fr30_fix_adjustable (FIX)
 struct fix;
diff --git a/gas/config/tc-frv.c b/gas/config/tc-frv.c
index d678baa..f177194 100644
--- a/gas/config/tc-frv.c
+++ b/gas/config/tc-frv.c
@@ -1468,7 +1468,7 @@ frv_force_relocation (fix)
 /* Apply a fixup that could be resolved within the assembler.  */
 
 void
-md_apply_fix3 (fixP, valP, seg)
+md_apply_fix (fixP, valP, seg)
      fixS *   fixP;
      valueT * valP;
      segT     seg;
@@ -1542,7 +1542,7 @@ md_apply_fix3 (fixP, valP, seg)
 	break;
       }
 
-  gas_cgen_md_apply_fix3 (fixP, valP, seg);
+  gas_cgen_md_apply_fix (fixP, valP, seg);
   return;
 }
 
diff --git a/gas/config/tc-frv.h b/gas/config/tc-frv.h
index 2833dac..db4e366 100644
--- a/gas/config/tc-frv.h
+++ b/gas/config/tc-frv.h
@@ -44,7 +44,7 @@ extern bfd_boolean frv_md_fdpic_enabled (void);
 /* We don't need to handle .word strangely.  */
 #define WORKING_DOT_WORD
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 extern void frv_tomcat_workaround PARAMS ((void));
diff --git a/gas/config/tc-h8300.c b/gas/config/tc-h8300.c
index 48a34a6..8e926ad 100644
--- a/gas/config/tc-h8300.c
+++ b/gas/config/tc-h8300.c
@@ -2163,7 +2163,7 @@ md_section_align (segT seg, valueT size)
 
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 {
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
   long val = *valP;
diff --git a/gas/config/tc-h8500.c b/gas/config/tc-h8500.c
index f31f4b5..63168b0 100644
--- a/gas/config/tc-h8500.c
+++ b/gas/config/tc-h8500.c
@@ -1284,7 +1284,7 @@ md_section_align (segT seg, valueT size)
 }
 
 void
-md_apply_fix3 (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
 {
   long val = * (long *) valP;
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
diff --git a/gas/config/tc-hppa.c b/gas/config/tc-hppa.c
index 398e746..2b4f3d5 100644
--- a/gas/config/tc-hppa.c
+++ b/gas/config/tc-hppa.c
@@ -1175,7 +1175,7 @@ static struct default_space_dict pa_def_spaces[] =
       } \
   }
 
-/* Variant of CHECK_FIELD for use in md_apply_fix3 and other places where
+/* Variant of CHECK_FIELD for use in md_apply_fix and other places where
    the current file and line number are not valid.  */
 
 #define CHECK_FIELD_WHERE(FIELD, HIGH, LOW, FILENAME, LINE) \
@@ -4422,7 +4422,7 @@ md_undefined_symbol (name)
 /* Apply a fixup to an instruction.  */
 
 void
-md_apply_fix3 (fixP, valP, seg)
+md_apply_fix (fixP, valP, seg)
      fixS *fixP;
      valueT *valP;
      segT seg ATTRIBUTE_UNUSED;
diff --git a/gas/config/tc-hppa.h b/gas/config/tc-hppa.h
index c0d443c..5743173 100644
--- a/gas/config/tc-hppa.h
+++ b/gas/config/tc-hppa.h
@@ -134,7 +134,7 @@ int hppa_fix_adjustable PARAMS((struct fix *));
    normally appear safe to handle it completely within GAS.  */
 #define TC_FORCE_RELOCATION(FIX) hppa_force_relocation (FIX)
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 #ifdef OBJ_SOM
diff --git a/gas/config/tc-i370.c b/gas/config/tc-i370.c
index e80ef36..de67ce3 100644
--- a/gas/config/tc-i370.c
+++ b/gas/config/tc-i370.c
@@ -2232,7 +2232,7 @@ md_assemble (char *str)
      BFD_RELOC_UNUSED plus the operand index.  This lets us easily
      handle fixups for any operand type, although that is admittedly
      not a very exciting feature.  We pick a BFD reloc type in
-     md_apply_fix3.  */
+     md_apply_fix.  */
   for (i = 0; i < fc; i++)
     {
       const struct i370_operand *operand;
@@ -2476,14 +2476,14 @@ md_pcrel_from_section (fixS *fixp, segT sec ATTRIBUTE_UNUSED)
    going on here.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT * valP, segT seg)
+md_apply_fix (fixS *fixP, valueT * valP, segT seg)
 {
   valueT value = * valP;
 
   if (fixP->fx_addsy != NULL)
     {
 #ifdef DEBUG
-      printf ("\nmd_apply_fix3: symbol %s at 0x%x (%s:%d) val=0x%x addend=0x%x\n",
+      printf ("\nmd_apply_fix: symbol %s at 0x%x (%s:%d) val=0x%x addend=0x%x\n",
 	      S_GET_NAME (fixP->fx_addsy),
 	      fixP->fx_frag->fr_address + fixP->fx_where,
 	      fixP->fx_file, fixP->fx_line,
@@ -2508,7 +2508,7 @@ md_apply_fix3 (fixS *fixP, valueT * valP, segT seg)
       operand = &i370_operands[opindex];
 
 #ifdef DEBUG
-      printf ("\nmd_apply_fix3: fixup operand %s at 0x%x in %s:%d addend=0x%x\n",
+      printf ("\nmd_apply_fix: fixup operand %s at 0x%x in %s:%d addend=0x%x\n",
 	      operand->name,
 	      fixP->fx_frag->fr_address + fixP->fx_where,
 	      fixP->fx_file, fixP->fx_line,
@@ -2568,7 +2568,7 @@ md_apply_fix3 (fixS *fixP, valueT * valP, segT seg)
       i370_elf_validate_fix (fixP, seg);
 #endif
 #ifdef DEBUG
-      printf ("md_apply_fix3: reloc case %d in segment  %s %s:%d\n",
+      printf ("md_apply_fix: reloc case %d in segment  %s %s:%d\n",
 	      fixP->fx_r_type, segment_name (seg), fixP->fx_file, fixP->fx_line);
       printf ("\tcurrent fixup value is 0x%x \n", value);
 #endif
diff --git a/gas/config/tc-i370.h b/gas/config/tc-i370.h
index 716094b..e44328d 100644
--- a/gas/config/tc-i370.h
+++ b/gas/config/tc-i370.h
@@ -54,7 +54,7 @@ extern int target_big_endian;
 /* foo-. gets turned into PC relative relocs.  */
 #define DIFF_EXPR_OK
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 /* We don't need to handle .word strangely.  */
diff --git a/gas/config/tc-i386.c b/gas/config/tc-i386.c
index 1e1a11a..0095797 100644
--- a/gas/config/tc-i386.c
+++ b/gas/config/tc-i386.c
@@ -4793,7 +4793,7 @@ md_create_long_jump (ptr, from_addr, to_addr, frag, to_symbol)
    we are handling.  */
 
 void
-md_apply_fix3 (fixP, valP, seg)
+md_apply_fix (fixP, valP, seg)
      /* The fix we're to put in.  */
      fixS *fixP;
      /* Pointer to the value of the bits.  */
diff --git a/gas/config/tc-i386.h b/gas/config/tc-i386.h
index 8c67c0c..2fc21d9 100644
--- a/gas/config/tc-i386.h
+++ b/gas/config/tc-i386.h
@@ -413,7 +413,7 @@ void i386_validate_fix PARAMS ((struct fix *));
 #define tc_fix_adjustable(X)  tc_i386_fix_adjustable(X)
 extern int tc_i386_fix_adjustable PARAMS ((struct fix *));
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 /* ELF wants external syms kept, as does PE COFF.  */
diff --git a/gas/config/tc-i860.c b/gas/config/tc-i860.c
index 10e802e..4a87c54 100644
--- a/gas/config/tc-i860.c
+++ b/gas/config/tc-i860.c
@@ -1338,7 +1338,7 @@ obtain_reloc_for_imm16 (fixS *fix, long *val)
    we will have to generate a reloc entry.  */
 
 void
-md_apply_fix3 (fixS *fix, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fix, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 {
   char *buf;
   long val = *valP;
diff --git a/gas/config/tc-i860.h b/gas/config/tc-i860.h
index b639c2b..4fb34e5 100644
--- a/gas/config/tc-i860.h
+++ b/gas/config/tc-i860.h
@@ -79,7 +79,7 @@ extern int target_big_endian;
 
 #define md_convert_frag(b,s,f)  as_fatal (_("i860_convert_frag\n"));
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 /* No shared lib support, so we don't need to ensure externally
diff --git a/gas/config/tc-i960.c b/gas/config/tc-i960.c
index 43a301b..eef97fe 100644
--- a/gas/config/tc-i960.c
+++ b/gas/config/tc-i960.c
@@ -2446,7 +2446,7 @@ md_pcrel_from (fixS *fixP)
 }
 
 void
-md_apply_fix3 (fixS *fixP,
+md_apply_fix (fixS *fixP,
 	       valueT *valP,
 	       segT seg ATTRIBUTE_UNUSED)
 {
diff --git a/gas/config/tc-i960.h b/gas/config/tc-i960.h
index ac89b52..897901d 100644
--- a/gas/config/tc-i960.h
+++ b/gas/config/tc-i960.h
@@ -172,10 +172,10 @@ extern int i960_validate_fix PARAMS ((struct fix *, segT));
 #define tc_fix_adjustable(FIX)		((FIX)->fx_bsr == 0)
 
 #ifndef OBJ_ELF
-/* Values passed to md_apply_fix3 sometimes include symbol values.  */
+/* Values passed to md_apply_fix sometimes include symbol values.  */
 #define MD_APPLY_SYM_VALUE(FIX) tc_fix_adjustable (FIX)
 #else
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 #endif
 
diff --git a/gas/config/tc-ia64.c b/gas/config/tc-ia64.c
index 5734add..c84b4ef 100644
--- a/gas/config/tc-ia64.c
+++ b/gas/config/tc-ia64.c
@@ -5995,7 +5995,7 @@ operand_match (idesc, index, e)
 	case O_symbol:
 	  fix = CURR_SLOT.fixup + CURR_SLOT.num_fixups;
 	  /* There are no external relocs for TAG13/TAG13b fields, so we
-	     create a dummy reloc.  This will not live past md_apply_fix3.  */
+	     create a dummy reloc.  This will not live past md_apply_fix.  */
 	  fix->code = BFD_RELOC_UNUSED;
 	  fix->code = ia64_gen_real_reloc_type (e->X_op_symbol, fix->code);
 	  fix->opnd = idesc->operands[index];
@@ -11055,7 +11055,7 @@ ia64_cons_fix_new (f, where, nbytes, exp)
   fix = fix_new_exp (f, where, nbytes, exp, 0, code);
   /* We need to store the byte order in effect in case we're going
      to fix an 8 or 16 bit relocation (for which there no real
-     relocs available).  See md_apply_fix3().  */
+     relocs available).  See md_apply_fix().  */
   fix->tc_fix_data.bigendian = target_big_endian;
 }
 
@@ -11402,7 +11402,7 @@ fix_insn (fix, odesc, value)
    (if possible).  */
 
 void
-md_apply_fix3 (fix, valP, seg)
+md_apply_fix (fix, valP, seg)
      fixS *fix;
      valueT *valP;
      segT seg ATTRIBUTE_UNUSED;
diff --git a/gas/config/tc-ip2k.c b/gas/config/tc-ip2k.c
index 4f5fbc2..10e9e2f 100644
--- a/gas/config/tc-ip2k.c
+++ b/gas/config/tc-ip2k.c
@@ -431,7 +431,7 @@ ip2k_force_relocation (fixS * fix)
 }
 
 void
-ip2k_apply_fix3 (fixS *fixP, valueT *valueP, segT seg)
+ip2k_apply_fix (fixS *fixP, valueT *valueP, segT seg)
 {
   if (fixP->fx_r_type == BFD_RELOC_IP2K_TEXT
       && ! fixP->fx_addsy
@@ -445,7 +445,7 @@ ip2k_apply_fix3 (fixS *fixP, valueT *valueP, segT seg)
       /* Must be careful when we are fixing up an FR.  We could be
 	 fixing up an offset to (SP) or (DP) in which case we don't
 	 want to step on the top 2 bits of the FR operand.  The
-	 gas_cgen_md_apply_fix3 doesn't know any better and overwrites
+	 gas_cgen_md_apply_fix doesn't know any better and overwrites
 	 the entire operand.  We counter this by adding the bits
 	 to the new value.  */
       char *where = fixP->fx_frag->fr_literal + fixP->fx_where;
@@ -459,7 +459,7 @@ ip2k_apply_fix3 (fixS *fixP, valueT *valueP, segT seg)
       *valueP += (insn_value & 0x180);
     }
 
-  gas_cgen_md_apply_fix3 (fixP, valueP, seg);
+  gas_cgen_md_apply_fix (fixP, valueP, seg);
 }
 
 int
diff --git a/gas/config/tc-ip2k.h b/gas/config/tc-ip2k.h
index b024b9a..ad8d906 100644
--- a/gas/config/tc-ip2k.h
+++ b/gas/config/tc-ip2k.h
@@ -47,10 +47,10 @@
 #define LITERAL_PREFIXPERCENT_BIN
 #define DOUBLESLASH_LINE_COMMENTS
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
-#define md_apply_fix3 ip2k_apply_fix3
+#define md_apply_fix ip2k_apply_fix
 
 #define TC_HANDLES_FX_DONE
 
diff --git a/gas/config/tc-iq2000.c b/gas/config/tc-iq2000.c
index 5c6b14c..0d689c0 100644
--- a/gas/config/tc-iq2000.c
+++ b/gas/config/tc-iq2000.c
@@ -574,7 +574,7 @@ iq2000_cgen_record_fixup_exp (fragS *              frag,
 #define FX_OPINFO_R_TYPE(f) ((f)->fx_cgen.opinfo)
 
 /* Sort any unmatched HI16 relocs so that they immediately precede
-   the corresponding LO16 reloc.  This is called before md_apply_fix3 and
+   the corresponding LO16 reloc.  This is called before md_apply_fix and
    tc_gen_reloc.  */
 
 void
diff --git a/gas/config/tc-iq2000.h b/gas/config/tc-iq2000.h
index 06ece3c..0fe7699 100644
--- a/gas/config/tc-iq2000.h
+++ b/gas/config/tc-iq2000.h
@@ -43,7 +43,7 @@
 /* We don't need to handle .word strangely.  */
 #define WORKING_DOT_WORD
 
-#define md_apply_fix3 gas_cgen_md_apply_fix3
+#define md_apply_fix gas_cgen_md_apply_fix
 
 /* Call md_pcrel_from_section(), not md_pcrel_from().  */
 #define MD_PCREL_FROM_SECTION(FIXP, SEC) md_pcrel_from_section (FIXP, SEC)
@@ -59,7 +59,7 @@
 /* When relaxing, we need to emit various relocs we otherwise wouldn't.  */
 #define TC_FORCE_RELOCATION(fix) iq2000_force_relocation (fix)
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 #define tc_gen_reloc gas_cgen_tc_gen_reloc
diff --git a/gas/config/tc-m32r.c b/gas/config/tc-m32r.c
index 5161945..83f0853 100644
--- a/gas/config/tc-m32r.c
+++ b/gas/config/tc-m32r.c
@@ -1995,7 +1995,7 @@ m32r_cgen_record_fixup_exp (fragS *frag,
 #define FX_OPINFO_R_TYPE(f) ((f)->fx_cgen.opinfo)
 
 /* Sort any unmatched HI16 relocs so that they immediately precede
-   the corresponding LO16 reloc.  This is called before md_apply_fix3 and
+   the corresponding LO16 reloc.  This is called before md_apply_fix and
    tc_gen_reloc.  */
 
 void
diff --git a/gas/config/tc-m32r.h b/gas/config/tc-m32r.h
index e028370..9ac61cf 100644
--- a/gas/config/tc-m32r.h
+++ b/gas/config/tc-m32r.h
@@ -71,10 +71,10 @@ extern void m32r_handle_align (fragS *);
 
 #define MAX_MEM_FOR_RS_ALIGN_CODE  (1 + 2 + 4)
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
-#define md_apply_fix3 gas_cgen_md_apply_fix3
+#define md_apply_fix gas_cgen_md_apply_fix
 
 #define tc_fix_adjustable(FIX) m32r_fix_adjustable (FIX)
 bfd_boolean m32r_fix_adjustable (struct fix *);
diff --git a/gas/config/tc-m68hc11.c b/gas/config/tc-m68hc11.c
index 2efe16b..e6d4235 100644
--- a/gas/config/tc-m68hc11.c
+++ b/gas/config/tc-m68hc11.c
@@ -3228,7 +3228,7 @@ tc_m68hc11_fix_adjustable (fixS *fixP)
 }
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 {
   char *where;
   long value = * valP;
diff --git a/gas/config/tc-m68hc11.h b/gas/config/tc-m68hc11.h
index 7268001..7560716 100644
--- a/gas/config/tc-m68hc11.h
+++ b/gas/config/tc-m68hc11.h
@@ -93,7 +93,7 @@ extern long m68hc11_relax_frag (segT, fragS*, long);
 
 #define DIFF_EXPR_OK		/* .-foo gets turned into PC relative relocs */
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 /* No shared lib support, so we don't need to ensure externally
diff --git a/gas/config/tc-m68k.c b/gas/config/tc-m68k.c
index 927c701..eb6e469 100644
--- a/gas/config/tc-m68k.c
+++ b/gas/config/tc-m68k.c
@@ -4605,7 +4605,7 @@ md_number_to_chars (char *buf, valueT val, int n)
 }
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 {
   offsetT val = *valP;
   addressT upper_limit;
diff --git a/gas/config/tc-m68k.h b/gas/config/tc-m68k.h
index d859a30..a19ea57 100644
--- a/gas/config/tc-m68k.h
+++ b/gas/config/tc-m68k.h
@@ -175,7 +175,7 @@ extern int tc_m68k_fix_adjustable PARAMS ((struct fix *));
 #define EXTERN_FORCE_RELOC \
   ((strcmp (TARGET_OS, "elf") != 0) && (strcmp (TARGET_OS, "uclinux") != 0))
 
-/* Values passed to md_apply_fix3 don't include symbol values.  */
+/* Values passed to md_apply_fix don't include symbol values.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 #define elf_tc_final_processing m68k_elf_final_processing
diff --git a/gas/config/tc-m88k.c b/gas/config/tc-m88k.c
index 37d1bbb..d4a950e 100644
--- a/gas/config/tc-m88k.c
+++ b/gas/config/tc-m88k.c
@@ -1018,7 +1018,7 @@ tc_coff_fix2rtype (fixS *fixp)
    file itself.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
 {
   long val = * (long *) valP;
   char *buf;
diff --git a/gas/config/tc-maxq.c b/gas/config/tc-maxq.c
index d6019e6..e6987e1 100644
--- a/gas/config/tc-maxq.c
+++ b/gas/config/tc-maxq.c
@@ -583,13 +583,13 @@ maxq_number_to_chars (char *buf, valueT val, int n)
 
 /* GAS will call this for each fixup. It's main objective is to store the
    correct value in the object file. 'fixup_segment' performs the generic
-   overflow check on the 'valueT *val' argument after md_apply_fix3 returns.
+   overflow check on the 'valueT *val' argument after md_apply_fix returns.
    If the overflow check is relevant for the target machine, then
-   'md_apply_fix3' should modify 'valueT *val', typically to the value stored 
+   'md_apply_fix' should modify 'valueT *val', typically to the value stored 
    in the object file (not to be done in MAXQ).  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valT, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valT, segT seg ATTRIBUTE_UNUSED)
 {
   char *p = fixP->fx_frag->fr_literal + fixP->fx_where;
   char *frag_to_fix_at =
diff --git a/gas/config/tc-mcore.c b/gas/config/tc-mcore.c
index dfa7943..0f9ec69 100644
--- a/gas/config/tc-mcore.c
+++ b/gas/config/tc-mcore.c
@@ -1984,7 +1984,7 @@ md_convert_frag (bfd * abfd ATTRIBUTE_UNUSED,
    Also sets up addends for 'rela' type relocations.  */
 
 void
-md_apply_fix3 (fixS *   fixP,
+md_apply_fix (fixS *   fixP,
 	       valueT * valP,
 	       segT     segment ATTRIBUTE_UNUSED)
 {
diff --git a/gas/config/tc-mcore.h b/gas/config/tc-mcore.h
index cfbb70a..12410c8 100644
--- a/gas/config/tc-mcore.h
+++ b/gas/config/tc-mcore.h
@@ -92,7 +92,7 @@ struct mcore_tc_sy
 
 #define tc_fix_adjustable(FIX) mcore_fix_adjustable (FIX)
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 #endif /* OBJ_ELF */
diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 2afebfb..9dd9f12 100644
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -10696,7 +10696,7 @@ mips_frob_file_before_adjust (void)
 }
 
 /* Sort any unmatched HI16 and GOT16 relocs so that they immediately precede
-   the corresponding LO16 reloc.  This is called before md_apply_fix3 and
+   the corresponding LO16 reloc.  This is called before md_apply_fix and
    tc_gen_reloc.  Unmatched relocs can only be generated by use of explicit
    relocation operators.
 
@@ -10915,7 +10915,7 @@ mips_validate_fix (struct fix *fixP, asection *seg)
 /* Apply a fixup to the object file.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 {
   bfd_byte *buf;
   long insn;
diff --git a/gas/config/tc-mips.h b/gas/config/tc-mips.h
index 9031784..e657f3c 100644
--- a/gas/config/tc-mips.h
+++ b/gas/config/tc-mips.h
@@ -107,7 +107,7 @@ extern void mips_frob_file_after_relocs (void);
 #define tc_fix_adjustable(fixp) mips_fix_adjustable (fixp)
 extern int mips_fix_adjustable (struct fix *);
 
-/* Values passed to md_apply_fix3 don't include symbol values.  */
+/* Values passed to md_apply_fix don't include symbol values.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 /* Global syms must not be resolved, to support ELF shared libraries.  */
diff --git a/gas/config/tc-mmix.c b/gas/config/tc-mmix.c
index d475c06..b169692 100644
--- a/gas/config/tc-mmix.c
+++ b/gas/config/tc-mmix.c
@@ -2365,7 +2365,7 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT sec ATTRIBUTE_UNUSED,
       if (fragP->tc_frag_data == NULL)
 	{
 	  /* We must initialize data that's supposed to be "fixed up" to
-	     avoid emitting garbage, because md_apply_fix3 won't do
+	     avoid emitting garbage, because md_apply_fix won't do
 	     anything for undefined symbols.  */
 	  md_number_to_chars (var_partp, 0, 8);
 	  tmpfixP
@@ -2413,7 +2413,7 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT sec ATTRIBUTE_UNUSED,
    Note that this function isn't called when linkrelax != 0.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT segment)
+md_apply_fix (fixS *fixP, valueT *valP, segT segment)
 {
   char *buf  = fixP->fx_where + fixP->fx_frag->fr_literal;
   /* Note: use offsetT because it is signed, valueT is unsigned.  */
@@ -2652,7 +2652,7 @@ tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixP)
 
       if (addsy == NULL || bfd_is_abs_section (addsec))
 	{
-	  /* Resolve this reloc now, as md_apply_fix3 would have done (not
+	  /* Resolve this reloc now, as md_apply_fix would have done (not
 	     called if -linkrelax).  There is no point in keeping a reloc
 	     to an absolute symbol.  No reloc that is subject to
 	     relaxation must be to an absolute symbol; difference
@@ -2852,9 +2852,9 @@ tc_gen_reloc (asection *section ATTRIBUTE_UNUSED, fixS *fixP)
 	}
       /* FALLTHROUGH.  */
 
-      /* The others are supposed to be handled by md_apply_fix3.
+      /* The others are supposed to be handled by md_apply_fix.
 	 FIXME: ... which isn't called when -linkrelax.  Move over
-	 md_apply_fix3 code here for everything reasonable.  */
+	 md_apply_fix code here for everything reasonable.  */
     badop:
     default:
       as_bad_where
@@ -3267,10 +3267,10 @@ mmix_force_relocation (fixS *fixP)
   if (linkrelax)
     return 1;
 
-  /* All our pcrel relocations are must-keep.  Note that md_apply_fix3 is
+  /* All our pcrel relocations are must-keep.  Note that md_apply_fix is
      called *after* this, and will handle getting rid of the presumed
      reloc; a relocation isn't *forced* other than to be handled by
-     md_apply_fix3 (or tc_gen_reloc if linkrelax).  */
+     md_apply_fix (or tc_gen_reloc if linkrelax).  */
   if (fixP->fx_pcrel)
     return 1;
 
diff --git a/gas/config/tc-mn10200.c b/gas/config/tc-mn10200.c
index d348a2c..44fd210 100644
--- a/gas/config/tc-mn10200.c
+++ b/gas/config/tc-mn10200.c
@@ -738,7 +738,7 @@ md_begin (void)
       op++;
     }
 
-  /* This is both a simplification (we don't have to write md_apply_fix3)
+  /* This is both a simplification (we don't have to write md_apply_fix)
      and support for future optimizations (branch shortening and similar
      stuff in the linker.  */
   linkrelax = 1;
@@ -847,7 +847,7 @@ md_pcrel_from (fixS *fixp)
 }
 
 void
-md_apply_fix3 (fixS * fixP, valueT * valP ATTRIBUTE_UNUSED, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS * fixP, valueT * valP ATTRIBUTE_UNUSED, segT seg ATTRIBUTE_UNUSED)
 {
   /* We shouldn't ever get here because linkrelax is nonzero.  */
   abort ();
diff --git a/gas/config/tc-mn10300.c b/gas/config/tc-mn10300.c
index 90dd123..d9124d8 100644
--- a/gas/config/tc-mn10300.c
+++ b/gas/config/tc-mn10300.c
@@ -2452,7 +2452,7 @@ md_pcrel_from (fixp)
 }
 
 void
-md_apply_fix3 (fixP, valP, seg)
+md_apply_fix (fixP, valP, seg)
      fixS * fixP;
      valueT * valP;
      segT seg;
diff --git a/gas/config/tc-msp430.c b/gas/config/tc-msp430.c
index a01cf47..3f2ba84 100644
--- a/gas/config/tc-msp430.c
+++ b/gas/config/tc-msp430.c
@@ -1818,7 +1818,7 @@ md_pcrel_from_section (fixS * fixp, segT sec)
    value in the object file.  */
 
 void
-md_apply_fix3 (fixS * fixp, valueT * valuep, segT seg)
+md_apply_fix (fixS * fixp, valueT * valuep, segT seg)
 {
   unsigned char * where;
   unsigned long insn;
diff --git a/gas/config/tc-ns32k.c b/gas/config/tc-ns32k.c
index 0041c19..1b35fb6 100644
--- a/gas/config/tc-ns32k.c
+++ b/gas/config/tc-ns32k.c
@@ -2012,7 +2012,7 @@ md_fix_pcrel_adjust (fixS *fixP)
    They all get called from here.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
 {
   long val = * (long *) valP;
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
diff --git a/gas/config/tc-openrisc.h b/gas/config/tc-openrisc.h
index faa2007..22d2be8 100644
--- a/gas/config/tc-openrisc.h
+++ b/gas/config/tc-openrisc.h
@@ -47,10 +47,10 @@ extern const char openrisc_comment_chars [];
 /* We don't need to handle .word strangely.  */
 #define WORKING_DOT_WORD
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
-#define md_apply_fix3 gas_cgen_md_apply_fix3
+#define md_apply_fix gas_cgen_md_apply_fix
 
 extern bfd_boolean openrisc_fix_adjustable (struct fix *);
 #define tc_fix_adjustable(FIX) openrisc_fix_adjustable (FIX)
diff --git a/gas/config/tc-or32.c b/gas/config/tc-or32.c
index 5794047..f8790db 100644
--- a/gas/config/tc-or32.c
+++ b/gas/config/tc-or32.c
@@ -902,7 +902,7 @@ md_number_to_chars (char *buf, valueT val, int n)
 
 #ifdef BFD_ASSEMBLER
 void
-md_apply_fix3 (fixS * fixP, valueT * val, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS * fixP, valueT * val, segT seg ATTRIBUTE_UNUSED)
 {
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
   long t_val;
@@ -998,7 +998,7 @@ md_apply_fix3 (fixS * fixP, valueT * val, segT seg ATTRIBUTE_UNUSED)
 }
 #else
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 {
   long val = *valP;
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
diff --git a/gas/config/tc-or32.h b/gas/config/tc-or32.h
index 8ffe8a6..d2bac3e 100644
--- a/gas/config/tc-or32.h
+++ b/gas/config/tc-or32.h
@@ -55,7 +55,7 @@ extern int or32_unrecognized_line (int);
 #define EXTERN_FORCE_RELOC 0
 
 #ifdef OBJ_ELF
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 #endif
 
diff --git a/gas/config/tc-pdp11.c b/gas/config/tc-pdp11.c
index 5269a92..a0057f1 100644
--- a/gas/config/tc-pdp11.c
+++ b/gas/config/tc-pdp11.c
@@ -230,7 +230,7 @@ md_number_to_chars (char con[], valueT value, int nbytes)
    that they reference.  Knows about order of bytes in address.  */
 
 void
-md_apply_fix3 (fixS *fixP,
+md_apply_fix (fixS *fixP,
 	       valueT * valP,
 	       segT seg ATTRIBUTE_UNUSED)
 {
@@ -1400,7 +1400,7 @@ tc_gen_reloc (asection *section ATTRIBUTE_UNUSED,
   *reloc->sym_ptr_ptr = symbol_get_bfdsym (fixp->fx_addsy);
   reloc->address = fixp->fx_frag->fr_address + fixp->fx_where;
 
-  /* This is taken account for in md_apply_fix3().  */
+  /* This is taken account for in md_apply_fix().  */
   reloc->addend = -symbol_get_bfdsym (fixp->fx_addsy)->section->vma;
 
   switch (fixp->fx_r_type)
diff --git a/gas/config/tc-pj.c b/gas/config/tc-pj.c
index 1d3e3df..dff2314 100644
--- a/gas/config/tc-pj.c
+++ b/gas/config/tc-pj.c
@@ -410,7 +410,7 @@ PJ options:\n\
 /* Apply a fixup to the object file.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
 {
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
   long val = *valP;
diff --git a/gas/config/tc-pj.h b/gas/config/tc-pj.h
index a022ad1..8ca8f5f 100644
--- a/gas/config/tc-pj.h
+++ b/gas/config/tc-pj.h
@@ -52,7 +52,7 @@ arelent *tc_gen_reloc (asection *, struct fix *);
    visible symbols can be overridden.  */
 #define EXTERN_FORCE_RELOC 0
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 #define tc_fix_adjustable(FIX) 					\
diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c
index 863f09f..3a8e4ce 100644
--- a/gas/config/tc-ppc.c
+++ b/gas/config/tc-ppc.c
@@ -2651,7 +2651,7 @@ md_assemble (str)
      BFD_RELOC_UNUSED plus the operand index.  This lets us easily
      handle fixups for any operand type, although that is admittedly
      not a very exciting feature.  We pick a BFD reloc type in
-     md_apply_fix3.  */
+     md_apply_fix.  */
   for (i = 0; i < fc; i++)
     {
       const struct powerpc_operand *operand;
@@ -5510,7 +5510,7 @@ ppc_fix_adjustable (fix)
    fixup.  */
 
 void
-md_apply_fix3 (fixP, valP, seg)
+md_apply_fix (fixP, valP, seg)
      fixS *fixP;
      valueT * valP;
      segT seg ATTRIBUTE_UNUSED;
diff --git a/gas/config/tc-ppc.h b/gas/config/tc-ppc.h
index 0d2bd3a..a005b0d 100644
--- a/gas/config/tc-ppc.h
+++ b/gas/config/tc-ppc.h
@@ -234,7 +234,7 @@ extern const char *ppc_comment_chars;
 #define tc_fix_adjustable(FIX) ppc_fix_adjustable (FIX)
 extern int ppc_fix_adjustable PARAMS ((struct fix *));
 
-/* Values passed to md_apply_fix3 don't include symbol values.  */
+/* Values passed to md_apply_fix don't include symbol values.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 #define tc_frob_file_before_adjust ppc_frob_file_before_adjust
diff --git a/gas/config/tc-s390.c b/gas/config/tc-s390.c
index 1674fcd..87c7a88 100644
--- a/gas/config/tc-s390.c
+++ b/gas/config/tc-s390.c
@@ -1449,7 +1449,7 @@ md_gather_operands (str, insn, opcode)
      BFD_RELOC_UNUSED plus the operand index.  This lets us easily
      handle fixups for any operand type, although that is admittedly
      not a very exciting feature.  We pick a BFD reloc type in
-     md_apply_fix3.  */
+     md_apply_fix.  */
   for (i = 0; i < fc; i++)
     {
 
@@ -1957,7 +1957,7 @@ tc_s390_force_relocation (fixp)
    fixup.  */
 
 void
-md_apply_fix3 (fixP, valP, seg)
+md_apply_fix (fixP, valP, seg)
      fixS *fixP;
      valueT *valP;
      segT seg ATTRIBUTE_UNUSED;
diff --git a/gas/config/tc-s390.h b/gas/config/tc-s390.h
index 6fd4066..b421fa6 100644
--- a/gas/config/tc-s390.h
+++ b/gas/config/tc-s390.h
@@ -39,7 +39,7 @@ extern int tc_s390_force_relocation PARAMS ((struct fix *));
 #define tc_fix_adjustable(X)  tc_s390_fix_adjustable(X)
 extern int tc_s390_fix_adjustable PARAMS ((struct fix *));
 
-/* Values passed to md_apply_fix3 don't include symbol values.  */
+/* Values passed to md_apply_fix don't include symbol values.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 /* The target BFD architecture.  */
diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c
index e02d40a..b8248a1 100644
--- a/gas/config/tc-sh.c
+++ b/gas/config/tc-sh.c
@@ -3415,7 +3415,7 @@ sh_frob_file (void)
 }
 
 /* Called after relaxing.  Set the correct sizes of the fragments, and
-   create relocs so that md_apply_fix3 will fill in the correct values.  */
+   create relocs so that md_apply_fix will fill in the correct values.  */
 
 void
 #ifdef BFD_ASSEMBLER
@@ -3794,7 +3794,7 @@ sh_elf_final_processing (void)
 /* Apply a fixup to the object file.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 {
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
   int lowbyte = target_big_endian ? 1 : 0;
@@ -4090,7 +4090,7 @@ md_apply_fix3 (fixS *fixP, valueT *valP, segT seg ATTRIBUTE_UNUSED)
 
     default:
 #ifdef HAVE_SH64
-      shmedia_md_apply_fix3 (fixP, valP);
+      shmedia_md_apply_fix (fixP, valP);
       return;
 #else
       abort ();
@@ -4349,7 +4349,7 @@ sh_coff_reloc_mangle (segment_info_type *seg, fixS *fix,
     {
       /* We can't store the offset in the object file, since this
 	 reloc does not take up any space, so we store it in r_offset.
-	 The fx_addnumber field was set in md_apply_fix3.  */
+	 The fx_addnumber field was set in md_apply_fix.  */
       intr->r_offset = fix->fx_addnumber;
     }
   else if (fix->fx_r_type == BFD_RELOC_SH_COUNT)
diff --git a/gas/config/tc-sh.h b/gas/config/tc-sh.h
index b0b4fb8..61150ae 100644
--- a/gas/config/tc-sh.h
+++ b/gas/config/tc-sh.h
@@ -212,7 +212,7 @@ extern void sh_elf_final_processing (void);
 #define tc_fix_adjustable(FIX) sh_fix_adjustable(FIX)
 extern bfd_boolean sh_fix_adjustable (struct fix *);
 
-/* Values passed to md_apply_fix3 don't include symbol values.  */
+/* Values passed to md_apply_fix don't include symbol values.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 /* This expression evaluates to true if the relocation is for a local object
diff --git a/gas/config/tc-sh64.c b/gas/config/tc-sh64.c
index a7a61fb..d5e8646 100644
--- a/gas/config/tc-sh64.c
+++ b/gas/config/tc-sh64.c
@@ -39,7 +39,7 @@
    symbol" or local symbol.  */
 #define DATALABEL_SUFFIX " DL"
 
-/* See shmedia_md_apply_fix3 and shmedia_md_pcrel_from_section for usage.  */
+/* See shmedia_md_apply_fix and shmedia_md_pcrel_from_section for usage.  */
 #define SHMEDIA_MD_PCREL_FROM_FIX(FIXP) \
  ((FIXP)->fx_size + (FIXP)->fx_where + (FIXP)->fx_frag->fr_address - 4)
 
@@ -136,7 +136,7 @@ static const unsigned char shmedia_little_nop_pattern[4] =
 static void shmedia_md_begin (void);
 static int shmedia_parse_reg (char *, int *, int *, shmedia_arg_type);
 static void shmedia_md_assemble (char *);
-static void shmedia_md_apply_fix3 (fixS *, valueT *);
+static void shmedia_md_apply_fix (fixS *, valueT *);
 static int shmedia_md_estimate_size_before_relax (fragS *, segT);
 static int shmedia_init_reloc (arelent *, fixS *);
 static char *shmedia_get_operands (shmedia_opcode_info *, char *,
@@ -577,10 +577,10 @@ shmedia_init_reloc (arelent *rel, fixS *fixP)
   return 0;
 }
 
-/* Hook called from md_apply_fix3 in tc-sh.c.  */
+/* Hook called from md_apply_fix in tc-sh.c.  */
 
 static void
-shmedia_md_apply_fix3 (fixS *fixP, valueT *valp)
+shmedia_md_apply_fix (fixS *fixP, valueT *valp)
 {
   offsetT val = *valp;
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
@@ -602,7 +602,7 @@ shmedia_md_apply_fix3 (fixS *fixP, valueT *valp)
 	  /* Because write.c calls MD_PCREL_FROM_SECTION twice, we need to
 	     undo one of the adjustments, if the relocation is not
 	     actually for a symbol within the same segment (which we
-	     cannot check, because we're not called from md_apply_fix3, so
+	     cannot check, because we're not called from md_apply_fix, so
 	     we have to keep the reloc).  FIXME: This is a bug in
 	     write.c:fixup_segment affecting most targets that change
 	     ordinary relocs to pcrel relocs in md_apply_fix.  */
@@ -2736,7 +2736,7 @@ shmedia_build_Mytes (shmedia_opcode_info *opcode,
 			insn_loc);
 	    else
 	      /* This reloc-type is just temporary, so we can distinguish
-		 PTA from PT.  It is changed in shmedia_md_apply_fix3 to
+		 PTA from PT.  It is changed in shmedia_md_apply_fix to
 		 BFD_RELOC_SH_PT_16.  */
 	      insn |= shmedia_immediate_op (insn_loc, opjp, 1,
 					    opjp->reloctype == BFD_RELOC_NONE
diff --git a/gas/config/tc-sparc.c b/gas/config/tc-sparc.c
index e788977..60b5dae 100644
--- a/gas/config/tc-sparc.c
+++ b/gas/config/tc-sparc.c
@@ -2486,12 +2486,12 @@ sparc_ip (str, pinsn)
 		      goto error;
 		    }
 
-		  /* Constants that won't fit are checked in md_apply_fix3
+		  /* Constants that won't fit are checked in md_apply_fix
 		     and bfd_install_relocation.
 		     ??? It would be preferable to install the constants
 		     into the insn here and save having to create a fixS
 		     for each one.  There already exists code to handle
-		     all the various cases (e.g. in md_apply_fix3 and
+		     all the various cases (e.g. in md_apply_fix and
 		     bfd_install_relocation) so duplicating all that code
 		     here isn't right.  */
 		}
@@ -2879,7 +2879,7 @@ output_insn (insn, the_insn)
 				 the_insn->pcrel,
 				 the_insn->reloc);
       /* Turn off overflow checking in fixup_segment.  We'll do our
-	 own overflow checking in md_apply_fix3.  This is necessary because
+	 own overflow checking in md_apply_fix.  This is necessary because
 	 the insn size is 4 and fixup_segment will signal an overflow for
 	 large 8 byte quantities.  */
       fixP->fx_no_overflow = 1;
@@ -2998,7 +2998,7 @@ md_number_to_chars (buf, val, n)
    hold.  */
 
 void
-md_apply_fix3 (fixP, valP, segment)
+md_apply_fix (fixP, valP, segment)
      fixS *fixP;
      valueT *valP;
      segT segment ATTRIBUTE_UNUSED;
diff --git a/gas/config/tc-sparc.h b/gas/config/tc-sparc.h
index 528be9f..339a9c2 100644
--- a/gas/config/tc-sparc.h
+++ b/gas/config/tc-sparc.h
@@ -109,7 +109,7 @@ extern void sparc_handle_align PARAMS ((struct frag *));
 		       == S_GET_SEGMENT ((FIX)->fx_addsy)))		\
 	       || S_IS_LOCAL ((FIX)->fx_addsy)))))
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 /* Finish up the entire symtab.  */
diff --git a/gas/config/tc-tahoe.c b/gas/config/tc-tahoe.c
index 435283e..6bef4be 100644
--- a/gas/config/tc-tahoe.c
+++ b/gas/config/tc-tahoe.c
@@ -457,7 +457,7 @@ md_number_to_chars (char con[],		/* Return 'nbytes' of chars here.  */
 }
 
 void
-md_apply_fix3 (fixS *fixP ATTRIBUTE_UNUSED,
+md_apply_fix (fixS *fixP ATTRIBUTE_UNUSED,
 	       valueT * valP ATTRIBUTE_UNUSED,
 	       segT seg ATTRIBUTE_UNUSED)
 {
diff --git a/gas/config/tc-tic30.c b/gas/config/tc-tic30.c
index b536097..514a995 100644
--- a/gas/config/tc-tic30.c
+++ b/gas/config/tc-tic30.c
@@ -1130,7 +1130,7 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED,
 }
 
 void
-md_apply_fix3 (fixS *fixP,
+md_apply_fix (fixS *fixP,
 	       valueT *valP,
 	       segT seg ATTRIBUTE_UNUSED)
 {
diff --git a/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c
index 5430fee..a3ac44e 100644
--- a/gas/config/tc-tic4x.c
+++ b/gas/config/tc-tic4x.c
@@ -2742,7 +2742,7 @@ md_atof (type, litP, sizeP)
 }
 
 void 
-md_apply_fix3 (fixP, value, seg)
+md_apply_fix (fixP, value, seg)
      fixS *fixP;
      valueT *value;
      segT seg ATTRIBUTE_UNUSED;
diff --git a/gas/config/tc-tic54x.c b/gas/config/tc-tic54x.c
index e3eb541..da1f4bc 100644
--- a/gas/config/tc-tic54x.c
+++ b/gas/config/tc-tic54x.c
@@ -5481,7 +5481,7 @@ tic54x_cons_fix_new (frag, where, octets, exp)
    If fixp->fx_addsy is non-NULL, we'll have to generate a reloc entry.   */
 
 void
-md_apply_fix3 (fixP, valP, seg)
+md_apply_fix (fixP, valP, seg)
      fixS *fixP;
      valueT * valP;
      segT seg ATTRIBUTE_UNUSED;
diff --git a/gas/config/tc-tic80.c b/gas/config/tc-tic80.c
index 2bfa388..55d6428 100644
--- a/gas/config/tc-tic80.c
+++ b/gas/config/tc-tic80.c
@@ -802,7 +802,7 @@ TIc80 options:\n\
    To indicate that a fixup has been eliminated, set fixP->fx_done.  */
 
 void
-md_apply_fix3 (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
 {
   long val = * (long *) valP;
   char *dest = fixP->fx_frag->fr_literal + fixP->fx_where;
diff --git a/gas/config/tc-v850.c b/gas/config/tc-v850.c
index a029361..1358e95 100644
--- a/gas/config/tc-v850.c
+++ b/gas/config/tc-v850.c
@@ -2087,7 +2087,7 @@ md_assemble (char *str)
      BFD_RELOC_UNUSED plus the operand index.  This lets us easily
      handle fixups for any operand type, although that is admittedly
      not a very exciting feature.  We pick a BFD reloc type in
-     md_apply_fix3.  */
+     md_apply_fix.  */
   for (i = 0; i < fc; i++)
     {
       const struct v850_operand *operand;
@@ -2240,7 +2240,7 @@ v850_pcrel_from_section (fixS *fixp, segT section)
 }
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valueP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valueP, segT seg ATTRIBUTE_UNUSED)
 {
   valueT value = * valueP;
   char *where;
diff --git a/gas/config/tc-v850.h b/gas/config/tc-v850.h
index 4dd3c7e..639971e 100644
--- a/gas/config/tc-v850.h
+++ b/gas/config/tc-v850.h
@@ -44,7 +44,7 @@ extern bfd_boolean v850_fix_adjustable (struct fix *);
 extern int v850_force_relocation (struct fix *);
 
 #ifdef OBJ_ELF
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 #endif
 
diff --git a/gas/config/tc-vax.c b/gas/config/tc-vax.c
index 7934aea..0e0fbfa 100644
--- a/gas/config/tc-vax.c
+++ b/gas/config/tc-vax.c
@@ -316,7 +316,7 @@ md_number_to_chars (con, value, nbytes)
    that they reference.  */
 
 void				/* Knows about order of bytes in address.  */
-md_apply_fix3 (fixP, valueP, seg)
+md_apply_fix (fixP, valueP, seg)
      fixS *fixP;
      valueT *valueP;
      segT seg ATTRIBUTE_UNUSED;
diff --git a/gas/config/tc-vax.h b/gas/config/tc-vax.h
index dcfcc54..fdf23f6 100644
--- a/gas/config/tc-vax.h
+++ b/gas/config/tc-vax.h
@@ -60,7 +60,7 @@ extern const struct relax_type md_relax_table[];
 #define TC_GENERIC_RELAX_TABLE md_relax_table
 
 #ifdef BFD_ASSEMBLER
-/* Values passed to md_apply_fix3 don't include symbol values.  */
+/* Values passed to md_apply_fix don't include symbol values.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
 #define tc_fix_adjustable(FIX)					\
diff --git a/gas/config/tc-w65.c b/gas/config/tc-w65.c
index c666d56..05c95dc 100644
--- a/gas/config/tc-w65.c
+++ b/gas/config/tc-w65.c
@@ -879,7 +879,7 @@ md_section_align (segT seg, valueT size)
 }
 
 void
-md_apply_fix3 (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT * valP, segT seg ATTRIBUTE_UNUSED)
 {
   long val = * (long *) valP;
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
diff --git a/gas/config/tc-xstormy16.c b/gas/config/tc-xstormy16.c
index 1f84dda..29e0199 100644
--- a/gas/config/tc-xstormy16.c
+++ b/gas/config/tc-xstormy16.c
@@ -433,11 +433,11 @@ xstormy16_fix_adjustable (fixS * fixP)
   return TRUE;
 }
 
-/* This is a copy of gas_cgen_md_apply_fix3, with some enhancements to
+/* This is a copy of gas_cgen_md_apply_fix, with some enhancements to
    do various things that would not be valid for all ports.  */
 
 void
-xstormy16_md_apply_fix3 (fixS *   fixP,
+xstormy16_md_apply_fix (fixS *   fixP,
 			 valueT * valueP,
 			 segT     seg ATTRIBUTE_UNUSED)
 {
diff --git a/gas/config/tc-xstormy16.h b/gas/config/tc-xstormy16.h
index bfa8984..df750be 100644
--- a/gas/config/tc-xstormy16.h
+++ b/gas/config/tc-xstormy16.h
@@ -42,10 +42,10 @@
 /* We don't need to handle .word strangely.  */
 #define WORKING_DOT_WORD
 
-/* Values passed to md_apply_fix3 don't include the symbol value.  */
+/* Values passed to md_apply_fix don't include the symbol value.  */
 #define MD_APPLY_SYM_VALUE(FIX) 0
 
-#define md_apply_fix3 xstormy16_md_apply_fix3
+#define md_apply_fix xstormy16_md_apply_fix
 
 #define tc_fix_adjustable(FIX) xstormy16_fix_adjustable (FIX)
 extern bfd_boolean xstormy16_fix_adjustable (struct fix *);
diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c
index 64e10da..535a19d 100644
--- a/gas/config/tc-xtensa.c
+++ b/gas/config/tc-xtensa.c
@@ -5546,7 +5546,7 @@ xtensa_fix_adjustable (fixS *fixP)
 
 
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT seg)
+md_apply_fix (fixS *fixP, valueT *valP, segT seg)
 {
   char *const fixpos = fixP->fx_frag->fr_literal + fixP->fx_where;
   valueT val;
diff --git a/gas/config/tc-z8k.c b/gas/config/tc-z8k.c
index cb9e2e4..ca80fe3 100644
--- a/gas/config/tc-z8k.c
+++ b/gas/config/tc-z8k.c
@@ -1410,7 +1410,7 @@ md_section_align (segT seg, valueT size)
    has been eliminated, set fix->fx_done. If fix->fx_addsy is non-NULL,
    we will have to generate a reloc entry.  */
 void
-md_apply_fix3 (fixS *fixP, valueT *valP, segT segment ATTRIBUTE_UNUSED)
+md_apply_fix (fixS *fixP, valueT *valP, segT segment ATTRIBUTE_UNUSED)
 {
   long val = * (long *) valP;
   char *buf = fixP->fx_where + fixP->fx_frag->fr_literal;
@@ -1517,7 +1517,7 @@ md_apply_fix3 (fixS *fixP, valueT *valP, segT segment ATTRIBUTE_UNUSED)
       break;
 
     default:
-      printf(_("md_apply_fix3: unknown r_type 0x%x\n"), fixP->fx_r_type);
+      printf(_("md_apply_fix: unknown r_type 0x%x\n"), fixP->fx_r_type);
       abort ();
     }