TX19 uses igen by default.

[deliverable/binutils-gdb.git] / opcodes / arm-dis.c

diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index 5075eaa62adc28255b9e6d970c7ba288058946be..32112c17f4992b42c5a5c0861db6845d3e5eefac 100644 (file)
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -709,12 +709,11 @@ print_insn_big_arm (pc, info)
   unsigned char      b[4];
   long               given;
   int                status;
-  asymbol *          saved_symbol;
   coff_symbol_type * cs;
   int                is_thumb;
   
-  cs = coffsymbol (info->symbol);
-  is_thumb = 
+  cs = coffsymbol (*info->symbols);
+  is_thumb = (cs != NULL) &&
      (   cs->native->u.syment.n_sclass == C_THUMBEXT
       || cs->native->u.syment.n_sclass == C_THUMBSTAT
       || cs->native->u.syment.n_sclass == C_THUMBLABEL
@@ -767,8 +766,6 @@ print_insn_big_arm (pc, info)
       status = print_insn_arm (pc, info, given);
     }
 
-  info->symbol = saved_symbol; /* Stop displayed symbols from resetting the stored symbol */
-  
   return status;
 }
 
@@ -780,12 +777,11 @@ print_insn_little_arm (pc, info)
   unsigned char      b[4];
   long               given;
   int                status;
-  asymbol *          saved_symbol;
   coff_symbol_type * cs;
   int                is_thumb;
   
-  cs = coffsymbol (info->symbol);
-  is_thumb = 
+  cs = coffsymbol (*info->symbols);
+  is_thumb = (cs != NULL) && 
      (   cs->native->u.syment.n_sclass == C_THUMBEXT
       || cs->native->u.syment.n_sclass == C_THUMBSTAT
       || cs->native->u.syment.n_sclass == C_THUMBLABEL
@@ -811,8 +807,6 @@ print_insn_little_arm (pc, info)
 
   given = (b[0]) | (b[1] << 8) | (b[2] << 16) | (b[3] << 24);
 
-  saved_symbol = info->symbol;
-  
   if (is_thumb)
     {
       status = print_insn_thumb (pc, info, given);
@@ -822,7 +816,5 @@ print_insn_little_arm (pc, info)
       status = print_insn_arm (pc, info, given);
     }
 
-  info->symbol = saved_symbol; /* Stop displayed symbols from resetting the stored symbol */
-
   return status;
 }