From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay7-d.mail.gandi.net (relay7-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::227]) by sourceware.org (Postfix) with ESMTPS id CB1C938582AF for ; Wed, 14 Sep 2022 18:15:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org CB1C938582AF 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 5774420004 for ; Wed, 14 Sep 2022 18:15:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=otheo.eu; s=gm1; t=1663179305; 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=hFe0LnVq/YAGnxiSI5XWM5cyFd9oC62JmAH7d/dzePI=; b=oojJ0ZEiUSUw4PlqHceWNO2RNc0MHmI0WfpmKYANmyhFV1xzUafWepKdAlSouYp2SOs/1u tpYMhGsifQU16uxC1GTAyUxSt426xNCkp2bkukmgs9uJswsIXxBxCgpeW7WB0H/e9vB+wy kUsJSRp1YuydZGZgDgmmMJMXfkheI3kVNPVcILhTdA9uIA/VFi4c0dG2SnWJxjZXZhApbG DPxJGLzEJBrPB3n6D4Da2Xm+WcABq6y34J5OjwjWr7fMAN6iiyL3PdkDr/J+u7xUV6Qpo8 BdjYWujYIEPAeIM1Re9bGEFtP3Fowo7YYWIInm31t2X+ScqulKvA9+zhC4dSew== Date: Wed, 14 Sep 2022 20:13:49 +0200 From: Javier Pello To: libc-alpha@sourceware.org Subject: [PATCH 5/6] elf: Remove _dl_string_hwcap Message-Id: <20220914201349.91854a089f70c804773abf45@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=-11.8 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: Removal of legacy hwcaps support from the dynamic loader left no users of _dl_string_hwcap. Signed-off-by: Javier Pello --- sysdeps/alpha/dl-procinfo.h | 2 -- sysdeps/csky/dl-procinfo.h | 2 -- sysdeps/generic/dl-procinfo.h | 2 -- sysdeps/mips/dl-procinfo.h | 2 -- sysdeps/powerpc/dl-procinfo.h | 10 ---------- sysdeps/s390/dl-procinfo.h | 14 -------------- sysdeps/sparc/dl-procinfo.h | 13 ------------- sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h | 12 ------------ sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 12 ------------ sysdeps/x86/dl-hwcap.h | 14 -------------- 10 files changed, 83 deletions(-) diff --git a/sysdeps/alpha/dl-procinfo.h b/sysdeps/alpha/dl-procinfo.h index 31630fbb..6a12297d 100644 --- a/sysdeps/alpha/dl-procinfo.h +++ b/sysdeps/alpha/dl-procinfo.h @@ -54,6 +54,4 @@ _dl_string_platform (const char *str) /* We don't have any hardware capabilities. */ #define _DL_HWCAP_COUNT 0 -#define _dl_string_hwcap(str) (-1) - #endif /* dl-procinfo.h */ diff --git a/sysdeps/csky/dl-procinfo.h b/sysdeps/csky/dl-procinfo.h index d29e19a9..5da90087 100644 --- a/sysdeps/csky/dl-procinfo.h +++ b/sysdeps/csky/dl-procinfo.h @@ -54,6 +54,4 @@ _dl_string_platform (const char *str) /* We don't have any hardware capabilities. */ #define _DL_HWCAP_COUNT 0 -#define _dl_string_hwcap(str) (-1) - #endif /* dl-procinfo.h */ diff --git a/sysdeps/generic/dl-procinfo.h b/sysdeps/generic/dl-procinfo.h index 8f736e1d..033bcb3e 100644 --- a/sysdeps/generic/dl-procinfo.h +++ b/sysdeps/generic/dl-procinfo.h @@ -34,8 +34,6 @@ /* We don't have any hardware capabilities. */ #define _DL_HWCAP_COUNT 0 -#define _dl_string_hwcap(str) (-1) - #define _dl_string_platform(str) (-1) #endif /* dl-procinfo.h */ diff --git a/sysdeps/mips/dl-procinfo.h b/sysdeps/mips/dl-procinfo.h index 619dc089..25127c36 100644 --- a/sysdeps/mips/dl-procinfo.h +++ b/sysdeps/mips/dl-procinfo.h @@ -54,6 +54,4 @@ _dl_string_platform (const char *str) /* We don't have any hardware capabilities. */ #define _DL_HWCAP_COUNT 0 -#define _dl_string_hwcap(str) (-1) - #endif /* dl-procinfo.h */ diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h index 6ed15610..a0b2d779 100644 --- a/sysdeps/powerpc/dl-procinfo.h +++ b/sysdeps/powerpc/dl-procinfo.h @@ -69,16 +69,6 @@ _dl_hwcap_string (int idx) return GLRO(dl_powerpc_cap_flags)[idx]; } -static inline int -__attribute__ ((unused)) -_dl_string_hwcap (const char *str) -{ - for (int i = 0; i < _DL_HWCAP_COUNT; ++i) - if (strcmp (str, _dl_hwcap_string (i)) == 0) - return i; - return -1; -} - static inline int __attribute__ ((unused, always_inline)) _dl_string_platform (const char *str) diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h index e1f88b9a..73aad1fd 100644 --- a/sysdeps/s390/dl-procinfo.h +++ b/sysdeps/s390/dl-procinfo.h @@ -83,20 +83,6 @@ _dl_hwcap_string (int idx) return _dl_s390_cap_flags[idx]; }; -static inline int -__attribute__ ((unused, always_inline)) -_dl_string_hwcap (const char *str) -{ - int i; - - for (i = 0; i < _DL_HWCAP_COUNT; i++) - { - if (strcmp (str, _dl_s390_cap_flags[i]) == 0) - return i; - } - return -1; -}; - static inline int __attribute__ ((unused, always_inline)) _dl_string_platform (const char *str) diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h index 4a723b53..fa095832 100644 --- a/sysdeps/sparc/dl-procinfo.h +++ b/sysdeps/sparc/dl-procinfo.h @@ -52,19 +52,6 @@ _dl_hwcap_string (int idx) return GLRO(dl_sparc_cap_flags)[idx]; }; -static inline int -__attribute__ ((unused, always_inline)) -_dl_string_hwcap (const char *str) -{ - int i; - for (i = 0; i < _DL_HWCAP_COUNT; i++) - { - if (strcmp (str, GLRO(dl_sparc_cap_flags) [i]) == 0) - return i; - } - return -1; -}; - #include #define HWCAP_IMPORTANT_V9 (__WORDSIZE == 64 ? 0 : HWCAP_SPARC_V9) #define HWCAP_IMPORTANT (HWCAP_IMPORTANT_V9 | HWCAP_SPARC_ULTRA3 \ diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h index aa505223..f7382f63 100644 --- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h @@ -37,18 +37,6 @@ _dl_hwcap_string (int idx) return (unsigned)idx < _DL_HWCAP_COUNT ? GLRO(dl_aarch64_cap_flags)[idx] : ""; }; -static inline int -__attribute__ ((unused)) -_dl_string_hwcap (const char *str) -{ - for (int i = 0; i < _DL_HWCAP_COUNT; i++) - { - if (strcmp (str, _dl_hwcap_string (i)) == 0) - return i; - } - return -1; -}; - /* There're no platforms to filter out. */ #define _DL_HWCAP_PLATFORM 0 diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h index 1f4c8c3a..d8c0f262 100644 --- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h @@ -75,18 +75,6 @@ _dl_procinfo (unsigned int type, unsigned long int word) #define HWCAP_IMPORTANT (HWCAP_ARM_VFP | HWCAP_ARM_NEON) -static inline int -__attribute__ ((unused)) -_dl_string_hwcap (const char *str) -{ - for (int i = 0; i < _DL_HWCAP_COUNT; i++) - { - if (strcmp (str, _dl_hwcap_string (i)) == 0) - return i; - } - return -1; -}; - #define _dl_string_platform(str) (-1) #endif /* dl-procinfo.h */ diff --git a/sysdeps/x86/dl-hwcap.h b/sysdeps/x86/dl-hwcap.h index 26790afc..1313cecd 100644 --- a/sysdeps/x86/dl-hwcap.h +++ b/sysdeps/x86/dl-hwcap.h @@ -57,20 +57,6 @@ _dl_hwcap_string (int idx) return GLRO(dl_x86_hwcap_flags)[idx]; }; -static inline int -__attribute__ ((unused, always_inline)) -_dl_string_hwcap (const char *str) -{ - int i; - - for (i = HWCAP_START; i < HWCAP_COUNT; i++) - { - if (strcmp (str, GLRO(dl_x86_hwcap_flags)[i]) == 0) - return i; - } - return -1; -}; - /* We cannot provide a general printing function. */ #define _dl_procinfo(type, word) -1 -- 2.36.0