This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] Clarify purpose of assert in _dl_lookup_symbol_x
- From: Florian Weimer <fweimer at redhat dot com>
- To: libc-alpha at sourceware dot org
- Date: Tue, 29 Oct 2019 12:46:01 +0100
- Subject: [PATCH] Clarify purpose of assert in _dl_lookup_symbol_x
-----
elf/dl-lookup.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index fd44cd4101..aaaf43799e 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -792,11 +792,9 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
bump_num_relocations ();
- /* No other flag than DL_LOOKUP_ADD_DEPENDENCY or DL_LOOKUP_GSCOPE_LOCK
- is allowed if we look up a versioned symbol. */
- assert (version == NULL
- || (flags & ~(DL_LOOKUP_ADD_DEPENDENCY | DL_LOOKUP_GSCOPE_LOCK))
- == 0);
+ /* DL_LOOKUP_RETURN_NEWEST does not make sense for versioned
+ lookups. */
+ assert (version == NULL || !(flags & DL_LOOKUP_RETURN_NEWEST));
size_t i = 0;
if (__glibc_unlikely (skip_map != NULL))