From bb0f6e99fdb3da658a5936c65af2085578847bc9 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Sun, 27 Oct 2019 15:34:25 +0100
Subject: host-cpu-c-abi: Recognize i386 and a couple of other CPUs as 32-bit.

* m4/host-cpu-c-abi.m4 (gl_HOST_CPU_C_ABI): Include i386 in the case
statement.
(gl_HOST_CPU_C_ABI_32BIT): Likewise. Also recognize a couple of other
32-bit CPUs.
---
 ChangeLog            |  8 ++++++++
 m4/host-cpu-c-abi.m4 | 26 +++++++++++++++++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2469945b4a..b20008a175 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2019-10-27  Bruno Haible  <bruno@clisp.org>
+
+	host-cpu-c-abi: Recognize i386 and a couple of other CPUs as 32-bit.
+	* m4/host-cpu-c-abi.m4 (gl_HOST_CPU_C_ABI): Include i386 in the case
+	statement.
+	(gl_HOST_CPU_C_ABI_32BIT): Likewise. Also recognize a couple of other
+	32-bit CPUs.
+
 2019-10-24  Paul Eggert  <eggert@cs.ucla.edu>
 
 	timespec-add, timespec-sub: simplify
diff --git a/m4/host-cpu-c-abi.m4 b/m4/host-cpu-c-abi.m4
index 4407296d08..af8c05cad7 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 11
+# host-cpu-c-abi.m4 serial 12
 dnl Copyright (C) 2002-2019 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -55,7 +55,7 @@ AC_DEFUN([gl_HOST_CPU_C_ABI],
     [case "$host_cpu" in
 
 changequote(,)dnl
-       i[4567]86 )
+       i[34567]86 )
 changequote([,])dnl
          gl_cv_host_cpu_c_abi=i386
          ;;
@@ -473,8 +473,28 @@ AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
      else
        case "$host_cpu" in
 
+         # CPUs that only support a 32-bit ABI.
+         arc \
+         | bfin \
+         | cris* \
+         | csky \
+         | epiphany \
+         | ft32 \
+         | h8300 \
+         | m68k \
+         | microblaze | microblazeel \
+         | nds32 | nds32le | nds32be \
+         | nios2 | nios2eb | nios2el \
+         | or1k* \
+         | or32 \
+         | sh | sh[1234] | sh[1234]e[lb] \
+         | tic6x \
+         | xtensa* )
+           gl_cv_host_cpu_c_abi_32bit=yes
+           ;;
+
 changequote(,)dnl
-         i[4567]86 )
+         i[34567]86 )
 changequote([,])dnl
            gl_cv_host_cpu_c_abi_32bit=yes
            ;;
-- 
cgit v1.2.1