diff mbox

Clarify purpose of assert in _dl_lookup_symbol_x

Message ID 87eeyv4vwm.fsf@oldenburg2.str.redhat.com
State Superseded
Headers

Commit Message

Florian Weimer Oct. 29, 2019, 11:46 a.m. UTC 
  -----
 elf/dl-lookup.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

Comments

Florian Weimer Oct. 31, 2019, 7:26 p.m. UTC | #1 
This is now: https://gnutoolchain-gerrit.osci.io/r/c/glibc/+/469

Florian
diff mbox

Patch

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))