X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=gas%2Fconfig%2Ftc-m32r.c;h=7a810d44384f61537e520059f94d8d66cb6982bf;hb=1cd8ff388206c878587561b6339d147fda189aa7;hp=b3d2bc4e60f13eeb74046cb2202111f7eccdf38a;hpb=002de68b31ef4c555e876fa30d1d154bc60d8e45;p=binutils-gdb.git

diff --git a/gas/config/tc-m32r.c b/gas/config/tc-m32r.c
index b3d2bc4e60f..7a810d44384 100644
--- a/gas/config/tc-m32r.c
+++ b/gas/config/tc-m32r.c
@@ -20,8 +20,8 @@
    Boston, MA 02111-1307, USA.  */
 
 #include <stdio.h>
-#include <ctype.h>
 #include "as.h"
+#include "safe-ctype.h"
 #include "subsegs.h"
 #include "symcat.h"
 #include "opcodes/m32r-desc.h"
@@ -555,7 +555,7 @@ md_begin ()
 
   allow_m32rx (enable_m32rx);
 
-  gas_cgen_initialize_saved_fixups_array();
+  gas_cgen_initialize_saved_fixups_array ();
 }
 
 #define OPERAND_IS_COND_BIT(operand, indices, index) \
@@ -819,15 +819,14 @@ assemble_two_insns (str, str2, parallel_p)
   {
     char *s2 = str;
 
-    while (isspace (*s2++))
+    while (ISSPACE (*s2++))
       continue;
 
     --s2;
 
-    while (isalnum (*s2))
+    while (ISALNUM (*s2))
       {
-	if (isupper ((unsigned char) *s2))
-	  *s2 = tolower (*s2);
+	*s2 = TOLOWER (*s2);
 	s2++;
       }
   }
@@ -1564,7 +1563,6 @@ md_convert_frag (abfd, sec, fragP)
     {
       /* Address we want to reach in file space.  */
       target_address = S_GET_VALUE (fragP->fr_symbol) + fragP->fr_offset;
-      target_address += symbol_get_frag (fragP->fr_symbol)->fr_address;
       addend = (target_address - (opcode_address & -4)) >> 2;
     }
 
@@ -1712,7 +1710,7 @@ m32r_cgen_record_fixup_exp (frag, where, insn, length, operand, opinfo, exp)
 #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_fix and
+   the corresponding LO16 reloc.  This is called before md_apply_fix3 and
    tc_gen_reloc.  */
 
 void