* bfd/coff-arm.c (coff_arm_relocate_section)

        (record_thumb_to_arm_glue, bfd_arm_process_before_allocation):
        Change member name class to symbol_class.
        * bfd/coff-i960.c (coff_i960_relocate_section) Rename variable
        class to class_val. Change member name class to symbol_class.
        * bfd/coff-rs6000.c (_bfd_xcoff_swap_aux_in)
        (_bfd_xcoff_swap_aux_out): Rename arguments class to in_class.
        * bfd/coff-stgo32.c (adjust_aux_in_post)
        (adjust_aux_out_pre, adjust_aux_out_post): Rename arguments class
        to in_class.
        * bfd/coff64-rs6000.c (_bfd_xcoff64_swap_aux_in)
        (_bfd_xcoff64_swap_aux_out): Rename arguments class to in_class.
        * bfd/coffcode.h (coff_pointerize_aux_hook): Rename variable class
        to n_sclass.
        * bfd/coffgen.c (coff_write_symbol, coff_pointerize_aux): Rename
        variables named class to n_sclass. (coff_write_symbols): Rename
        variable class to sym_class. (bfd_coff_set_symbol_class): Rename
        argument class to symbol_class.
        * bfd/cofflink.c (_bfd_coff_link_hash_newfunc)
        (coff_link_add_symbols, _bfd_coff_link_input_bfd)
        (_bfd_coff_write_global_sym, _bfd_coff_generic_relocate_section):
        Update code to use renamed members.
        * bfd/coffswap.h (coff_swap_aux_in, coff_swap_aux_out): Rename
        argument class to in_class.
        * bfd/libcoff-in.h (struct coff_link_hash_entry, struct
        coff_debug_merge_type) Renamed members class to symbol_class and
        type_class.
        * bfd/libcoff.h Regenerated.
        * bfd/peXXigen.c: (_bfd_XXi_swap_aux_in, _bfd_XXi_swap_aux_out):
        Rename argument class to in_class.
        * bfd/pef.c (bfd_pef_parse_imported_symbol): Update code to use
        renamed members.
        * bfd/pef.h (struct bfd_pef_imported_symbol): Changed name of
        member class to symbol_class.
        * binutils/ieee.c (ieee_read_cxx_misc, ieee_read_cxx_class)
        (ieee_read_reference): Rename variables named class to cxxclass.
        * gas/config/tc-arc.c (struct syntax_classes): Rename member class
        to s_class. (arc_extinst): Rename variable class to
        s_class. Update code to use renamed members.
        * gas/config/tc-mips.c (insn_uses_reg): Rename argument class to
        regclass.
        * gas/config/tc-ppc.c (ppc_csect, ppc_change_csect, ppc_function)
        (ppc_tc, ppc_is_toc_sym, ppc_symbol_new_hook, ppc_frob_label)
        (ppc_fix_adjustable, md_apply_fix): Update code to use renamed
        members.
        * gas/config/tc-ppc.h (struct ppc_tc_sy): Change name of member
        from class to symbol_class. (OBJ_COPY_SYMBOL_ATTRIBUTES): Update
        code to use renamed members.
        * gas/config/tc-score.c (s3_adjust_paritybit): Rename argument
        class to i_class.
        * gas/config/tc-score7.c (s7_adjust_paritybit): Rename argument
        class to i_class.
        * gprof/corefile.c (core_create_function_syms): Rename variable
        class to cxxclass.
        * include/coff/ti.h (GET_LNSZ_SIZE, PUT_LNSZ_SIZE): Updated name
        of class variable to in_class to match changes in function that
        use this macro.
        * include/opcode/ia64.h (struct ia64_operand): Renamed member
        class to op_class
        * ld/emultempl/elf32.em (gld${EMULATION_NAME}_load_symbols)
        (gld${EMULATION_NAME}_try_needed): Rename variable class to
        link_class
        * opcodes/ia64-dis.c (print_insn_ia64): Update code to use renamed
        member.
        * opcodes/m88k-dis.c (m88kdis): Rename variable class to in_class.
        * opcodes/tic80-opc.c (tic80_symbol_to_value)
        (tic80_value_to_symbol): Rename argument class to symbol_class.

4 files changed, 21 insertions, 14 deletions

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index e36675aeadc..b7603b4ead2 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-05  Martin Thuresson  <martin@mtme.org>
+
+	* ia64-dis.c (print_insn_ia64): Update code to use renamed member.
+	* m88k-dis.c (m88kdis): Rename variable class to in_class.
+	* tic80-opc.c (tic80_symbol_to_value, tic80_value_to_symbol):
+	Rename argument class to symbol_class.
+
 2009-09-04  Jie Zhang  <jie.zhang@analog.com>
 
 	* bfin-dis.c (decode_pseudodbg_assert_0): Change according
diff --git a/opcodes/ia64-dis.c b/opcodes/ia64-dis.c
index 4c1c7f80558..13ee1949258 100644
--- a/opcodes/ia64-dis.c
+++ b/opcodes/ia64-dis.c
@@ -183,7 +183,7 @@ print_insn_ia64 (bfd_vma memaddr, struct disassemble_info *info)
 	    }
 	}
 
-	switch (odesc->class)
+	switch (odesc->op_class)
 	  {
 	  case IA64_OPND_CLASS_CST:
 	    (*info->fprintf_func) (info->stream, "%s", odesc->str);
diff --git a/opcodes/m88k-dis.c b/opcodes/m88k-dis.c
index 73fc62fa1ec..181ae3076c2 100644
--- a/opcodes/m88k-dis.c
+++ b/opcodes/m88k-dis.c
@@ -696,7 +696,7 @@ m88kdis (bfd_vma pc,
   unsigned int opcode;
   const HASHTAB *entry_ptr;
   int opmask;
-  unsigned int class;
+  unsigned int in_class;
 
   if (! ihashtab_initialized)
     {
@@ -706,17 +706,17 @@ m88kdis (bfd_vma pc,
 
   /* Create the appropriate mask to isolate the opcode.  */
   opmask = DEFMASK;
-  class = instruction & DEFMASK;
-  if ((class >= SFU0) && (class <= SFU7))
+  in_class = instruction & DEFMASK;
+  if ((in_class >= SFU0) && (in_class <= SFU7))
     {
       if (instruction < SFU1)
 	opmask = CTRLMASK;
       else
 	opmask = SFUMASK;
     }
-  else if (class == RRR)
+  else if (in_class == RRR)
     opmask = RRRMASK;
-  else if (class == RRI10)
+  else if (in_class == RRI10)
     opmask = RRI10MASK;
 
   /* Isolate the opcode.  */
diff --git a/opcodes/tic80-opc.c b/opcodes/tic80-opc.c
index 86b12548c15..70e38ec511f 100644
--- a/opcodes/tic80-opc.c
+++ b/opcodes/tic80-opc.c
@@ -219,7 +219,7 @@ const int tic80_num_predefined_symbols = sizeof (tic80_predefined_symbols) / siz
    in CLASS, and translates it to a numeric value, which it returns.
 
    If CLASS is zero, any symbol that matches NAME is translated.  If
-   CLASS is non-zero, then only a symbol that has class CLASS is
+   CLASS is non-zero, then only a symbol that has symbol_class CLASS is
    matched.
 
    If no translation is possible, it returns -1, a value not used by
@@ -233,9 +233,9 @@ const int tic80_num_predefined_symbols = sizeof (tic80_predefined_symbols) / siz
  */
 
 int
-tic80_symbol_to_value (name, class)
+tic80_symbol_to_value (name, symbol_class)
      char *name;
-     int class;
+     int symbol_class;
 {
   const struct predefined_symbol *pdsp;
   int low = 0;
@@ -259,7 +259,7 @@ tic80_symbol_to_value (name, class)
       else 
 	{
 	  pdsp = &tic80_predefined_symbols[middle];
-	  if ((class == 0) || (class & PDS_VALUE (pdsp)))
+	  if ((symbol_class == 0) || (symbol_class & PDS_VALUE (pdsp)))
 	    {
 	      rtnval = PDS_VALUE (pdsp);
 	    }
@@ -271,13 +271,13 @@ tic80_symbol_to_value (name, class)
 }
 
 /* This function takes a value VAL and finds a matching predefined
-   symbol that is in the operand class specified by CLASS.  If CLASS
+   symbol that is in the operand symbol_class specified by CLASS.  If CLASS
    is zero, the first matching symbol is returned. */
 
 const char *
-tic80_value_to_symbol (val, class)
+tic80_value_to_symbol (val, symbol_class)
      int val;
-     int class;
+     int symbol_class;
 {
   const struct predefined_symbol *pdsp;
   int ival;
@@ -291,7 +291,7 @@ tic80_value_to_symbol (val, class)
       ival = PDS_VALUE (pdsp) & ~TIC80_OPERAND_MASK;
       if (ival == val)
 	{
-	  if ((class == 0) || (class & PDS_VALUE (pdsp)))
+	  if ((symbol_class == 0) || (symbol_class & PDS_VALUE (pdsp)))
 	    {
 	      /* Found the desired match */
 	      name = PDS_NAME (pdsp);