diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-11-28 21:09:47 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-11-28 21:09:47 +0100 |
| commit | 57f6cce72c889f2e7b342e87a565a064320a6ee2 (patch) | |
| tree | 5466406472918d3adb63398f5fb9ea1511a5e73f /ldso/include | |
| parent | 4ec89b87bc0eea8d9ca6b50564d12eeb3b1b0119 (diff) | |
| parent | 5dea871ac73ef4608022c058b50adc946917f9b9 (diff) | |
Merge commit 'origin/master' into prelink
Conflicts:
ldso/include/dl-hash.h
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'ldso/include')
| -rw-r--r-- | ldso/include/dl-hash.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h index e138e1d4b..b1927e49a 100644 --- a/ldso/include/dl-hash.h +++ b/ldso/include/dl-hash.h @@ -158,15 +158,15 @@ extern struct elf_resolve * _dl_add_elf_hash_table(const char * libname, /* Only need extra arg with some configurations */ #if !((defined(USE_TLS) && USE_TLS) || defined __FDPIC__) -# define _dl_lookup_hash(n, r, m, s, c, t) _dl_lookup_hash(n, r, m, s, c) +# define _dl_lookup_hash(n, r, m, s, c, tpnt) _dl_lookup_hash(n, r, m, s, c) +# define _dl_find_hash(n, r, m, s, t, tpntp) _dl_find_hash(n, r, m, s, t) #endif extern char *_dl_lookup_hash(const char *name, struct r_scope_elem *scope, - struct elf_resolve *mytpnt, struct sym_val *symbol, int type_class, - struct elf_resolve **tpntp); - + struct elf_resolve *mytpnt, struct sym_val *symbol, int type_class, + struct elf_resolve **tpntp); static __always_inline char *_dl_find_hash(const char *name, struct r_scope_elem *scope, - struct elf_resolve *mytpnt, struct sym_val *symbol, int type_class, - struct elf_resolve **tpntp) + struct elf_resolve *mytpnt, struct sym_val *symbol, int type_class, + struct elf_resolve **tpntp) { return _dl_lookup_hash(name, scope, mytpnt, symbol, type_class, tpntp); } |