From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id 754F83858C98 for ; Thu, 4 Apr 2024 12:31:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 754F83858C98 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 754F83858C98 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=217.140.110.172 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712233906; cv=none; b=Hif7fCLhgrGqMStN2WfqJFDPlTjFY6cmAwEZj+QXPgDIh30JZLijdGWKXImAKUmrNoqyfCuuQ4TbrkO4qyYCydaHDJpif/Z4OOBSlKzk4QnUlQlsMa9AoZdrNnvZgf6KAa/ntY7FJlleJeOw/wOd60Q10gGHQ22g9jMZLs2CdEU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1712233906; c=relaxed/simple; bh=pR1uog6dSXLcysgo3x8c15MgxAF+NxG6E7/ybGNhyH0=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=LigxoczAqem6yF2udp+TC0RlK/pqYuvUnxk3tiwdwwuPI94q/hl973AHEa5UPTgUV0O4fUaEATr5rLeDOwedJhlZWRiU8eoeLwD4lobP0pDGXMgM0UZ1lmqUUQ3oi2f5vDXRN0o1QsrlEX/V9g9Pz8mcqdv0X3ZV/p/3GL2B9U4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 40AFCFEC; Thu, 4 Apr 2024 05:32:14 -0700 (PDT) Received: from localhost (e121540-lin.manchester.arm.com [10.32.110.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E95473F7B4; Thu, 4 Apr 2024 05:31:42 -0700 (PDT) From: Richard Sandiford To: Wilco Dijkstra Mail-Followup-To: Wilco Dijkstra ,GCC Patches , Kyrylo Tkachov , richard.sandiford@arm.com Cc: GCC Patches , Kyrylo Tkachov Subject: Re: [PATCH] libatomic: Fix build for --disable-gnu-indirect-function [PR113986] References: Date: Thu, 04 Apr 2024 13:31:41 +0100 In-Reply-To: (Wilco Dijkstra's message of "Tue, 26 Mar 2024 11:55:41 +0000") Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Status: No, score=-14.7 required=5.0 tests=BAYES_00,KAM_DMARC_NONE,KAM_DMARC_STATUS,KAM_LAZY_DOMAIN_SECURITY,SPF_HELO_NONE,SPF_NONE,TXREP autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: Wilco Dijkstra writes: > v2: > > Fix libatomic build to support --disable-gnu-indirect-function on AArch64. > Always build atomic_16.S, add aliases to the __atomic_ functions if !HAVE_IFUNC. > Include auto-config.h in atomic_16.S to avoid having to pass defines via makefiles. > Fix build if HWCAP_ATOMICS/CPUID are not defined. > > Passes regress and bootstrap, OK for commit? > > libatomic: > PR target/113986 > * Makefile.in: Regenerated. > * Makefile.am: Make atomic_16.S not depend on HAVE_IFUNC. > Remove predefine of HAVE_FEAT_LSE128. > * acinclude.m4: Remove ARCH_AARCH64_HAVE_LSE128. > * configure: Regenerated. > * config/linux/aarch64/atomic_16.S: Add __atomic_ aliases if !HAVE_IFUNC. > * config/linux/aarch64/host-config.h: Correctly handle !HAVE_IFUNC. Add > defines for HWCAP_ATOMICS and HWCAP_CPUID. OK, thanks, but... > @@ -35,7 +48,6 @@ typedef struct __ifunc_arg_t { > # define _IFUNC_ARG_HWCAP (1ULL << 62) > #endif > > -#ifdef HWCAP_USCAT > # if N == 16 > # define IFUNC_COND_1 (has_lse128 (hwcap, features)) > # define IFUNC_COND_2 (has_lse2 (hwcap, features)) > @@ -44,19 +56,6 @@ typedef struct __ifunc_arg_t { > # define IFUNC_COND_1 (hwcap & HWCAP_ATOMICS) > # define IFUNC_NCOND(N) 1 > # endif ...please reindent this block so that there is no space after the "#" in the outermost directives. Richard