[SCM] archer-jankratochvil-ifunc: Merge branch 'relatedbpt-type-findpcpart-fmt-reader-bpt-test' into archer-jankratochvil-ifunc

[jkratoch@sourceware.org]

The branch, archer-jankratochvil-ifunc has been updated
       via  b6def1400072b7845e6897c730c7140964f8b240 (commit)
       via  4725b915226faab0d250fa2a4aa07d84621cefaf (commit)
       via  e1f3a937441c3f784b8d042632cad5d442228914 (commit)
       via  bd594e5b34e261cd8fbb294b7a5f7cddf42bfda7 (commit)
      from  45b6ad3b17d0211312f13f944d09fd1766682b58 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit b6def1400072b7845e6897c730c7140964f8b240
Merge: 45b6ad3 4725b91
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Mar 19 13:58:00 2011 +0100

    Merge branch 'relatedbpt-type-findpcpart-fmt-reader-bpt-test' into archer-jankratochvil-ifunc

commit 4725b915226faab0d250fa2a4aa07d84621cefaf
Merge: 9c7e1fb e1f3a93
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Mar 19 13:57:21 2011 +0100

    Merge branch 'relatedbpt-type-findpcpart-fmt-reader-bpt' into relatedbpt-type-findpcpart-fmt-reader-bpt-test

commit e1f3a937441c3f784b8d042632cad5d442228914
Merge: 6c08871 bd594e5
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Mar 19 13:57:21 2011 +0100

    Merge branch 'relatedbpt-type-findpcpart-fmt-reader' into relatedbpt-type-findpcpart-fmt-reader-bpt

commit bd594e5b34e261cd8fbb294b7a5f7cddf42bfda7
Author: Jan Kratochvil <jan.kratochvil@redhat.com>
Date:   Sat Mar 19 13:57:15 2011 +0100

    foo

-----------------------------------------------------------------------

Summary of changes:
 gdb/elfread.c |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

First 500 lines of diff:
diff --git a/gdb/elfread.c b/gdb/elfread.c
index 7ff83e9..64779f3 100644
--- a/gdb/elfread.c
+++ b/gdb/elfread.c
@@ -857,22 +857,21 @@ elf_gnu_ifunc_resolve_name (const char *function_name,
 			    CORE_ADDR *function_address_p)
 {
   struct minimal_symbol *msym;
+  struct gdbarch *gdbarch;
 
   msym = gnu_ifunc_resolve_by_cache (function_name);
-  if (msym != NULL)
-    {
-      *function_address_p = SYMBOL_VALUE_ADDRESS (msym);
-      return 1;
-    }
+  if (msym == NULL)
+    msym = gnu_ifunc_resolve_by_got (function_name);
 
-  msym = gnu_ifunc_resolve_by_got (function_name);
-  if (msym != NULL)
-    {
-      *function_address_p = SYMBOL_VALUE_ADDRESS (msym);
-      return 1;
-    }
+  if (msym == NULL)
+    return 0;
 
-  return 0;
+  gdbarch = SYMBOL_OBJ_SECTION (msym)->objfile->gdbarch;
+  *function_address_p = SYMBOL_VALUE_ADDRESS (msym);
+  *function_address_p
+    = gdbarch_convert_from_func_ptr_addr (gdbarch, *function_address_p,
+					  &current_target);
+  return 1;
 }
 
 /* Call STT_GNU_IFUNC - a function returning addresss of a real function to


hooks/post-receive
--
Repository for Project Archer.