From 2ca285b098890abde89fc79bbaf69432b14f18d1 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 16 Mar 2009 02:16:30 +0000 Subject: [BZ #9733] * elf/dl-load.c (_dl_map_object_from_fd): Only call audit hooks if we are not loading a new audit library. * elf/dl-reloc (_dl_relocate_object): Third parameter is now a bitmask. Only use profiling trampoline for auditing if we are not relocating an audit library. * elf/dl-open.c (dl_open_worker): Adjust _dl_relocate_object call. * elf/rtld.c: Likewise. * sysdeps/generic/ldsodefs.h: Adjust _dl_relocate_object prototype. --- sysdeps/generic/ldsodefs.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'sysdeps/generic/ldsodefs.h') diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index e00b173f49..943369bb24 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -882,10 +882,10 @@ extern struct link_map *_dl_new_object (char *realname, const char *libname, /* Relocate the given object (if it hasn't already been). SCOPE is passed to _dl_lookup_symbol in symbol lookups. - If LAZY is nonzero, don't relocate its PLT. */ + If RTLD_LAZY is set in RELOC-MODE, don't relocate its PLT. */ extern void _dl_relocate_object (struct link_map *map, struct r_scope_elem *scope[], - int lazy, int consider_profiling) + int reloc_mode, int consider_profiling) attribute_hidden; /* Protect PT_GNU_RELRO area. */ -- cgit v1.2.3