From patchwork Fri Jun 7 11:42:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 1945069 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=ibm.com header.i=@ibm.com header.a=rsa-sha256 header.s=pp1 header.b=Fxiiel+g; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VwfZK0ZqFz20PW for ; Fri, 7 Jun 2024 21:47:21 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5E9293A703A1 for ; Fri, 7 Jun 2024 11:47:19 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id 827113A69D01 for ; Fri, 7 Jun 2024 11:46:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 827113A69D01 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linux.ibm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 827113A69D01 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717760771; cv=none; b=rIWNcWdSRZC1dy9yvg1ZdjE1S6LUGlYYlC07YZg21LxH56HeY1yphYgj4STOTy2Q3iWdbNXuKSXRG+vinNSwfYmJjLkHAMgzg9PXHsMeXA2e6iJhSuwjUTsXeHhNwnuzJf7XOuQ/YuS5JuVDqeVbw/Ii9XJsiK0KxpRBCt/xaMQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717760771; c=relaxed/simple; bh=M8Tz1QMRBCiVc9EUhJqfVnYaRfRbp5SaAjQHOSQ4jik=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=qYWtTBW+KZcf3Quz/DD/M6aA7B1JmTHaUXEfyiYrtQehiKr0LVcfKW4S5AoRfZ+yqOETQy7BYNBNrfSkEU1iE19Fzr2Rn5lbgS8p5WA2zFOA5EgK22N67GQRWYXyZmPXDErOjrQa7+R1KB26CtGKGUbVzd58IXUA5jDH3ZXMMKQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 457Ap26L022282; Fri, 7 Jun 2024 11:46:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc : content-transfer-encoding : date : from : in-reply-to : message-id : mime-version : references : subject : to; s=pp1; bh=3VqdkuiI645RcCdsRbSi4qQ2+l7VDRhRkWwddeqFjEw=; b=Fxiiel+g38a+XwiG8awx4Bz49EOs818sZlzo4YhrA9PHtgWQGoDFT1wLF27UIbC3hRlP NloWESshc3X4OunZMD3VMj5uokbWZ3ErwXDwrP2MZx4IdhFbkhxU8ZOrkeio4adc+m+H 6OpK9uXpPqZ8s7grPlU5yhXv1+6M3ccsPk90Qi2fbPNEYVrPJkA3kFb88+Uao7UHUOSY REoULYSMlY1ZyqRTs9BhaMCYFtsgzqLCjqQt+RTpbD3+dTA6Gvx2920ITAw7diN1R34P hWCv4zgPfayInLkHiLcLqjLUe5i9QQpU/fy0nvutVdRH9f3zmSBKiBNxi5ODDws5TcVo QQ== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ym08j0702-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Jun 2024 11:46:06 +0000 Received: from m0356516.ppops.net (m0356516.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 457Bk5DN011133; Fri, 7 Jun 2024 11:46:05 GMT Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ym08j06yy-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Jun 2024 11:46:05 +0000 Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 4578TuIk008483; Fri, 7 Jun 2024 11:46:04 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3ygec18m3r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Jun 2024 11:46:04 +0000 Received: from smtpav07.fra02v.mail.ibm.com (smtpav07.fra02v.mail.ibm.com [10.20.54.106]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 457Bjwx249873258 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 7 Jun 2024 11:46:00 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B5E9320065; Fri, 7 Jun 2024 11:45:58 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 88DD42004E; Fri, 7 Jun 2024 11:45:58 +0000 (GMT) Received: from a35lp69.lnxne.boe (unknown [9.152.108.100]) by smtpav07.fra02v.mail.ibm.com (Postfix) with ESMTP; Fri, 7 Jun 2024 11:45:58 +0000 (GMT) From: Stefan Liebler To: libc-alpha@sourceware.org Cc: fweimer@redhat.com, devel@otheo.eu, adhemerval.zanella@linaro.org, bergner@linux.ibm.com, Stefan Liebler Subject: [RFC 9/9] elf: Remove HWCAP_IMPORTANT Date: Fri, 7 Jun 2024 13:42:44 +0200 Message-ID: <20240607114543.659306-10-stli@linux.ibm.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240607114543.659306-1-stli@linux.ibm.com> References: <20240607114543.659306-1-stli@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: t-daTCl30BhJUq_dTtqn7cPwdk-js21D X-Proofpoint-GUID: ShzygiqFg-pClXBKsum_HF1_YoRtnI-a X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.28.16 definitions=2024-06-07_06,2024-06-06_02,2024-05-17_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 bulkscore=0 spamscore=0 malwarescore=0 mlxlogscore=664 lowpriorityscore=0 mlxscore=0 priorityscore=1501 phishscore=0 impostorscore=0 adultscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2405010000 definitions=main-2406070085 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, 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 X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org Remove the definitions of HWCAP_IMPORTANT after removal of LD_HWCAP_MASK / tunable glibc.cpu.hwcap_mask. There HWCAP_IMPORTANT was used as default value. Reviewed-by: Adhemerval Zanella --- elf/dl-diagnostics.c | 1 - sysdeps/alpha/dl-procinfo.h | 3 --- sysdeps/csky/dl-procinfo.h | 3 --- sysdeps/generic/dl-procinfo.h | 3 --- sysdeps/mips/dl-procinfo.h | 3 --- sysdeps/powerpc/dl-procinfo.h | 3 --- sysdeps/s390/dl-procinfo.h | 5 ----- sysdeps/sparc/dl-procinfo.h | 5 ----- sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h | 3 --- sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 2 -- sysdeps/x86/dl-hwcap.h | 13 ------------- 11 files changed, 44 deletions(-) diff --git a/elf/dl-diagnostics.c b/elf/dl-diagnostics.c index e69463b2bd..c83e7770d8 100644 --- a/elf/dl-diagnostics.c +++ b/elf/dl-diagnostics.c @@ -233,7 +233,6 @@ _dl_print_diagnostics (char **environ) { _dl_diagnostics_print_labeled_string ("dl_dst_lib", DL_DST_LIB); _dl_diagnostics_print_labeled_value ("dl_hwcap", GLRO (dl_hwcap)); - _dl_diagnostics_print_labeled_value ("dl_hwcap_important", HWCAP_IMPORTANT); _dl_diagnostics_print_labeled_value ("dl_hwcap2", GLRO (dl_hwcap2)); _dl_diagnostics_print_labeled_value ("dl_hwcap3", GLRO (dl_hwcap3)); _dl_diagnostics_print_labeled_value ("dl_hwcap4", GLRO (dl_hwcap4)); diff --git a/sysdeps/alpha/dl-procinfo.h b/sysdeps/alpha/dl-procinfo.h index a5264f9f2c..8d17d42ce2 100644 --- a/sysdeps/alpha/dl-procinfo.h +++ b/sysdeps/alpha/dl-procinfo.h @@ -27,9 +27,6 @@ /* There are no hardware capabilities defined. */ #define _dl_hwcap_string(idx) "" -/* By default there is no important hardware capability. */ -#define HWCAP_IMPORTANT (0) - /* We don't have any hardware capabilities. */ #define _DL_HWCAP_COUNT 0 diff --git a/sysdeps/csky/dl-procinfo.h b/sysdeps/csky/dl-procinfo.h index 3e7c63ee67..f5f6343cf6 100644 --- a/sysdeps/csky/dl-procinfo.h +++ b/sysdeps/csky/dl-procinfo.h @@ -28,9 +28,6 @@ /* There are no hardware capabilities defined. */ #define _dl_hwcap_string(idx) "" -/* By default there is no important hardware capability. */ -#define HWCAP_IMPORTANT (0) - /* We don't have any hardware capabilities. */ #define _DL_HWCAP_COUNT 0 diff --git a/sysdeps/generic/dl-procinfo.h b/sysdeps/generic/dl-procinfo.h index 1778fd1057..93edfc00cb 100644 --- a/sysdeps/generic/dl-procinfo.h +++ b/sysdeps/generic/dl-procinfo.h @@ -25,9 +25,6 @@ /* There are no hardware capabilities defined. */ #define _dl_hwcap_string(idx) "" -/* By default there is no important hardware capability. */ -#define HWCAP_IMPORTANT (0) - /* We don't have any hardware capabilities. */ #define _DL_HWCAP_COUNT 0 diff --git a/sysdeps/mips/dl-procinfo.h b/sysdeps/mips/dl-procinfo.h index 79c2acc388..af2616e1db 100644 --- a/sysdeps/mips/dl-procinfo.h +++ b/sysdeps/mips/dl-procinfo.h @@ -27,9 +27,6 @@ /* There are no hardware capabilities defined. */ #define _dl_hwcap_string(idx) "" -/* By default there is no important hardware capability. */ -#define HWCAP_IMPORTANT (0) - /* We don't have any hardware capabilities. */ #define _DL_HWCAP_COUNT 0 diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h index 81eb9fba87..1e746a7ab4 100644 --- a/sysdeps/powerpc/dl-procinfo.h +++ b/sysdeps/powerpc/dl-procinfo.h @@ -34,9 +34,6 @@ /* AT_HWCAP4 feature strings follow the AT_HWCAP3 feature strings. */ #define _DL_HWCAP4_OFFSET (_DL_HWCAP3_OFFSET + _DL_HWCAP_SIZE) -/* These bits influence library search. */ -#define HWCAP_IMPORTANT (PPC_FEATURE_HAS_ALTIVEC \ - + PPC_FEATURE_HAS_DFP) #define _DL_FIRST_PLATFORM 32 diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h index 7092ed1e2d..45dd11c189 100644 --- a/sysdeps/s390/dl-procinfo.h +++ b/sysdeps/s390/dl-procinfo.h @@ -59,11 +59,6 @@ enum HWCAP_S390_SIE = 1 << 22, }; -#define HWCAP_IMPORTANT (HWCAP_S390_ZARCH | HWCAP_S390_LDISP \ - | HWCAP_S390_EIMM | HWCAP_S390_DFP \ - | HWCAP_S390_VX | HWCAP_S390_VXE \ - | HWCAP_S390_VXRS_EXT2) - /* We cannot provide a general printing function. */ #define _dl_procinfo(type, word) -1 diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h index bd1cb65596..709178706c 100644 --- a/sysdeps/sparc/dl-procinfo.h +++ b/sysdeps/sparc/dl-procinfo.h @@ -52,9 +52,4 @@ _dl_hwcap_string (int idx) return GLRO(dl_sparc_cap_flags)[idx]; }; -#include -#define HWCAP_IMPORTANT_V9 (__WORDSIZE == 64 ? 0 : HWCAP_SPARC_V9) -#define HWCAP_IMPORTANT (HWCAP_IMPORTANT_V9 | HWCAP_SPARC_ULTRA3 \ - | HWCAP_SPARC_BLKINIT | HWCAP_SPARC_N2) - #endif /* dl-procinfo.h */ diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h index 17893a5225..b85d4ad8a3 100644 --- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h @@ -27,9 +27,6 @@ /* We cannot provide a general printing function. */ #define _dl_procinfo(type, word) -1 -/* No additional library search paths. */ -#define HWCAP_IMPORTANT HWCAP_ATOMICS - static inline const char * __attribute__ ((unused)) _dl_hwcap_string (int idx) diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h index 85422b8edd..7d26216718 100644 --- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h @@ -70,6 +70,4 @@ _dl_procinfo (unsigned int type, unsigned long int word) return 0; } -#define HWCAP_IMPORTANT (HWCAP_ARM_VFP | HWCAP_ARM_NEON) - #endif /* dl-procinfo.h */ diff --git a/sysdeps/x86/dl-hwcap.h b/sysdeps/x86/dl-hwcap.h index 246fdcd831..325f1c467c 100644 --- a/sysdeps/x86/dl-hwcap.h +++ b/sysdeps/x86/dl-hwcap.h @@ -18,19 +18,6 @@ #ifndef _DL_HWCAP_H #define _DL_HWCAP_H -#if IS_IN (ldconfig) -/* Since ldconfig processes both i386 and x86-64 libraries, it needs - to cover all hardware capabilities. */ -# define HWCAP_IMPORTANT \ - (HWCAP_X86_SSE2 | HWCAP_X86_64 | HWCAP_X86_AVX512_1) -#elif defined __x86_64__ -/* For 64 bit, only cover x86-64 capabilities. */ -# define HWCAP_IMPORTANT (HWCAP_X86_64 | HWCAP_X86_AVX512_1) -#else -/* For 32 bit, only cover i586, i686 and SSE2. */ -# define HWCAP_IMPORTANT (HWCAP_X86_SSE2) -#endif - enum { HWCAP_X86_SSE2 = 1 << 0,