Nolibc generally uses the kernel's architecture names.
aarch64 is the only exception.

Remove the special case.
Nothing changes for the users.

Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
---
 tools/include/nolibc/Makefile                         |  3 +--
 tools/include/nolibc/{arch-aarch64.h => arch-arm64.h} | 10 +++++-----
 tools/include/nolibc/arch.h                           |  2 +-
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/tools/include/nolibc/Makefile b/tools/include/nolibc/Makefile
index 4bace7737b2ade388e138474c10f027a71e21816..07e7ae418ff50b34ce83c5f9ae17526dd5432667 100644
--- a/tools/include/nolibc/Makefile
+++ b/tools/include/nolibc/Makefile
@@ -23,8 +23,7 @@ else
 Q=@
 endif
 
-nolibc_arch := $(patsubst arm64,aarch64,$(ARCH))
-arch_file := arch-$(nolibc_arch).h
+arch_file := arch-$(ARCH).h
 all_files := \
 		compiler.h \
 		crt.h \
diff --git a/tools/include/nolibc/arch-aarch64.h b/tools/include/nolibc/arch-arm64.h
similarity index 97%
rename from tools/include/nolibc/arch-aarch64.h
rename to tools/include/nolibc/arch-arm64.h
index 937a348da42e1b134d9736a5a0f6920df6e4709d..02a3f74c8ec841e67004a1a3187908966e20f1d4 100644
--- a/tools/include/nolibc/arch-aarch64.h
+++ b/tools/include/nolibc/arch-arm64.h
@@ -1,16 +1,16 @@
 /* SPDX-License-Identifier: LGPL-2.1 OR MIT */
 /*
- * AARCH64 specific definitions for NOLIBC
+ * ARM64 specific definitions for NOLIBC
  * Copyright (C) 2017-2022 Willy Tarreau <w@1wt.eu>
  */
 
-#ifndef _NOLIBC_ARCH_AARCH64_H
-#define _NOLIBC_ARCH_AARCH64_H
+#ifndef _NOLIBC_ARCH_ARM64_H
+#define _NOLIBC_ARCH_ARM64_H
 
 #include "compiler.h"
 #include "crt.h"
 
-/* Syscalls for AARCH64 :
+/* Syscalls for ARM64 :
  *   - registers are 64-bit
  *   - stack is 16-byte aligned
  *   - syscall number is passed in x8
@@ -150,4 +150,4 @@ void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _s
 	);
 	__nolibc_entrypoint_epilogue();
 }
-#endif /* _NOLIBC_ARCH_AARCH64_H */
+#endif /* _NOLIBC_ARCH_ARM64_H */
diff --git a/tools/include/nolibc/arch.h b/tools/include/nolibc/arch.h
index 4ae57aaf9779610dfb63458416f147116d0a98e6..db69537c71d86f5ddc332aa0967bec206feb503b 100644
--- a/tools/include/nolibc/arch.h
+++ b/tools/include/nolibc/arch.h
@@ -20,7 +20,7 @@
 #elif defined(__ARM_EABI__)
 #include "arch-arm.h"
 #elif defined(__aarch64__)
-#include "arch-aarch64.h"
+#include "arch-arm64.h"
 #elif defined(__mips__)
 #include "arch-mips.h"
 #elif defined(__powerpc__)

---
base-commit: eb135311083100b6590a7545618cd9760d896a86
change-id: 20250623-nolibc-aarch64-arm64-1ac4e4efb129

Best regards,
-- 
Thomas Weißschuh <linux@weissschuh.net>

On Mon, Jun 23, 2025 at 11:48:34PM +0200, Thomas Weißschuh wrote:
> Nolibc generally uses the kernel's architecture names.
> aarch64 is the only exception.
> 
> Remove the special case.
> Nothing changes for the users.
> 
> Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>

I have been hesitating to do the same as well but remained
undecided. The fact that you thought the same confirms that
it's better this way.

Acked-by: Willy Tarreau <w@1wt.eu>

Thanks!
Willy