diff options
| author | Eric Andersen <andersen@codepoet.org> | 2004-02-14 11:30:39 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2004-02-14 11:30:39 +0000 |
| commit | deec524084aa2faad66f7aae7e8b5ba1ab6789fd (patch) | |
| tree | 8498414c429c57ce6b93a49c265aebcb8180c312 /ldso/include | |
| parent | 7bd4a2f4aaabca0e46015fe0216c086c7f61f1d4 (diff) | |
Joakim Tjernlund writes:
Hi it is me again.
This is the latest ldso patch. the NEW weak symbol handling works now
with a little special handling in _dl_find_hash(). You get to chose
if you want the new or old handling :)
There was 2 missing _dl_check_if_named_library_is_loaded() calls in _dlopen().
I then disabled the _dl_check_if_named_library_is_loaded() in dl-elf.c since
it is rendundant.
Question, why does some _dl_linux_resolver(), like i386, have 2 calls
to _dl_find_hash()? I think that is wrong, isn't it?
I really hope you can check this out soon ...
Diffstat (limited to 'ldso/include')
| -rw-r--r-- | ldso/include/dl-elf.h | 13 | ||||
| -rw-r--r-- | ldso/include/dl-hash.h | 3 |
2 files changed, 14 insertions, 2 deletions
diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h index 4cab5505f..b0a475319 100644 --- a/ldso/include/dl-elf.h +++ b/ldso/include/dl-elf.h @@ -92,6 +92,19 @@ extern int _dl_fixup(struct dyn_elf *rpnt, int flag); # define UNSUPPORTED_RELOC_STR "RELA" #endif +/* Reloc type classes as returned by elf_machine_type_class(). + ELF_RTYPE_CLASS_PLT means this reloc should not be satisfied by + some PLT symbol, ELF_RTYPE_CLASS_COPY means this reloc should not be + satisfied by any symbol in the executable. Some architectures do + not support copy relocations. In this case we define the macro to + zero so that the code for handling them gets automatically optimized + out. */ +#define ELF_RTYPE_CLASS_PLT 1 +#ifndef DL_NO_COPY_RELOCS +# define ELF_RTYPE_CLASS_COPY 2 +#else +# define ELF_RTYPE_CLASS_COPY 0 +#endif /* Convert between the Linux flags for page protections and the diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h index 2d41e009a..767c2ac46 100644 --- a/ldso/include/dl-hash.h +++ b/ldso/include/dl-hash.h @@ -67,9 +67,8 @@ extern struct elf_resolve * _dl_add_elf_hash_table(const char * libname, char * loadaddr, unsigned long * dynamic_info, unsigned long dynamic_addr, unsigned long dynamic_size); -enum caller_type{symbolrel=0,copyrel=1,resolver=2}; extern char * _dl_find_hash(const char * name, struct dyn_elf * rpnt1, - struct elf_resolve * f_tpnt, enum caller_type); + int type_class); extern int _dl_linux_dynamic_link(void); |