From patchwork Tue Mar 26 16:59:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 1916291 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=cv2st+q2; dkim=pass (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-armh-onmicrosoft-com header.b=cv2st+q2; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (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 4V3wzW3LPpz1yWv for ; Wed, 27 Mar 2024 04:00:37 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 8845B3858421 for ; Tue, 26 Mar 2024 17:00:35 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2071.outbound.protection.outlook.com [40.107.20.71]) by sourceware.org (Postfix) with ESMTPS id 579FA3858CDA for ; Tue, 26 Mar 2024 17:00:09 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 579FA3858CDA Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=arm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 579FA3858CDA Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.20.71 ARC-Seal: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1711472412; cv=pass; b=T3s8tRGBnTqRLpPUFWP5bDNqdF18JPEqr4Q3NrqPqfSxTXGJKYCAOGU9OXDmDI8WBV8TP7MkQtYDezQ0pw+ZIL9QvzPN8un1b0YcjdLwzSUFN5LUuFn0/E59Y59JdeFqgCEpkJy05f8X50TeTReuLx8DJtHyPOLHwko6gJgKO5o= ARC-Message-Signature: i=3; a=rsa-sha256; d=sourceware.org; s=key; t=1711472412; c=relaxed/simple; bh=Kl8cRSw2a5ma0jx6+IrEBSi4y4/oZKpCuhoBDG4Ztfs=; h=DKIM-Signature:DKIM-Signature:From:To:Subject:Date:Message-ID: MIME-Version; b=QXKvbf+TbtT66qpVJZRzs8GcUc/Dr7DQu2sERhQtb7YBXiPnk42Ekm9qDEspc2jTliaJryDkeNmL3oQdpFrSNe9r28I4LArtTjDOyQ/VkidBWfAWxSimb15K6fvm3j/DUxqlvxKFU68ff44u+P7Nh3ILrOVh2FiHb38xvzbruew= ARC-Authentication-Results: i=3; server2.sourceware.org ARC-Seal: i=2; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=pass; b=AF/J//7lprMJoSre3DglAyIe8ImHK8z+qGtouthiA/vGgicMMryVGnc22qk2TU/RG0dFKj3Ga2P6HrIC9QpGEI1Na3XuWUNURZTlA9Z5AW4rZa3ch8Y7YzPkHejl4kFULQyBalpktsmgaCs1HuxDv/n/37+Eh/SL6prDNaPO4eMNNZwh11SxAvVSLyZlRygrquozkz8ghVNM0NphVQwD/e4LNx8P0zcZ0XufgwU69HUyTlamGlXPJ/O5sNWr6YYd1Qs+Fuccq0ODU7qOLuZ82+bFqwLv0Tyiw6StGFJvMoxftlcIAnAywsUFiN6AxzafzTCpzyPkIBl+z9iC9Efhhw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zJMVhEP1pVtNff5kuHhE8th3GilWl+egVJi9AfDbSPQ=; b=CdRXS6ZCl/uEEBzZKuhY6gbe05Dk0BGyFQqFGTc5bFp9ce2AkX8HQZVxJeto7zKYPxSpU+sbgH78CTuPswERzWD9x7e8HEaiIRFORDOOHhkW7B/R1Suuejxy65ZtIUgIOCPkVbFvTHs/fznACsk1sGPkF587y+kQ3m++xPWoUOPlCV778vOj973m45MQ9jzvIWIi6XIrArCRL6m46mtZ5e99BbXYGDE/mD3UBJVeMFjmbwb6MuT2LPCmEt0Aw3fkG4MrxTGNW3o1nUa+pbbrONmar5yQV2bz+TlF/pRGpH/KEcxeHPJ2FW4J392L4hL74ezR5xyw/sF7nVh/xE584Q== ARC-Authentication-Results: i=2; mx.microsoft.com 1; spf=pass (sender ip is 63.35.35.123) smtp.rcpttodomain=gcc.gnu.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com; arc=pass (0 oda=1 ltdi=1 spf=[1,1,smtp.mailfrom=arm.com] dkim=[1,1,header.d=arm.com] dmarc=[1,1,header.from=arm.com]) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zJMVhEP1pVtNff5kuHhE8th3GilWl+egVJi9AfDbSPQ=; b=cv2st+q2/rXeC9+0ggdFFk56Ukey4mlKEffTwJf72wjZ4CplSZaVdvG1HIInZwereiUFhwoiuof+sX+ANmQzDSaLNX7fvQVNYE18Toh02+xM5HvPXmc57bDCq3Lgc0eSJ8NbXZoEmWVihrKtLVzoYa2UUVee4XciJmH54QYE/Os= Received: from AS4P251CA0006.EURP251.PROD.OUTLOOK.COM (2603:10a6:20b:5d2::15) by DU0PR08MB9393.eurprd08.prod.outlook.com (2603:10a6:10:420::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Tue, 26 Mar 2024 17:00:04 +0000 Received: from AMS1EPF0000004D.eurprd04.prod.outlook.com (2603:10a6:20b:5d2:cafe::cc) by AS4P251CA0006.outlook.office365.com (2603:10a6:20b:5d2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.13 via Frontend Transport; Tue, 26 Mar 2024 17:00:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dmarc=pass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; pr=C Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by AMS1EPF0000004D.mail.protection.outlook.com (10.167.16.138) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.10 via Frontend Transport; Tue, 26 Mar 2024 17:00:03 +0000 Received: ("Tessian outbound 5ad6c4395be7:v300"); Tue, 26 Mar 2024 17:00:03 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: 8311593f1258af40 X-CR-MTA-TID: 64aa7808 Received: from e2a72a430104.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id EA741693-EC38-4700-BA0C-E674FBF3C659.1; Tue, 26 Mar 2024 16:59:51 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id e2a72a430104.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 26 Mar 2024 16:59:51 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PwuXCk5NR4U+VE/C0I102tN7JK70SvdnVPHVXoceiMc4+5ZwLJ3LWl1Z/UTXZ29EMwcWb5R+aTB2CeIhc1zCuue6/nkkA5yH1uIEUXmIoDGw50fJcHcKpfMcVFvorHaoBgu7qwOabc6FljNabGt4C7sBBjzJJ3zI5GOeYgrGHGQHRgYZhQveWXHkF0pfjsXkHrq3ZyH/borIFM8KDsQV4qU+WoPYOVbZw0lqOQ1dKJ+h8M77EhxpLSvRCB2pBTRjal5VTqJ0+KbS1Bc2Cy4+7MiU+PVZEDYN+tvBf35T4d+wS6H5gRJ3b0omyxk16uvBJQeBrxVjm/hFNEIMLxDAtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zJMVhEP1pVtNff5kuHhE8th3GilWl+egVJi9AfDbSPQ=; b=i8OGrtYbGHmb0YQujCq2iMIZIftBWWteGs141zHaiaRDnpltfo/W8LlWUAB5g+xtBR9nz/xbjozZRaOsysveZPdDZj1lpWv0Q6BBPBpstxE9g0EL0LgT6qFqj12O35vkCrl9G7bVOK4LaRsqo/S9+Rlj6tRa+dT+t9SKGPGASGYGKZ4BxqZxM8KpVYqn1ehYE+7f1xlfkCMFVlN1ZSNQzm8w/JrHSF1RiqYtZiZU/8s3Ygi4CWbMRqpNMe3z44ZsiabWcjQQyjqIi/Vh0ZRftSCLFxLsNfGBHdTIo+ClBMd7TDgXY/V4YwM9jUORzcH05Rd3tGXaH76MrJexWjDffA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zJMVhEP1pVtNff5kuHhE8th3GilWl+egVJi9AfDbSPQ=; b=cv2st+q2/rXeC9+0ggdFFk56Ukey4mlKEffTwJf72wjZ4CplSZaVdvG1HIInZwereiUFhwoiuof+sX+ANmQzDSaLNX7fvQVNYE18Toh02+xM5HvPXmc57bDCq3Lgc0eSJ8NbXZoEmWVihrKtLVzoYa2UUVee4XciJmH54QYE/Os= Received: from PAWPR08MB8982.eurprd08.prod.outlook.com (2603:10a6:102:33f::20) by DB8PR08MB5369.eurprd08.prod.outlook.com (2603:10a6:10:11c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Tue, 26 Mar 2024 16:59:49 +0000 Received: from PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::8b1b:5f28:5006:ac18]) by PAWPR08MB8982.eurprd08.prod.outlook.com ([fe80::8b1b:5f28:5006:ac18%4]) with mapi id 15.20.7409.028; Tue, 26 Mar 2024 16:59:47 +0000 From: Wilco Dijkstra To: Richard Sandiford , Kyrylo Tkachov CC: GCC Patches Subject: [PATCH] libatomic: Cleanup macros in atomic_16.S Thread-Topic: [PATCH] libatomic: Cleanup macros in atomic_16.S Thread-Index: AQHaf5z+og7xXUhhq0uV6ZkfGhIUTA== Date: Tue, 26 Mar 2024 16:59:47 +0000 Message-ID: Accept-Language: en-GB, en-US Content-Language: en-GB X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: x-ms-traffictypediagnostic: PAWPR08MB8982:EE_|DB8PR08MB5369:EE_|AMS1EPF0000004D:EE_|DU0PR08MB9393:EE_ x-checkrecipientrouted: true nodisclaimer: true X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: PnA2aqqePLzUcrqlUrI/Unv/ktV9f09nrrIe9C1Ms++Gg5xbkYtU4wmMnHO4QF8pZHvDw0vvoTS3NyzVRabdpmEoStyI/T+b+Zl6asrFvwEaPnRuzj5OUcVPq21tjirsarKgQluAKTSzlfCQgrH8OlHq5zjVuFYUekBNC01pkKlwT/ExYI6C7tbtnekCwpQbOWNf3TBmMFmO3iuX0P32kZI2Gm5TkFqWtMFVbY72Q9W3eT7LrDHBBt1sKdQm7tIHOB+0YmtseMACZdDo1cGQ2W6mHYiev0h7r3zMdvpkNRmFvhLfDuAGIkcCam0SBWWa8xNGOA48ltRgOyaGzG6mO5xjjqjUJUxnvOYBrqQxLs0hcFIhNdzN/Ni2/jkbtBSpTp0LD3RmdDd4HtcZA57/PuLUfz8tE/L8W4mXfomXRq98/map+QfsX/gqEEsohpTixK29HPhj3QujEHH9Q4ARLRDPuWyczU49Z/pApg1t4UxOwEjOItYJ12cZR9k5QEU2jAaVDSwZHPMYlrWcXb4TMZKQ5jyIDMblZ9gXin5Zkk1Ydj6sw6d6sw4V3SDGCY/9Il14CWrxzxM5/hMXnXCBU677q+XdxgIqULPen3lmU68= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PAWPR08MB8982.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(1800799015)(376005)(366007); DIR:OUT; SFP:1102; MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB5369 X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: AMS1EPF0000004D.eurprd04.prod.outlook.com X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 60da01e1-1014-4f81-9a68-08dc4db62e4b X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GNe2mYwB9RRtbXAoqASi/srSqtztUUNAugiFwR4ypeaBoANPcXC9Bd3ZuPu31E8cs6NQqG6lKGl58vwmYfTAyHfv86MkjxBSnCMpAwEOjHu5DRy0wxaLuhdjsWnhCK/eqXooayisg8gnw7qVk8g1lH7SxE9waJ0w+Zxt62J2aL8Y/hvzJ/ydktGmGuQTtuaTLuMrXANQ03bW5lSWVJqArDU+4ZC+nbzxiuet9/VhxUQy31jNRJDQemoZnRb4h+AEMln9RVE6aSZRKhsRsZzuWOriY1V6NQtC5S0BsSNzFXNZjTyrlrcQ9J5obgmGC69zQ/0u91bFrzMp6hwPrZXlWZ5TC4E71Qx7tzo0RhmTuKtvl6d0BE98mGzPQqTESSpeeLFK/VWdvGkZcg9DHU7X83EFPu3MiabO3uDKjFgh/qODYDNKjMCgTiyo4gIMqipkwYWVT4mkaZHOHvKdvhO/RQ/+wiTc/zwUt73nGiXMNGoAU/Z4IFIoxfZ3gO2QjO2RQYVkuxIeLaMG7Ub2nH96GuD2ygb05f0MEuaoCeXkr3TGvxapdC3PU9sq5IzRGXJ9MPvIJWc63BevCet4n7OEetVCAgSeUFHG/xAhCjZNwofP5ipCz5PppK5N9QLfiB5VpnOEq7q6q1IGmABqZ9sU9B+cX7VZ+CcCNtzE7bM4ItJK6bbbMBN2dXq59nzJaXM5hGY/tKfdp/kFTE1VJc/8AA== X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFS:(13230031)(36860700004)(82310400014)(376005)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Mar 2024 17:00:03.5079 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 60da01e1-1014-4f81-9a68-08dc4db62e4b X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-AuthSource: AMS1EPF0000004D.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR08MB9393 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FORGED_SPF_HELO, GIT_PATCH_0, KAM_DMARC_NONE, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, UNPARSEABLE_RELAY 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: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org As mentioned in https://gcc.gnu.org/pipermail/gcc-patches/2024-March/648397.html , do some additional cleanup of the macros and aliases: Cleanup the macros to add the libat_ prefixes in atomic_16.S. Emit the alias to __atomic_ when ifuncs are not enabled in the ENTRY macro. Passes regress and bootstrap, OK for commit? libatomic: * config/linux/aarch64/atomic_16.S: Add __libat_ prefix in the LSE2/LSE128/CORE macros, remove elsewhere. Add ATOMIC macro. diff --git a/libatomic/config/linux/aarch64/atomic_16.S b/libatomic/config/linux/aarch64/atomic_16.S index 4e3fa870b0338da4cfcdb0879ab8bed8d041a0a3..d0343507120c06a483ffdae1a793b6b5263cfe98 100644 --- a/libatomic/config/linux/aarch64/atomic_16.S +++ b/libatomic/config/linux/aarch64/atomic_16.S @@ -45,7 +45,7 @@ # define HAVE_FEAT_LSE128 0 #endif -#define HAVE_FEAT_LSE2 HAVE_IFUNC +#define HAVE_FEAT_LSE2 HAVE_IFUNC #if HAVE_FEAT_LSE128 .arch armv9-a+lse128 @@ -53,31 +53,37 @@ .arch armv8-a+lse #endif -#define LSE128(NAME) NAME##_i1 -#define LSE2(NAME) NAME##_i2 -#define CORE(NAME) NAME +#define LSE128(NAME) libat_##NAME##_i1 +#define LSE2(NAME) libat_##NAME##_i2 +#define CORE(NAME) libat_##NAME +#define ATOMIC(NAME) __atomic_##NAME -#define ENTRY_FEAT(NAME, FEAT) \ - ENTRY (FEAT (NAME)) +#if HAVE_IFUNC +# define ENTRY(NAME) ENTRY2 (CORE (NAME), ) +#else +/* Emit __atomic_* entrypoints if no ifuncs. */ +# define ENTRY(NAME) ENTRY2 (CORE (NAME), ALIAS (NAME, ATOMIC, CORE)) +#endif +#define ENTRY_FEAT(NAME, FEAT) ENTRY2 (FEAT (NAME), ) + +#define END(NAME) END2 (CORE (NAME)) +#define END_FEAT(NAME, FEAT) END2 (FEAT (NAME)) -#define ENTRY(NAME) \ +#define ENTRY2(NAME, ALIASES) \ .global NAME; \ .hidden NAME; \ .type NAME,%function; \ .p2align 4; \ + ALIASES; \ NAME: \ - .cfi_startproc; \ - hint 34 // bti c - -#define END_FEAT(NAME, FEAT) \ - END (FEAT (NAME)) + .cfi_startproc; \ + hint 34; // bti c -#define END(NAME) \ +#define END2(NAME) \ .cfi_endproc; \ .size NAME, .-NAME; -#define ALIAS(NAME, FROM, TO) ALIAS1 (FROM (NAME),TO (NAME)) -#define ALIAS2(NAME) ALIAS1 (__atomic_##NAME, libat_##NAME) +#define ALIAS(NAME, FROM, TO) ALIAS1 (FROM (NAME), TO (NAME)) #define ALIAS1(ALIAS, NAME) \ .global ALIAS; \ @@ -116,7 +122,7 @@ NAME: \ #define SEQ_CST 5 -ENTRY (libat_load_16) +ENTRY (load_16) mov x5, x0 cbnz w1, 2f @@ -131,11 +137,11 @@ ENTRY (libat_load_16) stxp w4, res0, res1, [x5] cbnz w4, 2b ret -END (libat_load_16) +END (load_16) #if HAVE_FEAT_LSE2 -ENTRY_FEAT (libat_load_16, LSE2) +ENTRY_FEAT (load_16, LSE2) cbnz w1, 1f /* RELAXED. */ @@ -155,11 +161,11 @@ ENTRY_FEAT (libat_load_16, LSE2) ldp res0, res1, [x0] dmb ishld ret -END_FEAT (libat_load_16, LSE2) +END_FEAT (load_16, LSE2) #endif -ENTRY (libat_store_16) +ENTRY (store_16) cbnz w4, 2f /* RELAXED. */ @@ -173,11 +179,11 @@ ENTRY (libat_store_16) stlxp w4, in0, in1, [x0] cbnz w4, 2b ret -END (libat_store_16) +END (store_16) #if HAVE_FEAT_LSE2 -ENTRY_FEAT (libat_store_16, LSE2) +ENTRY_FEAT (store_16, LSE2) cbnz w4, 1f /* RELAXED. */ @@ -189,11 +195,11 @@ ENTRY_FEAT (libat_store_16, LSE2) stlxp w4, in0, in1, [x0] cbnz w4, 1b ret -END_FEAT (libat_store_16, LSE2) +END_FEAT (store_16, LSE2) #endif -ENTRY (libat_exchange_16) +ENTRY (exchange_16) mov x5, x0 cbnz w4, 2f @@ -217,11 +223,11 @@ ENTRY (libat_exchange_16) stlxp w4, in0, in1, [x5] cbnz w4, 4b ret -END (libat_exchange_16) +END (exchange_16) #if HAVE_FEAT_LSE128 -ENTRY_FEAT (libat_exchange_16, LSE128) +ENTRY_FEAT (exchange_16, LSE128) mov tmp0, x0 mov res0, in0 mov res1, in1 @@ -241,11 +247,11 @@ ENTRY_FEAT (libat_exchange_16, LSE128) /* RELEASE/ACQ_REL/SEQ_CST. */ 2: swppal res0, res1, [tmp0] ret -END_FEAT (libat_exchange_16, LSE128) +END_FEAT (exchange_16, LSE128) #endif -ENTRY (libat_compare_exchange_16) +ENTRY (compare_exchange_16) ldp exp0, exp1, [x1] cbz w4, 3f cmp w4, RELEASE @@ -289,11 +295,11 @@ ENTRY (libat_compare_exchange_16) stp tmp0, tmp1, [x1] 6: cset x0, eq ret -END (libat_compare_exchange_16) +END (compare_exchange_16) #if HAVE_FEAT_LSE2 -ENTRY_FEAT (libat_compare_exchange_16, LSE2) +ENTRY_FEAT (compare_exchange_16, LSE2) ldp exp0, exp1, [x1] mov tmp0, exp0 mov tmp1, exp1 @@ -326,11 +332,11 @@ ENTRY_FEAT (libat_compare_exchange_16, LSE2) /* ACQ_REL/SEQ_CST. */ 4: caspal exp0, exp1, in0, in1, [x0] b 0b -END_FEAT (libat_compare_exchange_16, LSE2) +END_FEAT (compare_exchange_16, LSE2) #endif -ENTRY (libat_fetch_add_16) +ENTRY (fetch_add_16) mov x5, x0 cbnz w4, 2f @@ -349,10 +355,10 @@ ENTRY (libat_fetch_add_16) stlxp w4, tmp0, tmp1, [x5] cbnz w4, 2b ret -END (libat_fetch_add_16) +END (fetch_add_16) -ENTRY (libat_add_fetch_16) +ENTRY (add_fetch_16) mov x5, x0 cbnz w4, 2f @@ -371,10 +377,10 @@ ENTRY (libat_add_fetch_16) stlxp w4, res0, res1, [x5] cbnz w4, 2b ret -END (libat_add_fetch_16) +END (add_fetch_16) -ENTRY (libat_fetch_sub_16) +ENTRY (fetch_sub_16) mov x5, x0 cbnz w4, 2f @@ -393,10 +399,10 @@ ENTRY (libat_fetch_sub_16) stlxp w4, tmp0, tmp1, [x5] cbnz w4, 2b ret -END (libat_fetch_sub_16) +END (fetch_sub_16) -ENTRY (libat_sub_fetch_16) +ENTRY (sub_fetch_16) mov x5, x0 cbnz w4, 2f @@ -415,10 +421,10 @@ ENTRY (libat_sub_fetch_16) stlxp w4, res0, res1, [x5] cbnz w4, 2b ret -END (libat_sub_fetch_16) +END (sub_fetch_16) -ENTRY (libat_fetch_or_16) +ENTRY (fetch_or_16) mov x5, x0 cbnz w4, 2f @@ -437,11 +443,11 @@ ENTRY (libat_fetch_or_16) stlxp w4, tmp0, tmp1, [x5] cbnz w4, 2b ret -END (libat_fetch_or_16) +END (fetch_or_16) #if HAVE_FEAT_LSE128 -ENTRY_FEAT (libat_fetch_or_16, LSE128) +ENTRY_FEAT (fetch_or_16, LSE128) mov tmp0, x0 mov res0, in0 mov res1, in1 @@ -461,11 +467,11 @@ ENTRY_FEAT (libat_fetch_or_16, LSE128) /* RELEASE/ACQ_REL/SEQ_CST. */ 2: ldsetpal res0, res1, [tmp0] ret -END_FEAT (libat_fetch_or_16, LSE128) +END_FEAT (fetch_or_16, LSE128) #endif -ENTRY (libat_or_fetch_16) +ENTRY (or_fetch_16) mov x5, x0 cbnz w4, 2f @@ -484,11 +490,11 @@ ENTRY (libat_or_fetch_16) stlxp w4, res0, res1, [x5] cbnz w4, 2b ret -END (libat_or_fetch_16) +END (or_fetch_16) #if HAVE_FEAT_LSE128 -ENTRY_FEAT (libat_or_fetch_16, LSE128) +ENTRY_FEAT (or_fetch_16, LSE128) cbnz w4, 1f mov tmp0, in0 mov tmp1, in1 @@ -513,11 +519,11 @@ ENTRY_FEAT (libat_or_fetch_16, LSE128) orr res0, in0, tmp0 orr res1, in1, tmp1 ret -END_FEAT (libat_or_fetch_16, LSE128) +END_FEAT (or_fetch_16, LSE128) #endif -ENTRY (libat_fetch_and_16) +ENTRY (fetch_and_16) mov x5, x0 cbnz w4, 2f @@ -536,11 +542,11 @@ ENTRY (libat_fetch_and_16) stlxp w4, tmp0, tmp1, [x5] cbnz w4, 2b ret -END (libat_fetch_and_16) +END (fetch_and_16) #if HAVE_FEAT_LSE128 -ENTRY_FEAT (libat_fetch_and_16, LSE128) +ENTRY_FEAT (fetch_and_16, LSE128) mov tmp0, x0 mvn res0, in0 mvn res1, in1 @@ -561,11 +567,11 @@ ENTRY_FEAT (libat_fetch_and_16, LSE128) /* RELEASE/ACQ_REL/SEQ_CST. */ 2: ldclrpal res0, res1, [tmp0] ret -END_FEAT (libat_fetch_and_16, LSE128) +END_FEAT (fetch_and_16, LSE128) #endif -ENTRY (libat_and_fetch_16) +ENTRY (and_fetch_16) mov x5, x0 cbnz w4, 2f @@ -584,11 +590,11 @@ ENTRY (libat_and_fetch_16) stlxp w4, res0, res1, [x5] cbnz w4, 2b ret -END (libat_and_fetch_16) +END (and_fetch_16) #if HAVE_FEAT_LSE128 -ENTRY_FEAT (libat_and_fetch_16, LSE128) +ENTRY_FEAT (and_fetch_16, LSE128) mvn tmp0, in0 mvn tmp0, in1 cbnz w4, 1f @@ -614,11 +620,11 @@ ENTRY_FEAT (libat_and_fetch_16, LSE128) and res0, tmp0, in0 and res1, tmp1, in1 ret -END_FEAT (libat_and_fetch_16, LSE128) +END_FEAT (and_fetch_16, LSE128) #endif -ENTRY (libat_fetch_xor_16) +ENTRY (fetch_xor_16) mov x5, x0 cbnz w4, 2f @@ -637,10 +643,10 @@ ENTRY (libat_fetch_xor_16) stlxp w4, tmp0, tmp1, [x5] cbnz w4, 2b ret -END (libat_fetch_xor_16) +END (fetch_xor_16) -ENTRY (libat_xor_fetch_16) +ENTRY (xor_fetch_16) mov x5, x0 cbnz w4, 2f @@ -659,10 +665,10 @@ ENTRY (libat_xor_fetch_16) stlxp w4, res0, res1, [x5] cbnz w4, 2b ret -END (libat_xor_fetch_16) +END (xor_fetch_16) -ENTRY (libat_fetch_nand_16) +ENTRY (fetch_nand_16) mov x5, x0 mvn in0, in0 mvn in1, in1 @@ -683,10 +689,10 @@ ENTRY (libat_fetch_nand_16) stlxp w4, tmp0, tmp1, [x5] cbnz w4, 2b ret -END (libat_fetch_nand_16) +END (fetch_nand_16) -ENTRY (libat_nand_fetch_16) +ENTRY (nand_fetch_16) mov x5, x0 mvn in0, in0 mvn in1, in1 @@ -707,12 +713,12 @@ ENTRY (libat_nand_fetch_16) stlxp w4, res0, res1, [x5] cbnz w4, 2b ret -END (libat_nand_fetch_16) +END (nand_fetch_16) /* __atomic_test_and_set is always inlined, so this entry is unused and only required for completeness. */ -ENTRY (libat_test_and_set_16) +ENTRY (test_and_set_16) /* RELAXED/ACQUIRE/CONSUME/RELEASE/ACQ_REL/SEQ_CST. */ mov x5, x0 @@ -720,70 +726,48 @@ ENTRY (libat_test_and_set_16) stlxrb w4, w2, [x5] cbnz w4, 1b ret -END (libat_test_and_set_16) +END (test_and_set_16) /* Alias entry points which are the same in LSE2 and LSE128. */ #if HAVE_IFUNC # if !HAVE_FEAT_LSE128 -ALIAS (libat_exchange_16, LSE128, LSE2) -ALIAS (libat_fetch_or_16, LSE128, LSE2) -ALIAS (libat_fetch_and_16, LSE128, LSE2) -ALIAS (libat_or_fetch_16, LSE128, LSE2) -ALIAS (libat_and_fetch_16, LSE128, LSE2) +ALIAS (exchange_16, LSE128, LSE2) +ALIAS (fetch_or_16, LSE128, LSE2) +ALIAS (fetch_and_16, LSE128, LSE2) +ALIAS (or_fetch_16, LSE128, LSE2) +ALIAS (and_fetch_16, LSE128, LSE2) # endif -ALIAS (libat_load_16, LSE128, LSE2) -ALIAS (libat_store_16, LSE128, LSE2) -ALIAS (libat_compare_exchange_16, LSE128, LSE2) -ALIAS (libat_fetch_add_16, LSE128, LSE2) -ALIAS (libat_add_fetch_16, LSE128, LSE2) -ALIAS (libat_fetch_sub_16, LSE128, LSE2) -ALIAS (libat_sub_fetch_16, LSE128, LSE2) -ALIAS (libat_fetch_xor_16, LSE128, LSE2) -ALIAS (libat_xor_fetch_16, LSE128, LSE2) -ALIAS (libat_fetch_nand_16, LSE128, LSE2) -ALIAS (libat_nand_fetch_16, LSE128, LSE2) -ALIAS (libat_test_and_set_16, LSE128, LSE2) +ALIAS (load_16, LSE128, LSE2) +ALIAS (store_16, LSE128, LSE2) +ALIAS (compare_exchange_16, LSE128, LSE2) +ALIAS (fetch_add_16, LSE128, LSE2) +ALIAS (add_fetch_16, LSE128, LSE2) +ALIAS (fetch_sub_16, LSE128, LSE2) +ALIAS (sub_fetch_16, LSE128, LSE2) +ALIAS (fetch_xor_16, LSE128, LSE2) +ALIAS (xor_fetch_16, LSE128, LSE2) +ALIAS (fetch_nand_16, LSE128, LSE2) +ALIAS (nand_fetch_16, LSE128, LSE2) +ALIAS (test_and_set_16, LSE128, LSE2) /* Alias entry points which are the same in baseline and LSE2. */ -ALIAS (libat_exchange_16, LSE2, CORE) -ALIAS (libat_fetch_add_16, LSE2, CORE) -ALIAS (libat_add_fetch_16, LSE2, CORE) -ALIAS (libat_fetch_sub_16, LSE2, CORE) -ALIAS (libat_sub_fetch_16, LSE2, CORE) -ALIAS (libat_fetch_or_16, LSE2, CORE) -ALIAS (libat_or_fetch_16, LSE2, CORE) -ALIAS (libat_fetch_and_16, LSE2, CORE) -ALIAS (libat_and_fetch_16, LSE2, CORE) -ALIAS (libat_fetch_xor_16, LSE2, CORE) -ALIAS (libat_xor_fetch_16, LSE2, CORE) -ALIAS (libat_fetch_nand_16, LSE2, CORE) -ALIAS (libat_nand_fetch_16, LSE2, CORE) -ALIAS (libat_test_and_set_16, LSE2, CORE) - -#else - -/* Emit __atomic_* entrypoints if no ifuncs. */ - -ALIAS2 (load_16) -ALIAS2 (store_16) -ALIAS2 (compare_exchange_16) -ALIAS2 (exchange_16) -ALIAS2 (fetch_add_16) -ALIAS2 (add_fetch_16) -ALIAS2 (fetch_sub_16) -ALIAS2 (sub_fetch_16) -ALIAS2 (fetch_or_16) -ALIAS2 (or_fetch_16) -ALIAS2 (fetch_and_16) -ALIAS2 (and_fetch_16) -ALIAS2 (fetch_xor_16) -ALIAS2 (xor_fetch_16) -ALIAS2 (fetch_nand_16) -ALIAS2 (nand_fetch_16) -ALIAS2 (test_and_set_16) +ALIAS (exchange_16, LSE2, CORE) +ALIAS (fetch_add_16, LSE2, CORE) +ALIAS (add_fetch_16, LSE2, CORE) +ALIAS (fetch_sub_16, LSE2, CORE) +ALIAS (sub_fetch_16, LSE2, CORE) +ALIAS (fetch_or_16, LSE2, CORE) +ALIAS (or_fetch_16, LSE2, CORE) +ALIAS (fetch_and_16, LSE2, CORE) +ALIAS (and_fetch_16, LSE2, CORE) +ALIAS (fetch_xor_16, LSE2, CORE) +ALIAS (xor_fetch_16, LSE2, CORE) +ALIAS (fetch_nand_16, LSE2, CORE) +ALIAS (nand_fetch_16, LSE2, CORE) +ALIAS (test_and_set_16, LSE2, CORE) #endif /* GNU_PROPERTY_AARCH64_* macros from elf.h for use in asm code. */