(RESOLVE_MAP): Define.

diff --git a/elf/dl-reloc.c b/elf/dl-reloc.c
index 4c7aabe..d1537ec 100644 (file)
--- a/elf/dl-reloc.c
+++ b/elf/dl-reloc.c
@@ -70,6 +70,14 @@ _dl_relocate_object (struct link_map *l, struct r_scope_elem *scope[],
     const char *strtab = (const void *) D_PTR (l, l_info[DT_STRTAB]);
 
     /* This macro is used as a callback from the ELF_DYNAMIC_RELOCATE code.  */
+#define RESOLVE_MAP(ref, version, flags) \
+    (ELFW(ST_BIND) ((*ref)->st_info) != STB_LOCAL                            \
+     ? ((version) != NULL && (version)->hash != 0                            \
+       ? _dl_lookup_versioned_symbol (strtab + (*ref)->st_name, l, (ref),    \
+                                      scope, (version), (flags))             \
+       : _dl_lookup_symbol (strtab + (*ref)->st_name, l, (ref), scope,       \
+                            (flags)))                                        \
+     : l)
 #define RESOLVE(ref, version, flags) \
     (__builtin_expect (ELFW(ST_VISIBILITY) ((*ref)->st_other), 0) == 0       \
      ? ((version) != NULL && (version)->hash != 0                            \