* arm-dis.c (print_insn): Only look for a mapping symbol in the section

	being disassembled.

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 1256c4c8a16dc4fa4b917a8a0b33392bad9c1c8b..b2ad6fb2e3ebb72b88a6e90bd586a89e9fe422d5 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-20  Richard Earnshaw  <rearnsha@arm.com>
+
+       * arm-dis.c (print_insn): Only look for a mapping symbol in the section
+       being disassembled.
+
 2007-04-19  Alan Modra  <amodra@bigpond.net.au>
 
        * Makefile.am: Run "make dep-am".

diff --git a/opcodes/arm-dis.c b/opcodes/arm-dis.c
index b570ac0ae2e04735484cc8ab4cf69a58b60171a4..a782d22b2c7dcb7f2673c41f149f3956bf66a9bc 100644 (file)
--- a/opcodes/arm-dis.c
+++ b/opcodes/arm-dis.c
@@ -1,6 +1,6 @@
 /* Instruction printing code for the ARM
    Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-   Free Software Foundation, Inc.
+   2007, Free Software Foundation, Inc.
    Contributed by Richard Earnshaw (rwe@pegasus.esprit.ec.org)
    Modification by James G. Smith (jsmith@cygnus.co.uk)
 
@@ -3982,7 +3982,9 @@ print_insn (bfd_vma pc, struct disassemble_info *info, bfd_boolean little)
          addr = bfd_asymbol_value (info->symtab[n]);
          if (addr > pc)
            break;
-         if (get_sym_code_type (info, n, &type))
+         if ((info->section == NULL
+              || info->section == info->symtab[n]->section)
+             && get_sym_code_type (info, n, &type))
            {
              last_sym = n;
              found = TRUE;