gdb/printcmd.c: Fix printing of Thumb minimal symbols.

In build_address_symbolic we call gdbarch_addr_bits_remove for
symbols in the symbol table but not for minimal symbols. This
causes a failure in gdb.cp/virtfunc.exp on ARM, as the address
of the virtual thunk is given an offset of 1 when in Thumb mode.

gdb/ChangeLog:

2013-06-07  Will Newton  <will.newton@linaro.org>

	* printcmd.c (build_address_symbolic): Call
	gdbarch_addr_bits_remove for text minimal symbols.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 81abaab3a7ed3856dbf7e230f2563eaaca1c5102..6661193c15b62fbb5e624bbaab86f4ea98355b3a 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-07  Will Newton  <will.newton@linaro.org>
+
+       * printcmd.c (build_address_symbolic): Call
+       gdbarch_addr_bits_remove for text minimal symbols.
+
 2013-06-07  Will Newton  <will.newton@linaro.org>
 
        * MAINTAINERS: Add myself to Write After Approval.

diff --git a/gdb/printcmd.c b/gdb/printcmd.c
index 7beb334c5e265762af913d8b47e584a64eb14b56..99d4dba3e5c86387d1b93a8a28b6520cdcc8ee41 100644 (file)
--- a/gdb/printcmd.c
+++ b/gdb/printcmd.c
@@ -689,6 +689,17 @@ build_address_symbolic (struct gdbarch *gdbarch,
     {
       if (SYMBOL_VALUE_ADDRESS (msymbol) > name_location || symbol == NULL)
        {
+         /* If this is a function (i.e. a code address), strip out any
+            non-address bits.  For instance, display a pointer to the
+            first instruction of a Thumb function as <function>; the
+            second instruction will be <function+2>, even though the
+            pointer is <function+3>.  This matches the ISA behavior.  */
+         if (MSYMBOL_TYPE (msymbol) == mst_text
+             || MSYMBOL_TYPE (msymbol) == mst_text_gnu_ifunc
+             || MSYMBOL_TYPE (msymbol) == mst_file_text
+             || MSYMBOL_TYPE (msymbol) == mst_solib_trampoline)
+           addr = gdbarch_addr_bits_remove (gdbarch, addr);
+
          /* The msymbol is closer to the address than the symbol;
             use the msymbol instead.  */
          symbol = 0;