From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 23662 invoked by alias); 29 Oct 2019 11:36:32 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 23644 invoked by uid 9299); 29 Oct 2019 11:36:32 -0000 Date: Tue, 29 Oct 2019 11:36:00 -0000 Message-ID: <20191029113632.23643.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Florian Weimer To: glibc-cvs@sourceware.org Subject: [glibc/fw/elf-fixups] Clarify purpose of assert in _dl_lookup_symbol_x X-Act-Checkin: glibc X-Git-Author: Florian Weimer X-Git-Refname: refs/heads/fw/elf-fixups X-Git-Oldrev: 177a3d48a1c74d7b2cd6bfd48901519d25a5ecad X-Git-Newrev: aae3acbaa7cf9ebba084bc4ae0f2c56bad425b89 X-SW-Source: 2019-q4/txt/msg00187.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=aae3acbaa7cf9ebba084bc4ae0f2c56bad425b89 commit aae3acbaa7cf9ebba084bc4ae0f2c56bad425b89 Author: Florian Weimer 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))