From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 87FBB384B126; Thu, 6 Oct 2022 11:03:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 87FBB384B126 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1665054183; bh=8rvAIpr3ipFZMH5s62kRIJaMtbeUp0QganrBQ+vVcQE=; h=From:To:Subject:Date:From; b=VONGz9TQBjtAa4mlQIz3yBW8kyZnHrae/TnKBeavLTMiVD6SudQSjRW3QL2XDcorU I9dk73dRCKpTG1OwUeelKe9hlCyd19ebxe/vn/NC6+vGDNLSw94Su3001MRNNukJcB HvIFuVaybjQmEFGPwek6IQswrMoYEF5v9NgcLcPQ= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] elf: Remove _dl_string_hwcap X-Act-Checkin: glibc X-Git-Author: Javier Pello X-Git-Refname: refs/heads/master X-Git-Oldrev: 78d9a1620b840deb0880686e4159eaf70708866a X-Git-Newrev: ab40f20364f4a417a63dd51fdd943742070bfe96 Message-Id: <20221006110303.87FBB384B126@sourceware.org> Date: Thu, 6 Oct 2022 11:03:03 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ab40f20364f4a417a63dd51fdd943742070bfe96 commit ab40f20364f4a417a63dd51fdd943742070bfe96 Author: Javier Pello Date: Tue Sep 27 20:09:28 2022 +0200 elf: Remove _dl_string_hwcap Removal of legacy hwcaps support from the dynamic loader left no users of _dl_string_hwcap. Signed-off-by: Javier Pello Reviewed-by: Adhemerval Zanella Diff: --- 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 31630fbb08..6a12297d9f 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 d29e19a9ed..5da9008794 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 8f736e1df9..033bcb3e6b 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 619dc08911..25127c36d2 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 6ed15610f4..a0b2d779f9 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 e1f88b9ab7..73aad1fd30 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 4a723b5350..fa095832d7 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 aa505223d3..f7382f637d 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 1f4c8c3a8e..d8c0f262c6 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 26790afcf6..1313cecd01 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