aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hongjiu.lu@intel.com>2009-11-06 09:30:56 -0800
committerUlrich Drepper <drepper@redhat.com>2009-11-06 09:30:56 -0800
commit8608ae1f7ba31f2149f9620a1339020339eac00d (patch)
treef5e43d7d064da86a766fa86e4d5133cb4460d360
parent5b55d23611e939340d658f42212c474c8188053e (diff)
downloadglibc-8608ae1f7ba31f2149f9620a1339020339eac00d.zip
glibc-8608ae1f7ba31f2149f9620a1339020339eac00d.tar.gz
glibc-8608ae1f7ba31f2149f9620a1339020339eac00d.tar.bz2
Properly handle STT_GNU_IFUNC symbols in do_sym.
do_sym should use DL_FIXUP_VALUE_XXX macros to call IFUNC function. Otherwise, it won't compile on ia64. This patch fixes it and adds a test.
-rw-r--r--ChangeLog5
-rw-r--r--elf/dl-sym.c9
-rw-r--r--elf/ifuncmain3.c9
3 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 03efd6c..a555225 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-01 H.J. Lu <hongjiu.lu@intel.com>
+
+ * elf/dl-sym.c (do_sym): Properly handle STT_GNU_IFUNC symbols.
+ * elf/ifuncmain3.c (main): Test dlopen STT_GNU_IFUNC symbol.
+
2009-11-03 Andreas Schwab <schwab@redhat.com>
* sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Add
diff --git a/elf/dl-sym.c b/elf/dl-sym.c
index 459729f..0fa3b3a 100644
--- a/elf/dl-sym.c
+++ b/elf/dl-sym.c
@@ -193,8 +193,13 @@ RTLD_NEXT used in code not dynamically loaded"));
/* Resolve indirect function address. */
if (__builtin_expect (ELFW(ST_TYPE) (ref->st_info) == STT_GNU_IFUNC, 0))
- value
- = ((DL_FIXUP_VALUE_TYPE (*) (void)) DL_FIXUP_VALUE_ADDR (value)) ();
+ {
+ DL_FIXUP_VALUE_TYPE fixup
+ = DL_FIXUP_MAKE_VALUE (result, (ElfW(Addr)) value);
+ fixup =
+ ((DL_FIXUP_VALUE_TYPE (*) (void)) DL_FIXUP_VALUE_ADDR (fixup)) ();
+ value = (void *) DL_FIXUP_VALUE_CODE_ADDR (fixup);
+ }
#ifdef SHARED
/* Auditing checkpoint: we have a new binding. Provide the
diff --git a/elf/ifuncmain3.c b/elf/ifuncmain3.c
index 5d067cc..1574dd5 100644
--- a/elf/ifuncmain3.c
+++ b/elf/ifuncmain3.c
@@ -46,6 +46,15 @@ main (void)
return 1;
}
+ p = dlsym (h, "foo");
+ if (p == NULL)
+ {
+ printf ("symbol not found: %s\n", dlerror ());
+ return 1;
+ }
+ if ((*p) () != -1)
+ abort ();
+
f = dlsym (h, "get_foo_p");
if (f == NULL)
{