From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay11.mail.gandi.net (relay11.mail.gandi.net [IPv6:2001:4b98:dc4:8::231]) by sourceware.org (Postfix) with ESMTPS id CB86B38582AF for ; Wed, 14 Sep 2022 18:14:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CB86B38582AF Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=otheo.eu Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=otheo.eu Received: (Authenticated sender: #01#@otheo.eu) by mail.gandi.net (Postfix) with ESMTPSA id 62232100002 for ; Wed, 14 Sep 2022 18:14:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=otheo.eu; s=gm1; t=1663179249; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Zwwd9vDytu0guy1j39EHqf1/dT9aTAlbSb1d//TDFEE=; b=HLyW0Zy4miHrzCerRdQK/dUaMgDys42oP4SlSiImaiVApyQACWxCx5Fc4pyHodcpi/2RXI l4c5f2sl04kxnxw7BdhkLTCRPWbGyrDtmO89+DQqkDJPAoAqE+XrBnOpICVtep202Tfo5o fTcr4M4r6A0bnrvbvpYHG6wr6CzbjNNOtEh9DlQvumHaUkUIBaPH97NuY1WaFncmSxc61i sYXb2vJmbyaMD1npQi6wmebgPyW9Vbs/Kn58aDghThDM7+EfyAzi6z8LuXrnN/Yc5dlP2Z u9LQrKkg0vdXbDTF1HhhD7HsOGN0K7GTHzF8yPCnwrBbA9cA/v4X+0ui1t6AoA== Date: Wed, 14 Sep 2022 20:12:52 +0200 From: Javier Pello To: libc-alpha@sourceware.org Subject: [PATCH 4/6] elf: Remove hwcap and bits_hwcap fields from struct cache_entry Message-Id: <20220914201252.a6ecb49229ae4eaf323f0cd8@otheo.eu> In-Reply-To: <20220914200724.8e685fbbaf441c96d19011c6@otheo.eu> References: <20220905200652.d69204581d15c64647da5cd2@otheo.eu> <87h71l9crb.fsf@oldenburg.str.redhat.com> <20220906201207.e7b3d08272af5649754e76b1@otheo.eu> <87h71i6rfa.fsf@oldenburg.str.redhat.com> <20220914200724.8e685fbbaf441c96d19011c6@otheo.eu> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.32; i686-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,JMQ_SPF_NEUTRAL,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: They were set to 0 on initialisation and never changed later after last commit. Signed-off-by: Javier Pello --- elf/cache.c | 28 ++++++---------------------- 1 file changed, 6 insertions(+), 22 deletions(-) diff --git a/elf/cache.c b/elf/cache.c index ecbea2a0..10e61ae4 100644 --- a/elf/cache.c +++ b/elf/cache.c @@ -145,10 +145,8 @@ struct cache_entry struct stringtable_entry *path; /* Path to find library. */ int flags; /* Flags to indicate kind of library. */ unsigned int isa_level; /* Required ISA level. */ - uint64_t hwcap; /* Important hardware capabilities. */ - int bits_hwcap; /* Number of bits set in hwcap. */ - /* glibc-hwcaps subdirectory. If not NULL, hwcap must be zero. */ + /* glibc-hwcaps subdirectory. */ struct glibc_hwcaps_subdirectory *hwcaps; struct cache_entry *next; /* Next entry in list. */ @@ -433,15 +431,6 @@ compare (const struct cache_entry *e1, const struct cache_entry *e2) if (res != 0) return res; } - /* Sort by most specific hwcap. */ - if (e2->bits_hwcap > e1->bits_hwcap) - return 1; - else if (e2->bits_hwcap < e1->bits_hwcap) - return -1; - else if (e2->hwcap > e1->hwcap) - return 1; - else if (e2->hwcap < e1->hwcap) - return -1; } return res; } @@ -547,14 +536,13 @@ save_cache (const char *cache_name) int cache_entry_count = 0; /* The old format doesn't contain hwcap entries and doesn't contain libraries in subdirectories with hwcaps entries. Count therefore - also all entries with hwcap == 0. */ + all entries. */ int cache_entry_old_count = 0; for (entry = entries; entry != NULL; entry = entry->next) { ++cache_entry_count; - if (entry->hwcap == 0) - ++cache_entry_old_count; + ++cache_entry_old_count; } struct stringtable_finalized strings_finalized; @@ -626,7 +614,7 @@ save_cache (const char *cache_name) for (idx_old = 0, idx_new = 0, entry = entries; entry != NULL; entry = entry->next, ++idx_new) { - if (opt_format != opt_format_new && entry->hwcap == 0) + if (opt_format != opt_format_new) { file_entries->libs[idx_old].flags = entry->flags; /* XXX: Actually we can optimize here and remove duplicates. */ @@ -644,7 +632,7 @@ save_cache (const char *cache_name) file_entries_new->libs[idx_new].flags = entry->flags; file_entries_new->libs[idx_new].osversion_unused = 0; if (entry->hwcaps == NULL) - file_entries_new->libs[idx_new].hwcap = entry->hwcap; + file_entries_new->libs[idx_new].hwcap = 0; else file_entries_new->libs[idx_new].hwcap = compute_hwcap_value (entry); @@ -654,9 +642,7 @@ save_cache (const char *cache_name) = str_offset + entry->path->offset; } - /* Ignore entries with hwcap for old format. */ - if (entry->hwcap == 0) - ++idx_old; + ++idx_old; } /* Duplicate last old cache entry if needed. */ @@ -782,9 +768,7 @@ add_to_cache (const char *path, const char *filename, const char *soname, new_entry->path = path_interned; new_entry->flags = flags; new_entry->isa_level = isa_level; - new_entry->hwcap = 0; new_entry->hwcaps = hwcaps; - new_entry->bits_hwcap = 0; if (hwcaps != NULL) hwcaps->used = true; -- 2.36.0