Re: [PATCH 05/50] *: Remove __i386__ tests

[Thomas Huth]

On 08/01/2026 06.29, Richard Henderson wrote:

Remove instances of __i386__, except from tests and imported headers.

Signed-off-by: Richard Henderson <richard.hender...@linaro.org>
---

...

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index 2060e561a2..63713f1992 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -7449,15 +7449,6 @@ void syscall_init(void)
                                ~(TARGET_IOC_SIZEMASK << TARGET_IOC_SIZESHIFT)) 
|
                  (size << TARGET_IOC_SIZESHIFT);
          }
-
-        /* automatic consistency check if same arch */
-#if (defined(__i386__) && defined(TARGET_I386) && defined(TARGET_ABI32)) || \
-    (defined(__x86_64__) && defined(TARGET_X86_64))

This looks like we should keep the x86_64 part?

-        if (unlikely(ie->target_cmd != ie->host_cmd)) {
-            fprintf(stderr, "ERROR: ioctl(%s): target=0x%x host=0x%x\n",
-                    ie->name, ie->target_cmd, ie->host_cmd);
-        }
-#endif
          ie++;
      }
  }

...

diff --git a/configure b/configure
index 2016062492..00e455be57 100755
--- a/configure
+++ b/configure
@@ -377,8 +377,6 @@ fi
  if test ! -z "$cpu" ; then
    # command line argument
    :
-elif check_define __i386__ ; then
-  cpu="i386"
  elif check_define __x86_64__ ; then
    if check_define __ILP32__ ; then
      cpu="x32"

Aren't there some more spots in configure that could be removed now?
e.g.:

  i386|i486|i586|i686)
    cpu="i386"
    host_arch=i386
    linux_arch=x86
    CPU_CFLAGS="-m32"
    ;;

Or is this removed in a later patch?

 Thomas