From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id EF9B63882646 for ; Fri, 14 Jun 2024 12:58:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EF9B63882646 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 EF9B63882646 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::436 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718369924; cv=none; b=kiI65dOOBa1690opsDCkCjMIDnUZneIBFKN+ArqtC6E+s4bwuwGtME8P42M5dYZVmv3hQZsfJHdsUITNaIdvt/56XYKd8nUFKQfBl5+H9sTuGE9dyIEMLImq6hWEfNGJkuKTc8D7e6+Oie7Mnjj48QQy74CAhSMTewLBHKKDFuA= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1718369924; c=relaxed/simple; bh=5yX3cp/eWtGVSlBMhwCs2969wONztPSsRenkID9wfcc=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=Fe5z0VxV5t9tfTpzQtgfkIw75OjUIcHGvTCq+B32C8AKbFd4Wzio24tricvUx0xAhNhAZJ+GwWBa9iIHe/4oDcp+LKHoU7zddzeE6dcr/bMGiM/8fw4pMcq90WniBHqzC+hOR5OSUQddq5/CPOMwNYuZ1zsb80mnC77wvhd93CA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pf1-x436.google.com with SMTP id d2e1a72fcca58-70436ac8882so1693079b3a.2 for ; Fri, 14 Jun 2024 05:58:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1718369921; x=1718974721; darn=sourceware.org; h=content-transfer-encoding:in-reply-to:organization:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to; bh=QUl+mNWaG5Zvw80DvCTBHW6eKfXBved8TcevcfLnHgY=; b=bTYC8VuO7x/dxn2Jfy1vvB8RaqCOMEmdtBu6Jmz+fNgz/JPphN3Sjf3Nl/FjeUkdEy aMM8oO41+dZZAvIRFf84vJm24WbXBzNv7n63j/wmcqHXup1FSEZ292ReFhELHVbqUr47 KRMc1+mX8Oom0IJ6N9ojVCpl3CFrmzfbw176/jlDFvzPJPKtSPRK0f8Xw2yWWjel+gcV uFYL/p5Q0cHvb0Rb5ukKSS+/NYy60UFWTxD74ujbqVDS+fU7m7Qa/DapIE5DyE+/H786 JFa9ryGxfJLvaVF0vNKDHQOFSIwCjKbS97ShHqlMqbMdF3tvBeWpqFSnuWhl/Wvia0Jd j0hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718369921; x=1718974721; h=content-transfer-encoding:in-reply-to:organization:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=QUl+mNWaG5Zvw80DvCTBHW6eKfXBved8TcevcfLnHgY=; b=puhsEdLGXJhxesyOYVOHoKkV/ziBn0wLAAR8SZyZcC07BF8xrq62lMyiwmDUpb9Pzu g63Rymt70BMr2THF7UoV0PpQTVgPOkvNl1ial66aOsTJf5MaWn/NOjoqPVxYyzGLUHo6 Xy1R7lnMgqjlxyAwcWXdkvRy41/h52oKWDi4oJggTCMVz1YE5x/NqziIj++94X9vyruI GEINrnpixKsg1LmP9sq5CA3C67rxVq7nN8DwLNuTOjisqU4sYyRZ0hTn7r5KO/D2DooD LI0zvFZ4rg401JM3Tpz/cE0N7YgzxLgTln9ZhijBjLd7VRiecBNHwxgVA/fo6QrC1Jt/ bQNw== X-Forwarded-Encrypted: i=1; AJvYcCUJdiUIcGhhzpf8tIisKUh2EQIHp1a+J2nxxoHFf8AG5IpVLeRKeyGXCR0w1/zNAIndMjDYkdzV2OUcEm3FOUmBGEG0jhvpwHVg X-Gm-Message-State: AOJu0YxRlZHdkWcrzlvROj5pyYmNK/PtaBhQYv6qoBy8gejwSsZlKooT tRFFWhPeM7ggn1SRYRZ+5Trhh4Fvlpq0xtOXrWaRMnl8KcuCpEWih+7fmNsatBtymLvVzYaBl6J a X-Google-Smtp-Source: AGHT+IG1/wNYPJb45O+RHbqsRoBT4F06tQI1VnuMi7VgvyEHZI/DJnGp+w6TULHdMIsfocTsxeq1Iw== X-Received: by 2002:a05:6a20:7483:b0:1b8:4107:ce35 with SMTP id adf61e73a8af0-1bae7f0c2ddmr2877892637.28.1718369920790; Fri, 14 Jun 2024 05:58:40 -0700 (PDT) Received: from ?IPV6:2804:1b3:a7c0:c5fb:292c:fe99:ddb0:5719? ([2804:1b3:a7c0:c5fb:292c:fe99:ddb0:5719]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1f855ee9be0sm31560285ad.176.2024.06.14.05.58.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 14 Jun 2024 05:58:39 -0700 (PDT) Message-ID: <11bbc979-c983-4e4e-9f37-985a35119f70@linaro.org> Date: Fri, 14 Jun 2024 09:58:36 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [V2] elf: Remove platform strings in dl-procinfo.c To: Stefan Liebler , libc-alpha@sourceware.org Cc: fweimer@redhat.com, devel@otheo.eu, bergner@linux.ibm.com References: <0e5caf48-b710-4049-9129-1680406a9b5a@linaro.org> <20240612073235.702683-2-stli@linux.ibm.com> Content-Language: en-US From: Adhemerval Zanella Netto Organization: Linaro In-Reply-To: <20240612073235.702683-2-stli@linux.ibm.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,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: On 12/06/24 04:32, Stefan Liebler wrote: > Remove the platform strings in dl-procinfo.c where also > the implementation of _dl_string_platform() was removed. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > sysdeps/alpha/dl-procinfo.c | 62 --------------------------------- > sysdeps/csky/dl-procinfo.c | 62 --------------------------------- > sysdeps/mips/dl-procinfo.c | 49 ++++---------------------- > sysdeps/s390/dl-procinfo-s390.c | 6 ---- > sysdeps/s390/dl-procinfo.h | 1 - > sysdeps/x86/dl-procinfo.c | 16 --------- > 6 files changed, 7 insertions(+), 189 deletions(-) > delete mode 100644 sysdeps/alpha/dl-procinfo.c > delete mode 100644 sysdeps/csky/dl-procinfo.c > > diff --git a/sysdeps/alpha/dl-procinfo.c b/sysdeps/alpha/dl-procinfo.c > deleted file mode 100644 > index 633dcbf974..0000000000 > --- a/sysdeps/alpha/dl-procinfo.c > +++ /dev/null > @@ -1,62 +0,0 @@ > -/* Data for Alpha version of processor capability information. > - Copyright (C) 2008-2024 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_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_alpha_platforms > -#else > -PROCINFO_CLASS const char _dl_alpha_platforms[5][5] > -#endif > -#ifndef PROCINFO_DECL > -= { > - "ev4", "ev5", "ev56", "ev6", "ev67" > - } > -#endif > -#if !defined SHARED || defined PROCINFO_DECL > -; > -#else > -, > -#endif > - > -#undef PROCINFO_DECL > -#undef PROCINFO_CLASS > diff --git a/sysdeps/csky/dl-procinfo.c b/sysdeps/csky/dl-procinfo.c > deleted file mode 100644 > index 0c81518cff..0000000000 > --- a/sysdeps/csky/dl-procinfo.c > +++ /dev/null > @@ -1,62 +0,0 @@ > -/* Data for C-SKY version of processor capability information. > - Copyright (C) 2018-2024 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_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_csky_platforms > -#else > -PROCINFO_CLASS const char _dl_csky_platforms[4][6] > -#endif > -#ifndef PROCINFO_DECL > -= { > - "ck610", "ck807", "ck810", "ck860" > - } > -#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 > index 0b1dfeea2d..6a1aaefef2 100644 > --- a/sysdeps/mips/dl-procinfo.c > +++ b/sysdeps/mips/dl-procinfo.c > @@ -16,47 +16,12 @@ > License along with the GNU C Library. If not, see > . */ > > -/* This information must be kept in sync with the _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_mips_platforms > -#else > -PROCINFO_CLASS const char _dl_mips_platforms[4][11] > -#endif > -#ifndef PROCINFO_DECL > -= { > - "loongson2e", "loongson2f", "octeon", "octeon2" > - } > -#endif > -#if !defined SHARED || defined PROCINFO_DECL > -; > -#else > -, > -#endif > - > +/* 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/s390/dl-procinfo-s390.c b/sysdeps/s390/dl-procinfo-s390.c > index 2821e40cb1..652f6067a3 100644 > --- a/sysdeps/s390/dl-procinfo-s390.c > +++ b/sysdeps/s390/dl-procinfo-s390.c > @@ -24,9 +24,3 @@ const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] = > "highgprs", "te", "vx", "vxd", "vxe", "gs", "vxe2", "vxp", "sort", "dflt", > "vxp2", "nnpa", "pcimio", "sie" > }; > - > -const char _dl_s390_platforms[_DL_PLATFORMS_COUNT][7] = > - { > - "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13", "z14", "z15", > - "z16" > - }; > diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h > index ffeb655ad0..63c9889f94 100644 > --- a/sysdeps/s390/dl-procinfo.h > +++ b/sysdeps/s390/dl-procinfo.h > @@ -24,7 +24,6 @@ > extern const char _dl_s390_cap_flags[_DL_HWCAP_COUNT][9] attribute_hidden; > > #define _DL_PLATFORMS_COUNT 11 > -extern const char _dl_s390_platforms[_DL_PLATFORMS_COUNT][7] attribute_hidden; > > /* The kernel provides up to 32 capability bits with elf_hwcap. */ > #define _DL_FIRST_PLATFORM 32 > diff --git a/sysdeps/x86/dl-procinfo.c b/sysdeps/x86/dl-procinfo.c > index 5920d4b320..165ffd89a9 100644 > --- a/sysdeps/x86/dl-procinfo.c > +++ b/sysdeps/x86/dl-procinfo.c > @@ -71,22 +71,6 @@ PROCINFO_CLASS const char _dl_x86_hwcap_flags[3][9] > , > #endif > > -#if !defined PROCINFO_DECL && defined SHARED > - ._dl_x86_platforms > -#else > -PROCINFO_CLASS const char _dl_x86_platforms[4][9] > -#endif > -#ifndef PROCINFO_DECL > -= { > - "i586", "i686", "haswell", "xeon_phi" > - } > -#endif > -#if !defined SHARED || defined PROCINFO_DECL > -; > -#else > -, > -#endif > - > #if defined SHARED && !IS_IN (ldconfig) > # if !defined PROCINFO_DECL > ._dl_x86_tlsdesc_dynamic