From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 92969385F015 for ; Thu, 25 Aug 2022 19:19:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 92969385F015 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1661455166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type; bh=x4jUJmUxq+1rLqZp7cuFTwP0dKZJKvRHiCPgtXqHyLQ=; b=LPPVvODV64EhTL1ph6lU5pQcvrWEsCOtmkPib6uW867JtbqqhJ9SiyFeiUpRtRFUoPxhmi aCGRHGIvm3KowRwtr0L56qWlogk+mUZVeQg5Df363W3DfQ23GqdR4Ow4Wqbvb1ckfWu7n+ OGzKzTs6P5JWfl5zJHyIKjX7E/WJE3g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-614-bvtbsQHVPEiAPh9oypNfxA-1; Thu, 25 Aug 2022 15:19:25 -0400 X-MC-Unique: bvtbsQHVPEiAPh9oypNfxA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DAA06101E989; Thu, 25 Aug 2022 19:19:24 +0000 (UTC) Received: from oldenburg.str.redhat.com (unknown [10.39.192.36]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 9F953141510F; Thu, 25 Aug 2022 19:19:23 +0000 (UTC) From: Florian Weimer To: libc-alpha@sourceware.org Cc: Carlos O'Donell , Stefan Liebler Subject: [PATCH v2] s390: Move hwcaps/platform names out of _rtld_global_ro Date: Thu, 25 Aug 2022 21:19:21 +0200 Message-ID: <87a67s9lmu.fsf@oldenburg.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_NONE,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: Changes to these arrays are often backported to stable releases, but additions to these arrays shift the offsets of the following _rltd_global_ro members, thus breaking the GLIBC_PRIVATE ABI. Obviously, this change is itself an internal ABI break, but at least it will avoid further ABI breaks going forward. --- v2: Use more macro constants, fix typos. (Tests still running.) sysdeps/s390/Makefile | 2 + sysdeps/s390/dl-procinfo-s390.c | 32 +++++++++++++++ sysdeps/s390/dl-procinfo.c | 64 ++---------------------------- sysdeps/s390/dl-procinfo.h | 8 ++-- sysdeps/unix/sysv/linux/s390/dl-procinfo.h | 2 +- 5 files changed, 44 insertions(+), 64 deletions(-) diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index 5b6a96579c..1d687a2184 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -43,6 +43,8 @@ $(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 \ tst-dl-runtime-profile-noaudit diff --git a/sysdeps/s390/dl-procinfo-s390.c b/sysdeps/s390/dl-procinfo-s390.c new file mode 100644 index 0000000000..559f382793 --- /dev/null +++ b/sysdeps/s390/dl-procinfo-s390.c @@ -0,0 +1,32 @@ +/* Data for s390 version of processor capability information. + Copyright (C) 2006-2022 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" + }; + +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.c b/sysdeps/s390/dl-procinfo.c index f142221a17..88c955c12b 100644 --- a/sysdeps/s390/dl-procinfo.c +++ b/sysdeps/s390/dl-procinfo.c @@ -16,66 +16,10 @@ 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_s390_cap_flags -#else -PROCINFO_CLASS const char _dl_s390_cap_flags[23][9] -#endif -#ifndef PROCINFO_DECL -= { - "esan3", "zarch", "stfle", "msa", "ldisp", "eimm", "dfp", "edat", "etf3eh", - "highgprs", "te", "vx", "vxd", "vxe", "gs", "vxe2", "vxp", "sort", "dflt", - "vxp2", "nnpa", "pcimio", "sie" - } -#endif -#if !defined SHARED || defined PROCINFO_DECL -; -#else -, -#endif - -#if !defined PROCINFO_DECL && defined SHARED - ._dl_s390_platforms -#else -PROCINFO_CLASS const char _dl_s390_platforms[11][7] -#endif -#ifndef PROCINFO_DECL -= { - "g5", "z900", "z990", "z9-109", "z10", "z196", "zEC12", "z13", "z14", "z15", - "z16" - } -#endif -#if !defined SHARED || defined PROCINFO_DECL -; -#else -, -#endif +/* 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). */ #undef PROCINFO_DECL #undef PROCINFO_CLASS diff --git a/sysdeps/s390/dl-procinfo.h b/sysdeps/s390/dl-procinfo.h index 1f4e3875ba..e1f88b9ab7 100644 --- a/sysdeps/s390/dl-procinfo.h +++ b/sysdeps/s390/dl-procinfo.h @@ -21,8 +21,10 @@ #include #define _DL_HWCAP_COUNT 23 +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 @@ -78,7 +80,7 @@ static inline const char * __attribute__ ((unused)) _dl_hwcap_string (int idx) { - return GLRO(dl_s390_cap_flags)[idx]; + return _dl_s390_cap_flags[idx]; }; static inline int @@ -89,7 +91,7 @@ _dl_string_hwcap (const char *str) for (i = 0; i < _DL_HWCAP_COUNT; i++) { - if (strcmp (str, GLRO(dl_s390_cap_flags)[i]) == 0) + if (strcmp (str, _dl_s390_cap_flags[i]) == 0) return i; } return -1; @@ -104,7 +106,7 @@ _dl_string_platform (const char *str) if (str != NULL) for (i = 0; i < _DL_PLATFORMS_COUNT; ++i) { - if (strcmp (str, GLRO(dl_s390_platforms)[i]) == 0) + if (strcmp (str, _dl_s390_platforms[i]) == 0) return _DL_FIRST_PLATFORM + i; } return -1; diff --git a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h index 46790c2103..a8e27149fd 100644 --- a/sysdeps/unix/sysv/linux/s390/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/s390/dl-procinfo.h @@ -39,7 +39,7 @@ _dl_procinfo (unsigned int type, unsigned long int word) for (i = 0; i < _DL_HWCAP_COUNT; ++i) if (word & (1UL << i)) - _dl_printf (" %s", GLRO(dl_s390_cap_flags)[i]); + _dl_printf (" %s", _dl_s390_cap_flags[i]); _dl_printf ("\n"); base-commit: 89baed0b93639180fd7d0ba922873b003649c7af