Wilco Dijkstra <wilco.dijks...@arm.com> 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