Re: [RFC PATCH 1/3] tools/nolibc: merge i386 and x86_64 into a single x86 arch

From: Thomas Weißschuh
Date: Sat Jun 21 2025 - 04:29:54 EST


On 2025-06-20 12:37:03+0200, Willy Tarreau wrote:
> This remained the only exception to the kernel's architectures
> organization and it's always a bit cumbersome to deal with. Let's merge
> i386 and x86_64 into x86. This will result in a single arch-x86.h file
> by default, and we'll no longer need to merge the two manually during
> installation. Requesting either i386 or x86_64 will also result in
> installing x86.

We should do this in any case, independently from the series.

Acked-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>

> Signed-off-by: Willy Tarreau <w@xxxxxx>
> ---
> tools/include/nolibc/Makefile | 10 +-
> tools/include/nolibc/arch-i386.h | 178 -----------------
> .../nolibc/{arch-x86_64.h => arch-x86.h} | 180 +++++++++++++++++-
> tools/include/nolibc/arch.h | 6 +-
> 4 files changed, 179 insertions(+), 195 deletions(-)
> delete mode 100644 tools/include/nolibc/arch-i386.h
> rename tools/include/nolibc/{arch-x86_64.h => arch-x86.h} (53%)

<snip>