From patchwork Tue Jan 16 18:53:32 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 25419 Received: (qmail 114853 invoked by alias); 16 Jan 2018 18:53:42 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 114821 invoked by uid 89); 16 Jan 2018 18:53:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: EUR01-VE1-obe.outbound.protection.outlook.com Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Szabolcs.Nagy@arm.com; Message-ID: <5A5E4A2C.7010801@arm.com> Date: Tue, 16 Jan 2018 18:53:32 +0000 From: Szabolcs Nagy User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: GNU C Library , Alan Hayward CC: nd@arm.com Subject: [committed] aarch64: make HWCAP updates less error prone X-ClientProxiedBy: DB6PR06CA0002.eurprd06.prod.outlook.com (2603:10a6:6:1::15) To DB6PR0802MB2488.eurprd08.prod.outlook.com (2603:10a6:4:a0::23) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b92466a3-1ea4-4c1e-64f4-08d55d127211 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(48565401081)(2017052603307)(7153060)(49563074)(7193020); SRVR:DB6PR0802MB2488; X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2488; 3:iON7Mty5sF6jhy7oPu7EcZG8FGVV28Gsu1wjGPpfAs5/B/Zhji1ig1jS2j88leLnnz0kSLccrzi0l4ww4e/HlK5hflv6lQdskvIL2zuMynXuYFL1MlsgJtm57FxRxUQt7jp74hrw7rsIuDUhGww5v2yqO1o35sRb+j4H7WuC2is0tcb/fJlxChT5TYz3MtSvTEsX0lOd2ioRkGInspZysEh9rmE71OwFmzHDWCYmq0Np4DEwOtnpfJp+SdCqD/E5; 25:fnfq5V76tLF+LqEERGED3/HKF0ImNhoT+QlqY7TO+sz9HZ03Gn2HncoASpi37/k9ErkwqQlE0uqYVC6ELeMVmKTTLHAP8mb3//eHRAswQHWXp8NW2CbVV7T8yPJdfhMLCHwxIn4dtA5fkK10DMOLL3gCNXFWtWaI7F0KxXd05MYQw42szO2Q1OXMjnoc/PxEaDMeyrZZPGqtgpV7GwkmF1435fFhVFEoCgYt2ebopPHUao1d2gUlGlwb89D/bYfPkwQy2EcY8XNXEsEYz4xnLu3gtIUbBTIgoVEtTwCmenT1GNdv95PVV4dBdtO7mLdHVUJ1+zZOWBlKpd4Nv0C8wg==; 31:XbpaDmNRqRNkNFx+hQGl7RmHLSMFodpDm4JYfbcLRwhzKDXnWdYBE221uWP7uEUOXQWX7kKqLCzvRjO9KDriOWe4njO21NY9uAn1/Yl43o2RDWBbNtNEUDw8Ww8yRQYGaJwRHcuQjnKRP/sU9MfXHbnycAgxRj/PbBaYMEwVRfIJuU3SzxhBbo5GiW4BWSViue++7acMbzv3jUEshAhlnAvbUoxmsnZYPtZcunWDo08= X-MS-TrafficTypeDiagnostic: DB6PR0802MB2488: NoDisclaimer: True X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2488; 20:Xx+Qfm1umTzFA+cfLfMXpGAbO0bDEFp+Qy0OkdwgYbWkG/HkguoC6m90IghMl2uiBuq12VxMU0pvLtxNBOwLU7Fv3Bly+yj/WKU+wN26w7QmwvZ4GXF7nTdcZM5MEK9/qWWrhGDQuhmRx3/Ayg+m3RKrB35ZXsgLVH6WgKE6wvI=; 4:ydvcoBor6S74isHY6tSzkJTHbPAcCWAsmoVvte4nHhpaOsgFfPFQybSilcUlourgGGECDZX9rcmwf5WrZprRtyGUYzRwVK7EJ0vv+LFVlo5iB12fQWD6XSVc22LHFpeWWIw45xtQGKMx0iYZvK6aKF4plebeHYboPk2PCFlfbYF9tuxo0iIzWui3ty82qDE4D8O0+y1d5dW8M+LvGiZLOFaIS7k5S6Xvk5gQuA/NMZwjY0hB985hxobgVWjcjktPvGvS8ujxyUNmfqe3nXSZCCM33Mi2rP22eoj5yVMLJWAvkvXbyjainOvRJ4EgcN2H X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(102415395)(6040470)(2401047)(8121501046)(5005006)(10201501046)(3231023)(2400038)(944501161)(93006095)(93001095)(3002001)(6055026)(6041268)(20161123562045)(20161123558120)(20161123560045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(6072148)(201708071742011); SRVR:DB6PR0802MB2488; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DB6PR0802MB2488; X-Forefront-PRVS: 0554B1F54F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6049001)(346002)(376002)(39380400002)(39860400002)(366004)(396003)(377424004)(189003)(199004)(6116002)(386003)(478600001)(110136005)(77096006)(86362001)(16586007)(7736002)(53936002)(2476003)(58126008)(87266011)(65956001)(8936002)(72206003)(316002)(81156014)(105586002)(65806001)(6486002)(26005)(66066001)(16576012)(5890100001)(3846002)(25786009)(8676002)(33964004)(305945005)(33656002)(65816011)(36756003)(84326002)(568964002)(5000100001)(270700001)(2906002)(106356001)(64126003)(59896002)(97736004)(4326008)(68736007)(4610100001)(5660300001)(52116002)(83506002)(6636002)(21490400003)(16526018)(80316001)(81166006); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR0802MB2488; H:[10.2.206.69]; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: arm.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR0802MB2488; 23:W3wna+Rn0onz+z44Yj2/vRvMck6ZbSoXmu4jt1a?= =?us-ascii?Q?cZ0HjCrYOvqN0rEnAAwJO6Nasid1g15U6nVRT0jtltUotoVj6B0LwYZWHSsB?= =?us-ascii?Q?3P/x28cfacMvwBpcMF7iZ7bBw6rYKVUDSEpxa5Or9IDCyFR+iV+fMuy6Sg07?= =?us-ascii?Q?wCerIN3rprH58nTwIzh7PYpqg13OXDXUFX8PilNVFtJ7fP2DKopCUiiCMTlH?= =?us-ascii?Q?VIAPt1HSP3nrrBqs8S0O10secXLxR1iZ3PDtc4LYCHbsIG0g/IQ0VlSXeelx?= =?us-ascii?Q?w6JQxF01dAAoN1tH/uz8z9t9G7UIeTH5rmKUlrfnpu1kKL4i75VvGvV2jjSn?= =?us-ascii?Q?LiYE4z1NqcBaQSFrf4i2nRViW9IPRmqKgJa/PXsupkOXHp6ykaF/1rw6CXqe?= =?us-ascii?Q?LeFKsB8BwA4MlHTP+a9KDXsIAMpp5v50Tf751nVM5lTrp6IC+nz3aXWC4zJn?= =?us-ascii?Q?ZEN9yFK3F0pX6uo2Tk2UTLHgLGy4p//1jx7/1i20JQu0VnK5Y0w9+7yEQhAr?= =?us-ascii?Q?Rxq5ttQIFz+UIavmf+ROQKyeov493PeW1Lo56Sht60uUmafQ6KTEoTHokiqP?= =?us-ascii?Q?/OsDzo7YLKcNWBxsRwKTbaF/G7ClMEAeALy6lf2KRoPs1kaErnXjvCY466Py?= =?us-ascii?Q?PetdkCJAVtVxqV8AqYm2PG0V0KUFtPs8yevz23QR+na8C4Knom82dCMJ6EqP?= =?us-ascii?Q?M1xjvKpreYI7EnCmarsJekkDXyPXliIlaeW1le90hDW7N5/u8j/1Ug6fQQjL?= =?us-ascii?Q?8l1lmFZgkabGCb61JKYhQ0P2BwnLe4Plz7YWCy7jLPZaWBp/P4StelVq+AAG?= =?us-ascii?Q?HfOiDNhks9cbhoSFU/HMMsJO1VxytgPGivo66lqH8F7u3LSNuES2rXHZVRUI?= =?us-ascii?Q?c30mQRHblFyGyHMWghLPaivzI2qPPsM4Z2+9VahWNj8zvY0k9oZ86SoQjUkq?= =?us-ascii?Q?ek320/9pt16ZfkJLD9/CvBllGcvdKDun8TNEYpf3fWGwkTC4NdmvNe7PC4o+?= =?us-ascii?Q?IzhI+WmkmGKfo3jSv0IGw40+rSSUahclvxrE0sVvwlMZP10VButDs4sUE/Cj?= =?us-ascii?Q?//0XB90MpSGer/eArnHJr8AKIE/OmEo8vgqOQ228L0LWutSoNzoFPImZcx37?= =?us-ascii?Q?bTEHSShb1o1U2UD+8G8BXrNb9XZjtIaHTZH5hESV4VacvwuOsDs920DOoEAM?= =?us-ascii?Q?7b45koLm3mFhBNYMS5xoVhOY0zamQIKxGfbQNSTSaNtf/VkUBViD4oLdiXPN?= =?us-ascii?Q?1HOxQNQlQMZCqhNYQ4VASFTZ8gMNiHAw/hhjLPQn4SRC21wVtVspv3KiorqP?= =?us-ascii?Q?4JfiN/aFghVqH6XB/zRyFOQWxYN0asoF4wLnsqf5bEj3PI4R1q02NEzrL7hj?= =?us-ascii?Q?5REL9K951VfWebKjoSHvXQcXDGdfY7rk6X8fFI4H59qPsbXq5YajJs1bBAK4?= =?us-ascii?Q?xtRqbf3BNlcRXHLcc6dtMk8WKap18qAc=3D?= X-Microsoft-Exchange-Diagnostics: 1; DB6PR0802MB2488; 6:tdajuCygAP5G4Gi+04G8LBgOc7YwHnyiLixxFwm2QuCkbCtnj1GgBokv0d2UcaBsXThMjMYcfbLFXZzXPty9vDVasgcc4ivy3DNG5ELx7O0MUbHpSiuK/rGbxu0JZ0hrfYeoeljEWKWJGOC05LMfZ+VXP1yJsieC5sBbrCRiMAdbGBoT+08gq+DsmQj/o4mV+2xFVffmab8vzKV5AdbFL7D+wrfJCglKreAgmq0Eu+e5efn1gUAD8JjIwa12vaXHjP7Ju49tJ3Bfg7+ddRj/NXJw/97ZL18dJEG/o5CTjXymObH17aCbSlPo+VJLZQwScNlG6LtLZbn0aewvIyHaEPUYakp2dkt/mPj/zAJy13o=; 5:0eA16KFJoFk8WEDLQ+LEatz2a+IZDVIPZQQuZf+FqxINcEHzNclm2Gfb6FnXvjx+rTJCtXNgbwlbCNlaEk9zvunuuS4MZR5KppcEDqscYF0Nm4dy2qbGqlR59JSHUZ5OPO3eT7P1Y/Y/Bip87YykEaZukB5rip2/N48dXY8+VQ8=; 24:pyaGaP3EW2XtaYfsNupTdtmNyePsVLge3wLqLbFpztTbule6FkUcpmsx8Lex+yaPzYZFLP0VnsCfA71IpgQkeHwqQZqhChVpQw8b4fKmJeg=; 7:QZmpRbQuG9TTm8RR6twf1PEMLjsc8GlK+2w441M5WHGlGF5XO8IdQyexNM0wsLXm+8JmaIPabgTYT7fo30awj86UU1uGLIAoUa5rOQTqiZ9iN2yyo6/TmrZppB3FFL1ClbJVW45Gp/6CPlM0DN7Y1meVt3ucjfL2vXTRl9q38x2wqiaRKOFIG6PxRMyasIU4CtAyfrhl7vL9NDOZ3Z/Pfl/schTyhODcy1QqX3vh6fIR4qe8un3NdTYkzmTeV+fb SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2018 18:53:34.5767 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b92466a3-1ea4-4c1e-64f4-08d55d127211 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR0802MB2488 Remove unused _DL_HWCAP_LAST definition and move _DL_HWCAP_COUNT where it is needed (dl-procinfo.h always includes dl-procinfo.c). 2018-01-16 Szabolcs Nagy * sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h (_DL_HWCAP_LAST): Remove. (_DL_HWCAP_COUNT): Move to ... * sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c (_DL_HWCAP_COUNT): ... here. diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c index 67d7fd6f35..2da8d7b910 100644 --- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c +++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.c @@ -56,10 +56,13 @@ PROCINFO_CLASS struct cpu_features _dl_aarch64_cpu_features # endif #endif +/* Number of HWCAP bits set. */ +#define _DL_HWCAP_COUNT 16 + #if !defined PROCINFO_DECL && defined SHARED ._dl_aarch64_cap_flags #else -PROCINFO_CLASS const char _dl_aarch64_cap_flags[16][10] +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. */ diff --git a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h index cf683f5b29..6887713149 100644 --- a/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h +++ b/sysdeps/unix/sysv/linux/aarch64/dl-procinfo.h @@ -27,12 +27,6 @@ /* We cannot provide a general printing function. */ #define _dl_procinfo(type, word) -1 -/* Number of HWCAP bits set. */ -#define _DL_HWCAP_COUNT 16 - -/* Offset of the last bit allocated in HWCAP. */ -#define _DL_HWCAP_LAST 15 - /* HWCAP_CPUID should be available by default to influence IFUNC as well as library search. */ #define HWCAP_IMPORTANT HWCAP_CPUID