1 files changed, 14 insertions, 15 deletions

diff --git a/gas/config/tc-m32r.c b/gas/config/tc-m32r.c
index 3505b3a..2368c9a 100644
--- a/gas/config/tc-m32r.c
+++ b/gas/config/tc-m32r.c
@@ -35,7 +35,7 @@ typedef struct sym_link
   symbolS *symbol;
 } sym_linkS;
 
-static sym_linkS *debug_sym_link = (sym_linkS *) 0;
+static sym_linkS *debug_sym_link = NULL;
 
 /* Structure to hold all of the different components describing
    an individual instruction.  */
@@ -609,13 +609,13 @@ expand_debug_syms (sym_linkS *syms, int align)
     return;
 
   (void) frag_align_code (align, 0);
-  for (; syms != (sym_linkS *) 0; syms = next_syms)
+  for (; syms != NULL; syms = next_syms)
     {
       symbolS *symbolP = syms->symbol;
       next_syms = syms->next;
       input_line_pointer = (char *) ".\n";
       pseudo_set (symbolP);
-      free ((char *) syms);
+      free (syms);
     }
 
   input_line_pointer = save_input_line;
@@ -627,7 +627,7 @@ m32r_flush_pending_output (void)
   if (debug_sym_link)
     {
       expand_debug_syms (debug_sym_link, 1);
-      debug_sym_link = (sym_linkS *) 0;
+      debug_sym_link = NULL;
     }
 }
 
@@ -653,7 +653,7 @@ m32r_fill_insn (int done)
   if (done && debug_sym_link)
     {
       expand_debug_syms (debug_sym_link, 1);
-      debug_sym_link = (sym_linkS *) 0;
+      debug_sym_link = NULL;
     }
 
   return 1;
@@ -911,7 +911,7 @@ assemble_two_insns (char *str1, char *str2, int parallel_p)
   fill_insn (0);
 
   first.debug_sym_link = debug_sym_link;
-  debug_sym_link = (sym_linkS *) 0;
+  debug_sym_link = NULL;
 
   /* Parse the first instruction.  */
   if (! (first.insn = m32r_cgen_assemble_insn
@@ -989,7 +989,7 @@ assemble_two_insns (char *str1, char *str2, int parallel_p)
   {
     char *s2 = str1;
 
-    while (ISSPACE (*s2++))
+    while (is_whitespace (*s2++))
       continue;
 
     --s2;
@@ -1215,7 +1215,7 @@ md_assemble (char *str)
     }
 
   insn.debug_sym_link = debug_sym_link;
-  debug_sym_link = (sym_linkS *) 0;
+  debug_sym_link = NULL;
 
   insn.insn = m32r_cgen_assemble_insn
     (gas_cgen_cpu_desc, str, &insn.fields, insn.buffer, & errmsg);
@@ -1451,7 +1451,7 @@ md_section_align (segT segment, valueT size)
 {
   int align = bfd_section_alignment (segment);
 
-  return ((size + (1 << align) - 1) & -(1 << align));
+  return (size + ((valueT) 1 << align) - 1) & -((valueT) 1 << align);
 }
 
 symbolS *
@@ -1572,8 +1572,7 @@ m32r_scomm (int ignore ATTRIBUTE_UNUSED)
 
       symbol_set_frag (symbolP, frag_now);
 
-      pfrag = frag_var (rs_org, 1, 1, (relax_substateT) 0, symbolP, size,
-			(char *) 0);
+      pfrag = frag_var (rs_org, 1, 1, 0, symbolP, size, NULL);
       *pfrag = 0;
       S_SET_SIZE (symbolP, size);
       S_SET_SEGMENT (symbolP, sbss_section);
@@ -1582,7 +1581,7 @@ m32r_scomm (int ignore ATTRIBUTE_UNUSED)
     }
   else
     {
-      S_SET_VALUE (symbolP, (valueT) size);
+      S_SET_VALUE (symbolP, size);
       S_SET_ALIGN (symbolP, align2);
       S_SET_EXTERNAL (symbolP);
       S_SET_SEGMENT (symbolP, &scom_section);
@@ -1838,7 +1837,7 @@ md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED,
 long
 md_pcrel_from_section (fixS *fixP, segT sec)
 {
-  if (fixP->fx_addsy != (symbolS *) NULL
+  if (fixP->fx_addsy != NULL
       && (! S_IS_DEFINED (fixP->fx_addsy)
 	  || S_GET_SEGMENT (fixP->fx_addsy) != sec
           || S_IS_EXTERNAL (fixP->fx_addsy)
@@ -2129,10 +2128,10 @@ m32r_fix_adjustable (fixS *fixP)
 {
   bfd_reloc_code_real_type reloc_type;
 
-  if ((int) fixP->fx_r_type >= (int) BFD_RELOC_UNUSED)
+  if (fixP->fx_r_type >= BFD_RELOC_UNUSED)
     {
       const CGEN_INSN *insn = NULL;
-      int opindex = (int) fixP->fx_r_type - (int) BFD_RELOC_UNUSED;
+      int opindex = fixP->fx_r_type - BFD_RELOC_UNUSED;
       const CGEN_OPERAND *operand =
 	cgen_operand_lookup_by_num(gas_cgen_cpu_desc, opindex);