From patchwork Fri Jun 7 11:42:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 1945068 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=CPYW3lgX; 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 4VwfYs0Bzpz20PW for ; Fri, 7 Jun 2024 21:46:57 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 535FF3A69D35 for ; Fri, 7 Jun 2024 11:46:54 +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 C37BB3A69D0C for ; Fri, 7 Jun 2024 11:46:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C37BB3A69D0C 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 C37BB3A69D0C 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=1717760772; cv=none; b=RjE46/NBuLM5NQoVM6v7l+8YGfedxoTeKae0v7qg2T8VblMnSH82/XTWRVZZrFVk7qq1lFI0j6S7R284J5mK0eayIo37YG+tzWr6KbDjm/73xVRmkZ4XVUfLV0BjYlFWNH7c89iLSODI0wHjFlpm1z9Xj4Ag3tH2Lo28Pzqb91E= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717760772; c=relaxed/simple; bh=6IT4uju6X8+b78oHmIuqv2CrbJ+iivsXzc9MbldZZaQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Lgi5j0uYeKHVTvV6f1NSqvYlcCH7yjjhlcWXKVNyOvrMogzHr7XTCOcfPTXTKW5c0kOB4W8+AIeDw/xcuJCbbCgdstcO9l3mhR+uzRlhrLbtnam9wQ9KDKmg4GDuIWPVbmGKoM3wOU+oW8pGL4zi8Vgh+1zaSYvb7AMT0qQmnjQ= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from pps.filterd (m0353724.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 457AsCx3006604; 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=39OT+JkyTYg9qiLQ49btNxaGrVbfZpmgHUP47eWs7hk=; b=CPYW3lgXuvZBGkgBc4Wzk2y8f1SVyUqtS6V0eoLxMGKSVEbzCLHTF8BA2N6CrSDKafrh ZKoOEGiWZLSbbiza5vT+0azJgHaP/XP96es6pFXqsevZeJGI7NjWGOKNdZ8BzS2MP45D 0Qkg4xwKLxRMaYr9zJhQ5rptRqGYlcLf+BLjnLUbRfBv0iOReSjyYdocnDnmLk6ixl2W Iwi7rl2bloXEPM4oO9nw3rq4mR0Efh5fX7E7+Pj4aBJFBp786YL6ylVnfdSTXCaSnevy umn8nGsCR4ObTTVZFZ4Gbd+4fkjpt0DT+F5uLE7u0U8BHsZdQEDMaGcxSSFMoq4KD37h 3A== Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ym0u8g3nn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Jun 2024 11:46:05 +0000 Received: from m0353724.ppops.net (m0353724.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 457BgYBc012378; Fri, 7 Jun 2024 11:46:05 GMT Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ym0u8g3nk-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 (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 4578bOf3000781; Fri, 7 Jun 2024 11:46:04 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 3ygdyugng1-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 smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 457Bjx4649938824 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 7 Jun 2024 11:46:01 GMT Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D0FCA2007D; Fri, 7 Jun 2024 11:45:57 +0000 (GMT) Received: from smtpav07.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A37432006C; Fri, 7 Jun 2024 11:45:57 +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:57 +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 5/9] elf: Remove _DL_HWCAP_PLATFORM Date: Fri, 7 Jun 2024 13:42:40 +0200 Message-ID: <20240607114543.659306-6-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-GUID: vBo5yejCNsdR4fS1qkD3DyFiQpmQ-25r X-Proofpoint-ORIG-GUID: qxiUnvWAM43mwimPQ0wy1Ohr8bmuud4K 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 mlxscore=0 adultscore=0 spamscore=0 impostorscore=0 clxscore=1015 bulkscore=0 phishscore=0 mlxlogscore=618 suspectscore=0 priorityscore=1501 lowpriorityscore=0 malwarescore=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 _DL_HWCAP_PLATFORM as those are not used anymore after removal in elf/dl-cache.c:search_cache(). Reviewed-by: Adhemerval Zanella --- sysdeps/alpha/dl-procinfo.h | 3 --- sysdeps/csky/dl-procinfo.h | 2 -- sysdeps/generic/dl-procinfo.h | 3 --- sysdeps/mips/dl-procinfo.h | 3 --- sysdeps/powerpc/dl-procinfo.h | 3 --- sysdeps/s390/dl-procinfo.h | 3 --- sysdeps/sparc/dl-procinfo.h | 3 --- sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h | 3 --- sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 3 --- sysdeps/x86/dl-procinfo.h | 3 --- 10 files changed, 29 deletions(-) diff --git a/sysdeps/alpha/dl-procinfo.h b/sysdeps/alpha/dl-procinfo.h index bc4db868a9..90f83ec24e 100644 --- a/sysdeps/alpha/dl-procinfo.h +++ b/sysdeps/alpha/dl-procinfo.h @@ -22,9 +22,6 @@ #include -/* Mask to filter out platforms. */ -#define _DL_HWCAP_PLATFORM (-1ULL) - #define _DL_PLATFORMS_COUNT 5 /* We cannot provide a general printing function. */ diff --git a/sysdeps/csky/dl-procinfo.h b/sysdeps/csky/dl-procinfo.h index a54e8de446..803441f52c 100644 --- a/sysdeps/csky/dl-procinfo.h +++ b/sysdeps/csky/dl-procinfo.h @@ -22,8 +22,6 @@ #include -/* Mask to filter out platforms. */ -#define _DL_HWCAP_PLATFORM (-1ULL) #define _DL_PLATFORMS_COUNT 4 diff --git a/sysdeps/generic/dl-procinfo.h b/sysdeps/generic/dl-procinfo.h index 00e1ae7b2f..1778fd1057 100644 --- a/sysdeps/generic/dl-procinfo.h +++ b/sysdeps/generic/dl-procinfo.h @@ -28,9 +28,6 @@ /* By default there is no important hardware capability. */ #define HWCAP_IMPORTANT (0) -/* There're no platforms to filter out. */ -#define _DL_HWCAP_PLATFORM 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 3199434390..7185542eac 100644 --- a/sysdeps/mips/dl-procinfo.h +++ b/sysdeps/mips/dl-procinfo.h @@ -22,9 +22,6 @@ #include -/* Mask to filter out platforms. */ -#define _DL_HWCAP_PLATFORM (-1ULL) - #define _DL_PLATFORMS_COUNT 4 /* We cannot provide a general printing function. */ diff --git a/sysdeps/powerpc/dl-procinfo.h b/sysdeps/powerpc/dl-procinfo.h index b36697ba44..5b628a27ca 100644 --- a/sysdeps/powerpc/dl-procinfo.h +++ b/sysdeps/powerpc/dl-procinfo.h @@ -41,9 +41,6 @@ #define _DL_PLATFORMS_COUNT 17 #define _DL_FIRST_PLATFORM 32 -/* Mask to filter out platforms. */ -#define _DL_HWCAP_PLATFORM (((1ULL << _DL_PLATFORMS_COUNT) - 1) \ - << _DL_FIRST_PLATFORM) /* Platform bits (relative to _DL_FIRST_PLATFORM). */ #define PPC_PLATFORM_POWER4 0 diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h index 63c9889f94..bb5f9c7863 100644 --- a/sysdeps/s390/dl-procinfo.h +++ b/sysdeps/s390/dl-procinfo.h @@ -27,9 +27,6 @@ extern const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] attribute_hidden; /* The kernel provides up to 32 capability bits with elf_hwcap. */ #define _DL_FIRST_PLATFORM 32 -/* Mask to filter out platforms. */ -#define _DL_HWCAP_PLATFORM (((1ULL << _DL_PLATFORMS_COUNT) - 1) \ - << _DL_FIRST_PLATFORM) /* Hardware capability bit numbers are derived directly from the facility indications as stored by the "store facility list" (STFL) diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h index dbb1a4d324..bd1cb65596 100644 --- a/sysdeps/sparc/dl-procinfo.h +++ b/sysdeps/sparc/dl-procinfo.h @@ -57,7 +57,4 @@ _dl_hwcap_string (int idx) #define HWCAP_IMPORTANT (HWCAP_IMPORTANT_V9 | HWCAP_SPARC_ULTRA3 \ | HWCAP_SPARC_BLKINIT | HWCAP_SPARC_N2) -/* There're no platforms to filter out. */ -#define _DL_HWCAP_PLATFORM 0 - #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 0ed89c5e41..17893a5225 100644 --- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h @@ -37,7 +37,4 @@ _dl_hwcap_string (int idx) return (unsigned)idx < _DL_HWCAP_COUNT ? GLRO(dl_aarch64_cap_flags)[idx] : ""; }; -/* There're no platforms to filter out. */ -#define _DL_HWCAP_PLATFORM 0 - #endif /* dl-procinfo.h */ diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h index 2a1c5985ee..85422b8edd 100644 --- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h @@ -30,9 +30,6 @@ /* Low 7 bits are allocated in HWCAP2. */ #define _DL_HWCAP2_LAST 6 -/* The kernel provides platform data but it is not interesting. */ -#define _DL_HWCAP_PLATFORM 0 - static inline const char * __attribute__ ((unused)) diff --git a/sysdeps/x86/dl-procinfo.h b/sysdeps/x86/dl-procinfo.h index b2184b8f5d..1aa6bad67a 100644 --- a/sysdeps/x86/dl-procinfo.h +++ b/sysdeps/x86/dl-procinfo.h @@ -26,8 +26,5 @@ /* Start at 48 to reserve spaces for hardware capabilities. */ #define _DL_FIRST_PLATFORM 48 -/* Mask to filter out platforms. */ -#define _DL_HWCAP_PLATFORM (((1ULL << _DL_PLATFORMS_COUNT) - 1) \ - << _DL_FIRST_PLATFORM) #endif /* dl-procinfo.h */