From patchwork Wed Feb 26 19:00:17 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 868539 Delivered-To: patch@linaro.org Received: by 2002:a5d:5f56:0:b0:38f:210b:807b with SMTP id cm22csp959066wrb; Wed, 26 Feb 2025 11:04:03 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCV0KPARdIO+bJOD2e2EZUcM27tvr83TVs3tx/zRslXIRHIMxcPSLS06ReRR0u9Q+FDcUaAWaQ==@linaro.org X-Google-Smtp-Source: AGHT+IFkCwlb8IybANPn+wB6SZdQCduC+iBaclhc49hEA4v93ttxqANtXF5Ae2hBbgwUI5p6/Pt0 X-Received: by 2002:a05:6870:4f07:b0:2b8:2f9c:d513 with SMTP id 586e51a60fabf-2c10f2a54abmr5145366fac.19.1740596642919; Wed, 26 Feb 2025 11:04:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1740596642; cv=pass; d=google.com; s=arc-20240605; b=OQGvZyDMK/56vyopGAVCNHB5bAYYVr+4PNyGDWMujuno8hR8YQa7/HiVtTCmpMQP23 bFVebPzjrm9Pab1xmI4zBv+kyvAUTxIGuXi2a7RpsUiFNjBBJ25BmsQOsBOx8WVaEme0 HFeZTgXnF43J2HUPzj5pmrgXjyhiaJgpeuwpd13dAQ9L0neqW9X5wFdVfcyh9oqfqOJV pmEzpfbne1KTwKgeZqgqitVQ+sch/CdDJM7GVNUJyfbDZTh3BFScAvUB6zI8rEeVgIF2 ijlZtP7RQNUtzNdnVoFMKUy4MnR8Any59kHce6Fq7J0a6b4Qxx0j1s/oXwD35RnWioLj mZWQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:dkim-filter:arc-filter:dmarc-filter:delivered-to :dkim-filter; bh=T5SIUaqZfbcX8pqion4EWQgREJRwTknTT1xqEA7aKoM=; fh=LwDEXkF2BCfvt5pKmeQEzNeZtO/ktrc/ajkpXRdekFs=; b=N3vxAQzq5x8piWp3UJ2k5x7saG31f6oif8lOPVz/oDOQAxwK07CHgPtr+ei4XBA4xI CR2KYwyZpT+bFqxcj/1Ee1rfia/7Xx5ZxrwPD99w5HOr6zSi0IsukMcus77OPFYE3Mac 8z+1kll9Px6ykSP1h1DevFxma/J7iyxzl+xEJBicZd0w+2rGzx2jiD8DwF6PUuj3FtX5 siidkT2gnka4mTo1i/Mb1ma2pVqYJMjA81h0brHdyzbhumAdmY9cLtQjhoCc5+nPsVDH jV1C/qtoctsvoi6aBSgVnj6xVIY+dz8JRVWbuxIyUTWRtiB2Uf8ogB0rVI3lYwCqxzA8 xARg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nI0WJfm0; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="libc-alpha-bounces~patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from server2.sourceware.org (server2.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id 586e51a60fabf-2c14bb48371si988278fac.277.2025.02.26.11.04.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 11:04:02 -0800 (PST) Received-SPF: pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=nI0WJfm0; arc=pass (i=1); spf=pass (google.com: domain of libc-alpha-bounces~patch=linaro.org@sourceware.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="libc-alpha-bounces~patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8D15F3858C53 for ; Wed, 26 Feb 2025 19:04:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8D15F3858C53 Authentication-Results: sourceware.org; dkim=pass (2048-bit key, unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=nI0WJfm0 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by sourceware.org (Postfix) with ESMTPS id A7AA53858D28 for ; Wed, 26 Feb 2025 19:03:18 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A7AA53858D28 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A7AA53858D28 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::632 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1740596599; cv=none; b=qeCfWzyLqkYmwRg0o1cz3uuEM1ZUZcFZ7ki3QOar/GDGofLU5cgVsEqJC8ZEnyj4TK40lJDAHdri/ebmuM32F2iATKYoWCt6CKIdhmdxaWvawvtN7GUzBVUZ8NHEDgwm8lEp5VX9xUPRnlS3KIEJ0nhw4DQ3FJwbOy/CGAOEAqk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1740596599; c=relaxed/simple; bh=tcQtmebxIshu0nBfyl3VUdiU3nY1xNT+htwABimAH3I=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=TLh0+oFw7l9ZWDdhmMKA6AQbSgcU6Jjqn84l5p+ylkBzCmUIHFQQ0rjzsUvMuVRb7DijpsP7TaJLnY500lkefoG4rDz1SMXfyWDCr+hFKKI9bsrmC5tgghNvq1/A03JTHZK+rYo3zSZVzAeRUlBahStInH2rrWg8VPjc7/RBubA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org A7AA53858D28 Received: by mail-pl1-x632.google.com with SMTP id d9443c01a7336-220e989edb6so2114035ad.1 for ; Wed, 26 Feb 2025 11:03:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740596597; x=1741201397; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=T5SIUaqZfbcX8pqion4EWQgREJRwTknTT1xqEA7aKoM=; b=nI0WJfm0xBcifsSZDSxglGqcrE/l/5+ESC5azH5mSaHuojvaS3PjF+4/dMZ+TY7Zkn j7uBwObmmBFGx2uy/V/YO8clNlQc+2j1WQsCEJTuSVif/r55MuOkmux3bOjhLuFAlejp A6sHsq3KR4hgxErs1/Clzg4DmwbqqXWh6/hJJElbP0IjbxolvK9KhAjCS2zv+up+X6ho 9u8ToICFfS5H00Zl9/kd7MsWbK2CajNC5z8ktZg/VnZH/ALmuoAU109mFBNluUee8QHz xrAO+t50jM65fNTZsCqs3nauhB4XiRCDRf9V832E94ZLiNVfcRmSLOCF1QwYj05B3QGE HwsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740596597; x=1741201397; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T5SIUaqZfbcX8pqion4EWQgREJRwTknTT1xqEA7aKoM=; b=n+4a7uQiw6ha2SXeTulh0OjQf1GdaV1gvnzVTQuyqubcE5IlQqaKWKRTbcAUAivc0I PdHZpLrF0LnZTMhKZRabkS2mrqwfa78Sn/CUG+7/SOSgMYW55pk69i++DvQacCjXa1UP pxpzX8qlq4J1mEp5kbZGuenR3HOpJeD9uc5POK13fri80ZRpBdPbMhiR9357rf8CSNA5 5ArBWE9WJ+pYi0k4BTo5QttJv+oRpp/ArY2Et2yKn8kvXJt1/3GUhzvn8ZqWyTSlFzyJ ncwUMvoFh68xI3gyJ5Ytu3RTcVAUbgTwLqPm5AkrfQ4CjQ/nUkb+myvuPavewBMQLtDm JAMA== X-Gm-Message-State: AOJu0Yyc5S1hyDHREiCMNLSKIKyxlq83J8F2KOp1lBm+hdlTSinZ7Rou /aw8O1cO4tl4UPnSU+XGtnbNZRA/qAiiT/5i21r39lGSDcm8U6oIkF1acNArbKFgZCBiwzCg8CO j X-Gm-Gg: ASbGncvIaIe9mGncYOU0kFeV7cdprbRiPYl9izj70/97+YF6m07BYlBEvDIoy97ntze HVgmCqZgiHv5eugeERjrsoQvswS8hIX9dnqUJA+M+W1TJ+2xgffhHX6aqkFeQSw5Qamgk73G51F H0XWTGdIiDEF6BxZfDPVkyHCxyILNyPmrGLbzMl1E5uJyqgBIJraao0HIc3j6Eb1Pm3pulPZpZr X4KAQ5vEO5ehp7FrYgf0YuulHb9QcHPz6BiEIyUefzSpns/XVbgo6WsqqlZp6qLOXxq/QJ9UMMf EPRnD2N+4Waep3ySzC/is9f2AMy9DTQFI93VFbo= X-Received: by 2002:a17:902:e5ce:b0:21f:78f:c178 with SMTP id d9443c01a7336-22307b32c7bmr110711015ad.3.1740596596532; Wed, 26 Feb 2025 11:03:16 -0800 (PST) Received: from mandiga.. ([2804:1b3:a7c3:f704:a0c6:9418:957f:d5bf]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22344c837e2sm6946185ad.139.2025.02.26.11.03.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 Feb 2025 11:03:16 -0800 (PST) From: Adhemerval Zanella To: libc-alpha@sourceware.org, Stefan Liebler , Peter Bergner , Wilco Dijkstra Subject: [PATCH 1/6] Remove unused dl-procinfo.h Date: Wed, 26 Feb 2025 16:00:17 -0300 Message-ID: <20250226190308.2163908-2-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250226190308.2163908-1-adhemerval.zanella@linaro.org> References: <20250226190308.2163908-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 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~patch=linaro.org@sourceware.org From: Wilco Dijkstra Remove unused _dl_hwcap_string defines. As a result many dl-procinfo.h headers can be removed. This also removes target specific _dl_procinfo implementations which only printed HWCAP strings using dl_hwcap_string. --- sysdeps/alpha/dl-procinfo.h | 33 --------- sysdeps/csky/dl-procinfo.h | 34 --------- sysdeps/generic/dl-procinfo.h | 6 -- sysdeps/i386/dl-procinfo.c | 19 ----- sysdeps/mips/dl-procinfo.c | 27 ------- sysdeps/mips/dl-procinfo.h | 33 --------- sysdeps/s390/Makefile | 1 - sysdeps/s390/cpu-features.c | 3 +- sysdeps/s390/dl-procinfo-s390.c | 26 ------- sysdeps/s390/dl-procinfo.c | 3 - sysdeps/s390/dl-procinfo.h | 72 ------------------ sysdeps/s390/multiarch/ifunc-resolve.h | 3 +- sysdeps/s390/s390-32/dl-machine.h | 1 - sysdeps/s390/s390-64/dl-hwcaps-subdirs.c | 1 + sysdeps/s390/s390-64/dl-machine.h | 1 - sysdeps/sparc/dl-procinfo.c | 63 ---------------- sysdeps/sparc/dl-procinfo.h | 55 -------------- sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c | 22 ------ sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h | 37 ---------- sysdeps/unix/sysv/linux/arm/dl-procinfo.c | 66 ----------------- sysdeps/unix/sysv/linux/arm/dl-procinfo.h | 73 ------------------- sysdeps/unix/sysv/linux/i386/dl-procinfo.h | 46 ------------ sysdeps/unix/sysv/linux/s390/dl-procinfo.h | 48 ------------ sysdeps/unix/sysv/linux/s390/elision-conf.c | 3 +- sysdeps/unix/sysv/linux/s390/sysconf.c | 3 +- sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h | 5 -- sysdeps/x86/dl-hwcap.h | 7 -- sysdeps/x86/dl-procinfo.c | 16 ---- sysdeps/x86/dl-procinfo.h | 26 ------- 29 files changed, 9 insertions(+), 724 deletions(-) delete mode 100644 sysdeps/alpha/dl-procinfo.h delete mode 100644 sysdeps/csky/dl-procinfo.h delete mode 100644 sysdeps/mips/dl-procinfo.c delete mode 100644 sysdeps/mips/dl-procinfo.h delete mode 100644 sysdeps/s390/dl-procinfo-s390.c delete mode 100644 sysdeps/s390/dl-procinfo.h delete mode 100644 sysdeps/sparc/dl-procinfo.c delete mode 100644 sysdeps/sparc/dl-procinfo.h delete mode 100644 sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h delete mode 100644 sysdeps/unix/sysv/linux/arm/dl-procinfo.c delete mode 100644 sysdeps/unix/sysv/linux/arm/dl-procinfo.h delete mode 100644 sysdeps/unix/sysv/linux/i386/dl-procinfo.h delete mode 100644 sysdeps/unix/sysv/linux/s390/dl-procinfo.h delete mode 100644 sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h delete mode 100644 sysdeps/x86/dl-procinfo.h diff --git a/sysdeps/alpha/dl-procinfo.h b/sysdeps/alpha/dl-procinfo.h deleted file mode 100644 index af9b3500df..0000000000 --- a/sysdeps/alpha/dl-procinfo.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Alpha version of processor capability information handling macros. - Copyright (C) 2008-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#ifndef _DL_PROCINFO_H -#define _DL_PROCINFO_H 1 - -#include - -/* We cannot provide a general printing function. */ -#define _dl_procinfo(type, word) -1 - -/* There are no hardware capabilities defined. */ -#define _dl_hwcap_string(idx) "" - -/* We don't have any hardware capabilities. */ -#define _DL_HWCAP_COUNT 0 - -#endif /* dl-procinfo.h */ diff --git a/sysdeps/csky/dl-procinfo.h b/sysdeps/csky/dl-procinfo.h deleted file mode 100644 index c5e072f213..0000000000 --- a/sysdeps/csky/dl-procinfo.h +++ /dev/null @@ -1,34 +0,0 @@ -/* C-SKY version of processor capability information handling macros. - Copyright (C) 2018-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - - -#ifndef _DL_PROCINFO_H -#define _DL_PROCINFO_H 1 - -#include - -/* We cannot provide a general printing function. */ -#define _dl_procinfo(word, val) -1 - -/* There are no hardware capabilities defined. */ -#define _dl_hwcap_string(idx) "" - -/* We don't have any hardware capabilities. */ -#define _DL_HWCAP_COUNT 0 - -#endif /* dl-procinfo.h */ diff --git a/sysdeps/generic/dl-procinfo.h b/sysdeps/generic/dl-procinfo.h index 7a63c43ea9..057a4ae362 100644 --- a/sysdeps/generic/dl-procinfo.h +++ b/sysdeps/generic/dl-procinfo.h @@ -22,10 +22,4 @@ /* We cannot provide a general printing function. */ #define _dl_procinfo(type, word) -1 -/* There are no hardware capabilities defined. */ -#define _dl_hwcap_string(idx) "" - -/* We don't have any hardware capabilities. */ -#define _DL_HWCAP_COUNT 0 - #endif /* dl-procinfo.h */ diff --git a/sysdeps/i386/dl-procinfo.c b/sysdeps/i386/dl-procinfo.c index d7344314bc..931750d96c 100644 --- a/sysdeps/i386/dl-procinfo.c +++ b/sysdeps/i386/dl-procinfo.c @@ -41,24 +41,5 @@ #include -#if !defined PROCINFO_DECL && defined SHARED - ._dl_x86_cap_flags -#else -PROCINFO_CLASS const char _dl_x86_cap_flags[32][8] -#endif -#ifndef PROCINFO_DECL -= { - "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce", - "cx8", "apic", "10", "sep", "mtrr", "pge", "mca", "cmov", - "pat", "pse36", "pn", "clflush", "20", "dts", "acpi", "mmx", - "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", "pbe" - } -#endif -#if !defined SHARED || defined PROCINFO_DECL -; -#else -, -#endif - #undef PROCINFO_DECL #undef PROCINFO_CLASS diff --git a/sysdeps/mips/dl-procinfo.c b/sysdeps/mips/dl-procinfo.c deleted file mode 100644 index 78979f8f43..0000000000 --- a/sysdeps/mips/dl-procinfo.c +++ /dev/null @@ -1,27 +0,0 @@ -/* Data for Mips version of processor capability information. - Copyright (C) 2007-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -/* Note: - When compiling elf/ldconfig.c, PROCINFO_CLASS is defined to static. - This dl-procinfo.c is included in sysdeps/generic/ldsodefs.h. - Afterwards, if not yet defined, PROCINFO_CLASS is defined to EXTERN - just before dl-vdso-setup.c is included. A "static" _dl_vdso_xyz - function prototype would lead to gcc warnings/errors: defined but - not used. */ -#undef PROCINFO_DECL -#undef PROCINFO_CLASS diff --git a/sysdeps/mips/dl-procinfo.h b/sysdeps/mips/dl-procinfo.h deleted file mode 100644 index dc0cdf98aa..0000000000 --- a/sysdeps/mips/dl-procinfo.h +++ /dev/null @@ -1,33 +0,0 @@ -/* Mips version of processor capability information handling macros. - Copyright (C) 2007-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#ifndef _DL_PROCINFO_H -#define _DL_PROCINFO_H 1 - -#include - -/* We cannot provide a general printing function. */ -#define _dl_procinfo(type, word) -1 - -/* There are no hardware capabilities defined. */ -#define _dl_hwcap_string(idx) "" - -/* We don't have any hardware capabilities. */ -#define _DL_HWCAP_COUNT 0 - -#endif /* dl-procinfo.h */ diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index b793b26112..985b4f25ee 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -43,7 +43,6 @@ $(modpfx)gconv-modules-s390.conf: ../sysdeps/s390/gconv-modules-s390.conf \ endif ifeq ($(subdir),elf) -sysdep-dl-routines += dl-procinfo-s390 ifeq ($(build-shared),yes) tests += tst-dl-runtime-resolve-noaudit tst-dl-runtime-resolve-audit \ diff --git a/sysdeps/s390/cpu-features.c b/sysdeps/s390/cpu-features.c index 75bcdd9d98..31a1f4d600 100644 --- a/sysdeps/s390/cpu-features.c +++ b/sysdeps/s390/cpu-features.c @@ -17,7 +17,8 @@ . */ #include - +#include +#include #include #include #include diff --git a/sysdeps/s390/dl-procinfo-s390.c b/sysdeps/s390/dl-procinfo-s390.c deleted file mode 100644 index f70849fd33..0000000000 --- a/sysdeps/s390/dl-procinfo-s390.c +++ /dev/null @@ -1,26 +0,0 @@ -/* Data for s390 version of processor capability information. - Copyright (C) 2006-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include - -const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] = - { - "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh", - "highgprs", "te", "vx", "vxd", "vxe", "gs", "vxe2", "vxp", "sort", "dflt", - "vxp2", "nnpa", "pcimio", "sie" - }; diff --git a/sysdeps/s390/dl-procinfo.c b/sysdeps/s390/dl-procinfo.c index 25673232ce..b6a9f499f0 100644 --- a/sysdeps/s390/dl-procinfo.c +++ b/sysdeps/s390/dl-procinfo.c @@ -16,9 +16,6 @@ License along with the GNU C Library; if not, see . */ -/* The hwcap and platform strings are now in - sysdeps/s390/dl-procinfo-s390.c. */ - /* Needed by sysdeps/unix/sysv/linux/dl-vdso-setup.c (as included from sysdeps/generic/ldsodefs.h). */ diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h deleted file mode 100644 index e63216358a..0000000000 --- a/sysdeps/s390/dl-procinfo.h +++ /dev/null @@ -1,72 +0,0 @@ -/* s390 version of processor capability information handling macros. - Copyright (C) 2006-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _DL_PROCINFO_H -#define _DL_PROCINFO_H 1 -#include - -#define _DL_HWCAP_COUNT 23 -extern const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] attribute_hidden; - -/* Hardware capability bit numbers are derived directly from the - facility indications as stored by the "store facility list" (STFL) - instruction. - highgprs is an alien in that list. It describes a *kernel* - capability. */ - -enum -{ - HWCAP_S390_ESAN3 = 1 << 0, - HWCAP_S390_ZARCH = 1 << 1, - HWCAP_S390_STFLE = 1 << 2, - HWCAP_S390_MSA = 1 << 3, - HWCAP_S390_LDISP = 1 << 4, - HWCAP_S390_EIMM = 1 << 5, - HWCAP_S390_DFP = 1 << 6, - HWCAP_S390_HPAGE = 1 << 7, - HWCAP_S390_ETF3EH = 1 << 8, - HWCAP_S390_HIGH_GPRS = 1 << 9, - HWCAP_S390_TE = 1 << 10, - HWCAP_S390_VX = 1 << 11, - HWCAP_S390_VXRS = HWCAP_S390_VX, - HWCAP_S390_VXD = 1 << 12, - HWCAP_S390_VXRS_BCD = HWCAP_S390_VXD, - HWCAP_S390_VXE = 1 << 13, - HWCAP_S390_VXRS_EXT = HWCAP_S390_VXE, - HWCAP_S390_GS = 1 << 14, - HWCAP_S390_VXRS_EXT2 = 1 << 15, - HWCAP_S390_VXRS_PDE = 1 << 16, - HWCAP_S390_SORT = 1 << 17, - HWCAP_S390_DFLT = 1 << 18, - HWCAP_S390_VXRS_PDE2 = 1 << 19, - HWCAP_S390_NNPA = 1 << 20, - HWCAP_S390_PCI_MIO = 1 << 21, - HWCAP_S390_SIE = 1 << 22, -}; - -/* We cannot provide a general printing function. */ -#define _dl_procinfo(type, word) -1 - -static inline const char * -__attribute__ ((unused)) -_dl_hwcap_string (int idx) -{ - return _dl_s390_cap_flags[idx]; -}; - -#endif /* dl-procinfo.h */ diff --git a/sysdeps/s390/multiarch/ifunc-resolve.h b/sysdeps/s390/multiarch/ifunc-resolve.h index df77ab2e4e..34f3b0d8d2 100644 --- a/sysdeps/s390/multiarch/ifunc-resolve.h +++ b/sysdeps/s390/multiarch/ifunc-resolve.h @@ -18,8 +18,9 @@ . */ #include -#include #include +#include +#include #define s390_libc_ifunc_expr_stfle_init() \ const unsigned long long *stfle_bits = features->stfle_bits; diff --git a/sysdeps/s390/s390-32/dl-machine.h b/sysdeps/s390/s390-32/dl-machine.h index d317f679d1..f15a049a62 100644 --- a/sysdeps/s390/s390-32/dl-machine.h +++ b/sysdeps/s390/s390-32/dl-machine.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/sysdeps/s390/s390-64/dl-hwcaps-subdirs.c b/sysdeps/s390/s390-64/dl-hwcaps-subdirs.c index 16bc3bde40..32fdabdb00 100644 --- a/sysdeps/s390/s390-64/dl-hwcaps-subdirs.c +++ b/sysdeps/s390/s390-64/dl-hwcaps-subdirs.c @@ -18,6 +18,7 @@ #include #include +#include const char _dl_hwcaps_subdirs[] = "z16:z15:z14:z13"; enum { subdirs_count = 4 }; /* Number of components in _dl_hwcaps_subdirs. */ diff --git a/sysdeps/s390/s390-64/dl-machine.h b/sysdeps/s390/s390-64/dl-machine.h index d6028630b7..132abf47c7 100644 --- a/sysdeps/s390/s390-64/dl-machine.h +++ b/sysdeps/s390/s390-64/dl-machine.h @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/sysdeps/sparc/dl-procinfo.c b/sysdeps/sparc/dl-procinfo.c deleted file mode 100644 index 060b86ba94..0000000000 --- a/sysdeps/sparc/dl-procinfo.c +++ /dev/null @@ -1,63 +0,0 @@ -/* Data for Linux/sparc version of processor capability information. - Copyright (C) 2002-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -/* This information must be kept in sync with the _DL_HWCAP_COUNT - definition in procinfo.h. - - If anything should be added here check whether the size of each string - is still ok with the given array size. - - All the #ifdefs in the definitions ar equite irritating but - necessary if we want to avoid duplicating the information. There - are three different modes: - - - PROCINFO_DECL is defined. This means we are only interested in - declarations. - - - PROCINFO_DECL is not defined: - - + if SHARED is defined the file is included in an array - initializer. The .element = { ... } syntax is needed. - - + if SHARED is not defined a normal array initialization is - needed. - */ - -#ifndef PROCINFO_CLASS -#define PROCINFO_CLASS -#endif - -#if !defined PROCINFO_DECL && defined SHARED - ._dl_sparc_cap_flags -#else -PROCINFO_CLASS const char _dl_sparc_cap_flags[28][11] -#endif -#ifndef PROCINFO_DECL - = { "flush", "stbar", "swap", "muldiv", "v9", "ultra3", "v9v", "v9v2", - "mul32", "div32", "fsmuld", "v8plus", "popc", "vis", "vis2", - "ASIBlkInit", "fmaf", "vis3", "hpc", "random", "trans", "fjfmau", - "ima", "cspare", "pause", "cbcond", "crypto", "adp" } -#endif -#if !defined SHARED || defined PROCINFO_DECL -; -#else -, -#endif - -#undef PROCINFO_DECL -#undef PROCINFO_CLASS diff --git a/sysdeps/sparc/dl-procinfo.h b/sysdeps/sparc/dl-procinfo.h deleted file mode 100644 index 699e9fd788..0000000000 --- a/sysdeps/sparc/dl-procinfo.h +++ /dev/null @@ -1,55 +0,0 @@ -/* Linux/sparc version of processor capability information handling macros. - Copyright (C) 1999-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _DL_PROCINFO_H -#define _DL_PROCINFO_H 1 - -#include -#include - -#define _DL_HWCAP_COUNT 28 - -static inline int -__attribute__ ((unused)) -_dl_procinfo (unsigned int type, unsigned long int word) -{ - int i; - - /* Fallback to generic output mechanism. */ - if (type != AT_HWCAP) - return -1; - - _dl_printf ("AT_HWCAP: "); - - for (i = 0; i < _DL_HWCAP_COUNT; ++i) - if (word & (1 << i)) - _dl_printf (" %s", GLRO(dl_sparc_cap_flags)[i]); - - _dl_printf ("\n"); - - return 0; -} - -static inline const char * -__attribute__ ((unused)) -_dl_hwcap_string (int idx) -{ - return GLRO(dl_sparc_cap_flags)[idx]; -}; - -#endif /* dl-procinfo.h */ diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c index 66287b4216..20966e0478 100644 --- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c +++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c @@ -56,27 +56,5 @@ PROCINFO_CLASS struct cpu_features _dl_aarch64_cpu_features # endif #endif -/* Number of HWCAP bits set. */ -#define _DL_HWCAP_COUNT 32 - -#if !defined PROCINFO_DECL && defined SHARED - ._dl_aarch64_cap_flags -#else -PROCINFO_CLASS const char _dl_aarch64_cap_flags[_DL_HWCAP_COUNT][10] -#endif -#ifndef PROCINFO_DECL -/* Matches the names in arch/arm64/kernel/cpuinfo.c of Linux. */ -= { "fp", "asimd", "evtstrm", "aes", "pmull", "sha1", "sha2", "crc32", - "atomics", "fphp", "asimdhp", "cpuid", "asimdrdm", "jscvt", "fcma", - "lrcpc", "dcpop", "sha3", "sm3", "sm4", "asimddp", "sha512", "sve", - "asimdfhm", "dit", "uscat", "ilrcpc", "flagm", "ssbs", "sb", "paca", - "pacg" } -#endif -#if !defined SHARED || defined PROCINFO_DECL -; -#else -, -#endif - #undef PROCINFO_DECL #undef PROCINFO_CLASS diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h deleted file mode 100644 index 1461664252..0000000000 --- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h +++ /dev/null @@ -1,37 +0,0 @@ -/* Processor capability information handling macros - aarch64 version. - Copyright (C) 2017-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _DL_PROCINFO_H -#define _DL_PROCINFO_H 1 - -#include -#include -#include -#include - -/* We cannot provide a general printing function. */ -#define _dl_procinfo(type, word) -1 - -static inline const char * -__attribute__ ((unused)) -_dl_hwcap_string (int idx) -{ - return (unsigned)idx < _DL_HWCAP_COUNT ? GLRO(dl_aarch64_cap_flags)[idx] : ""; -}; - -#endif /* dl-procinfo.h */ diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.c b/sysdeps/unix/sysv/linux/arm/dl-procinfo.c deleted file mode 100644 index 94cb8b39a3..0000000000 --- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.c +++ /dev/null @@ -1,66 +0,0 @@ -/* Data for Linux/ARM version of processor capability information. - Copyright (C) 2001-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -/* This information must be kept in sync with the _DL_HWCAP_COUNT and - _DL_PLATFORM_COUNT definitions in procinfo.h. - - If anything should be added here check whether the size of each string - is still ok with the given array size. - - All the #ifdefs in the definitions are quite irritating but - necessary if we want to avoid duplicating the information. There - are three different modes: - - - PROCINFO_DECL is defined. This means we are only interested in - declarations. - - - PROCINFO_DECL is not defined: - - + if SHARED is defined the file is included in an array - initializer. The .element = { ... } syntax is needed. - - + if SHARED is not defined a normal array initialization is - needed. - */ - -#ifndef PROCINFO_CLASS -#define PROCINFO_CLASS -#endif - -#if !defined PROCINFO_DECL && defined SHARED - ._dl_arm_cap_flags -#else -PROCINFO_CLASS const char _dl_arm_cap_flags[35][10] -#endif -#ifndef PROCINFO_DECL -= { - "swp", "half", "thumb", "26bit", "fastmult", "fpa", "vfp", "edsp", - "java", "iwmmxt", "crunch", "thumbee", "neon", "vfpv3", "vfpv3d16", - "tls", "vfpv4", "idiva", "idivt", "vfpd32", "lpae", "evtstrm", - "fphp", "asimdhp", "asimddp", "asimdfhm", "asimdbf16", "i8mm", - "aes", "pmull", "sha1", "sha2", "crc32", "sb", "ssbs", - } -#endif -#if !defined SHARED || defined PROCINFO_DECL -; -#else -, -#endif - -#undef PROCINFO_DECL -#undef PROCINFO_CLASS diff --git a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h b/sysdeps/unix/sysv/linux/arm/dl-procinfo.h deleted file mode 100644 index ff26dfeb7f..0000000000 --- a/sysdeps/unix/sysv/linux/arm/dl-procinfo.h +++ /dev/null @@ -1,73 +0,0 @@ -/* Linux/ARM version of processor capability information handling macros. - Copyright (C) 2001-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library. If not, see - . */ - -#ifndef _DL_PROCINFO_H -#define _DL_PROCINFO_H 1 - -#include -#include - -#define _DL_HWCAP_COUNT 27 - -/* Low 28 bits are allocated in HWCAP. */ -#define _DL_HWCAP_LAST 27 - -/* Low 7 bits are allocated in HWCAP2. */ -#define _DL_HWCAP2_LAST 6 - - -static inline const char * -__attribute__ ((unused)) -_dl_hwcap_string (int idx) -{ - return GLRO(dl_arm_cap_flags)[idx]; -}; - -static inline int -__attribute__ ((unused)) -_dl_procinfo (unsigned int type, unsigned long int word) -{ - switch(type) - { - case AT_HWCAP: - _dl_printf ("AT_HWCAP: "); - - for (int i = 0; i <= _DL_HWCAP_LAST; ++i) - if (word & (1 << i)) - _dl_printf (" %s", _dl_hwcap_string (i)); - break; - case AT_HWCAP2: - { - unsigned int offset = _DL_HWCAP_LAST + 1; - - _dl_printf ("AT_HWCAP2: "); - - for (int i = 0; i <= _DL_HWCAP2_LAST; ++i) - if (word & (1 << i)) - _dl_printf (" %s", _dl_hwcap_string (offset + i)); - break; - } - default: - /* Fallback to generic output mechanism. */ - return -1; - } - _dl_printf ("\n"); - return 0; -} - -#endif /* dl-procinfo.h */ diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h deleted file mode 100644 index 742221abe5..0000000000 --- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h +++ /dev/null @@ -1,46 +0,0 @@ -/* Linux/i386 version of processor capability information handling macros. - Copyright (C) 1998-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _DL_I386_PROCINFO_H -#define _DL_I386_PROCINFO_H 1 -#include - -#undef _dl_procinfo -static inline int -__attribute__ ((unused)) -_dl_procinfo (unsigned int type, unsigned long int word) -{ - /* This table should match the information from arch/i386/kernel/setup.c - in the kernel sources. */ - int i; - - /* Fallback to generic output mechanism. */ - if (type != AT_HWCAP) - return -1; - - _dl_printf ("AT_HWCAP: "); - - for (i = 0; i < 32; ++i) - if (word & (1 << i)) - _dl_printf (" %s", GLRO(dl_x86_cap_flags)[i]); - - _dl_printf ("\n"); - - return 0; -} -#endif diff --git a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h deleted file mode 100644 index 0be5148a58..0000000000 --- a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h +++ /dev/null @@ -1,48 +0,0 @@ -/* Linux/s390 version of processor capability information handling macros. - Copyright (C) 2006-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _DL_S390_PROCINFO_H -#define _DL_S390_PROCINFO_H 1 -#include -#include - - -#undef _dl_procinfo -static inline int -__attribute__ ((unused)) -_dl_procinfo (unsigned int type, unsigned long int word) -{ - /* This table should match the information from arch/s390/kernel/setup.c - in the kernel sources. */ - int i; - - /* Fallback to generic output mechanism. */ - if (type != AT_HWCAP) - return -1; - - _dl_printf ("AT_HWCAP: "); - - for (i = 0; i < _DL_HWCAP_COUNT; ++i) - if (word & (1UL << i)) - _dl_printf (" %s", _dl_s390_cap_flags[i]); - - _dl_printf ("\n"); - - return 0; -} -#endif diff --git a/sysdeps/unix/sysv/linux/s390/elision-conf.c b/sysdeps/unix/sysv/linux/s390/elision-conf.c index 7f3a20eefd..32b9b3a17d 100644 --- a/sysdeps/unix/sysv/linux/s390/elision-conf.c +++ b/sysdeps/unix/sysv/linux/s390/elision-conf.c @@ -20,7 +20,8 @@ #include #include #include -#include +#include +#include #define TUNABLE_NAMESPACE elision #include diff --git a/sysdeps/unix/sysv/linux/s390/sysconf.c b/sysdeps/unix/sysv/linux/s390/sysconf.c index e683a9aaea..8386523c96 100644 --- a/sysdeps/unix/sysv/linux/s390/sysconf.c +++ b/sysdeps/unix/sysv/linux/s390/sysconf.c @@ -17,8 +17,9 @@ . */ #include -#include #include +#include +#include static long int linux_sysconf (int name); diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h deleted file mode 100644 index 7b45fe4bf8..0000000000 --- a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h +++ /dev/null @@ -1,5 +0,0 @@ -#if IS_IN (ldconfig) -# include -#else -# include -#endif diff --git a/sysdeps/x86/dl-hwcap.h b/sysdeps/x86/dl-hwcap.h index 6bbcccfb6b..2384897e60 100644 --- a/sysdeps/x86/dl-hwcap.h +++ b/sysdeps/x86/dl-hwcap.h @@ -25,13 +25,6 @@ enum HWCAP_X86_AVX512_1 = 1 << 2 }; -static inline const char * -__attribute__ ((unused)) -_dl_hwcap_string (int idx) -{ - return GLRO(dl_x86_hwcap_flags)[idx]; -}; - /* We cannot provide a general printing function. */ #define _dl_procinfo(type, word) -1 diff --git a/sysdeps/x86/dl-procinfo.c b/sysdeps/x86/dl-procinfo.c index 91b8ff710c..05b8710d2a 100644 --- a/sysdeps/x86/dl-procinfo.c +++ b/sysdeps/x86/dl-procinfo.c @@ -54,22 +54,6 @@ PROCINFO_CLASS struct cpu_features _dl_x86_cpu_features # endif #endif -#if !defined PROCINFO_DECL && defined SHARED - ._dl_x86_hwcap_flags -#else -PROCINFO_CLASS const char _dl_x86_hwcap_flags[3][9] -#endif -#ifndef PROCINFO_DECL -= { - "sse2", "x86_64", "avx512_1" - } -#endif -#if !defined SHARED || defined PROCINFO_DECL -; -#else -, -#endif - #if defined SHARED && !IS_IN (ldconfig) # if !defined PROCINFO_DECL ._dl_x86_tlsdesc_dynamic diff --git a/sysdeps/x86/dl-procinfo.h b/sysdeps/x86/dl-procinfo.h deleted file mode 100644 index bac716aeb8..0000000000 --- a/sysdeps/x86/dl-procinfo.h +++ /dev/null @@ -1,26 +0,0 @@ -/* x86 version of processor capability information handling macros. - Copyright (C) 2017-2025 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _DL_PROCINFO_H -#define _DL_PROCINFO_H 1 -#include -#include - -#define _DL_HWCAP_COUNT HWCAP_COUNT - -#endif /* dl-procinfo.h */