diff options
| author | Thomas Weißschuh <linux@weissschuh.net> | 2025-06-23 23:48:34 +0200 |
|---|---|---|
| committer | Thomas Weißschuh <linux@weissschuh.net> | 2025-06-24 09:46:52 +0200 |
| commit | 01e8a6d0c39ca0da2b7c80466f55e2959faf1522 (patch) | |
| tree | d47484be82dad3480d2ea9cd6c12820b6d9faee6 | |
| parent | f7c8bb6c3c152495e37288ae4e42f02c231f30f6 (diff) | |
tools/nolibc: use arm64 name over aarch64
Nolibc generally uses the kernel's architecture names.
aarch64 is the only exception.
Remove the special case.
Nothing changes for the users.
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20250623-nolibc-aarch64-arm64-v1-1-a2892f1c1b27@weissschuh.net
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
| -rw-r--r-- | tools/include/nolibc/Makefile | 3 | ||||
| -rw-r--r-- | tools/include/nolibc/arch-arm64.h (renamed from tools/include/nolibc/arch-aarch64.h) | 10 | ||||
| -rw-r--r-- | 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 f2f2924626d3..3fcee9fe4ece 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 index 937a348da42e..02a3f74c8ec8 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 4ae57aaf9779..db69537c71d8 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__) |