public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/fw/elf-fixups] Clarify purpose of assert in _dl_lookup_symbol_x
@ 2019-10-29 11:36 Florian Weimer
  0 siblings, 0 replies; only message in thread
From: Florian Weimer @ 2019-10-29 11:36 UTC (permalink / raw)
  To: glibc-cvs

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=aae3acbaa7cf9ebba084bc4ae0f2c56bad425b89

commit aae3acbaa7cf9ebba084bc4ae0f2c56bad425b89
Author: Florian Weimer <fweimer@redhat.com>
Date:   Tue Oct 29 12:07:35 2019 +0100

    Clarify purpose of assert in _dl_lookup_symbol_x

Diff:
---
 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 fd44cd4..aaaf437 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))


^ permalink raw reply	[flat|nested] only message in thread
only message in thread, other threads:[~2019-10-29 11:36 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-29 11:36 [glibc/fw/elf-fixups] Clarify purpose of assert in _dl_lookup_symbol_x Florian Weimer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).