linespec: keep function descriptors during minimal symbol search

When discarding data (minimal) symbols, we need to be careful to
not throw away the function descriptors.  This makes a difference
on platforms where these descriptors are used and live in a data
section.

gdb/ChangeLog:

        * linespec.c (add_minsym): Preserve function descriptors.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 374a44502060ea2376929fdd3d919dc5f8144903..f610db2ada4226248e61f3411e29ff5e4040c518 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-04  Joel Brobecker  <brobecker@adacore.com>
+
+       * linespec.c (add_minsym): Preserve function descriptors.
+
 2012-01-04  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * breakpoint.c (all_locations_are_pending): Consider locations

diff --git a/gdb/linespec.c b/gdb/linespec.c
index 3505af966c4b7cab2701a3859072d4b5a131d12c..6276a3ae8be36da8fd385526ab88b5181c5d46da 100644 (file)
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -2799,7 +2799,17 @@ add_minsym (struct minimal_symbol *minsym, void *d)
        case mst_abs:
        case mst_file_data:
        case mst_file_bss:
-       return;
+         {
+           /* Make sure this minsym is not a function descriptor
+              before we decide to discard it.  */
+           struct gdbarch *gdbarch = info->objfile->gdbarch;
+           CORE_ADDR addr = gdbarch_convert_from_func_ptr_addr
+                              (gdbarch, SYMBOL_VALUE_ADDRESS (minsym),
+                               &current_target);
+
+           if (addr == SYMBOL_VALUE_ADDRESS (minsym))
+             return;
+         }
       }
 
   mo.minsym = minsym;