diff options
| author | Willy Tarreau <w@1wt.eu> | 2025-06-18 20:30:30 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2025-06-22 09:16:07 +0200 |
| commit | cc6dc5fbecfdf2de3ec02c15754d3fd4879e32ff (patch) | |
| tree | 3994153004ac120e14a00d1d97050225cee971f1 /tools/include/nolibc/arch.h | |
| parent | a477629baa2a0e9991f640af418e8c973a1c08e3 (diff) | |
tools/nolibc: merge i386 and x86_64 into a single x86 arch
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.
Acked-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Willy Tarreau <w@1wt.eu>
Diffstat (limited to 'tools/include/nolibc/arch.h')
| -rw-r--r-- | tools/include/nolibc/arch.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tools/include/nolibc/arch.h b/tools/include/nolibc/arch.h index d20b2304aac2..4ae57aaf9779 100644 --- a/tools/include/nolibc/arch.h +++ b/tools/include/nolibc/arch.h @@ -15,10 +15,8 @@ #ifndef _NOLIBC_ARCH_H #define _NOLIBC_ARCH_H -#if defined(__x86_64__) -#include "arch-x86_64.h" -#elif defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) -#include "arch-i386.h" +#if defined(__x86_64__) || defined(__i386__) || defined(__i486__) || defined(__i586__) || defined(__i686__) +#include "arch-x86.h" #elif defined(__ARM_EABI__) #include "arch-arm.h" #elif defined(__aarch64__) |