From 14b8442f999ad59631797251d8c3ea8b3e6b0572 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 9 Nov 2023 12:37:00 +0100 Subject: [PATCH] host-cpu-c-abi: Port to CHERI. * m4/host-cpu-c-abi.m4 (gl_HOST_CPU_C_ABI_32BIT): Treat aarch64c like aarch64. --- ChangeLog | 6 ++++++ m4/host-cpu-c-abi.m4 | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a8d1e25f16..51ba73819b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-11-09 Bruno Haible + + host-cpu-c-abi: Port to CHERI. + * m4/host-cpu-c-abi.m4 (gl_HOST_CPU_C_ABI_32BIT): Treat aarch64c like + aarch64. + 2023-11-08 Bruno Haible pthread-rwlock: Port to Mac OS X 10.4. diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4 index 134f228341..3a2f01dfb2 100644 --- a/m4/host-cpu-c-abi.m4 +++ b/m4/host-cpu-c-abi.m4 @@ -1,4 +1,4 @@ -# host-cpu-c-abi.m4 serial 15 +# host-cpu-c-abi.m4 serial 16 dnl Copyright (C) 2002-2023 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -468,10 +468,11 @@ AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT], AC_REQUIRE([AC_CANONICAL_HOST]) AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit], [if test -n "$gl_cv_host_cpu_c_abi"; then + dnl gl_HOST_CPU_C_ABI has already been run. Use its result. case "$gl_cv_host_cpu_c_abi" in i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc) gl_cv_host_cpu_c_abi_32bit=yes ;; - x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) + x86_64 | alpha | arm64 | aarch64c | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 ) gl_cv_host_cpu_c_abi_32bit=no ;; *) gl_cv_host_cpu_c_abi_32bit=unknown ;; @@ -535,7 +536,7 @@ changequote([,])dnl [gl_cv_host_cpu_c_abi_32bit=yes]) ;; - arm* | aarch64 ) + arm* | aarch64 | aarch64c ) # Assume arm with EABI. # On arm64 systems, the C compiler may be generating code in one of # these ABIs: -- 2.39.5