Skip to content

Commit 01e8a6d

Browse files
committed
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>
1 parent f7c8bb6 commit 01e8a6d

3 files changed

Lines changed: 7 additions & 8 deletions

File tree

tools/include/nolibc/Makefile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ else
2323
Q=@
2424
endif
2525

26-
nolibc_arch := $(patsubst arm64,aarch64,$(ARCH))
27-
arch_file := arch-$(nolibc_arch).h
26+
arch_file := arch-$(ARCH).h
2827
all_files := \
2928
compiler.h \
3029
crt.h \
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
/* SPDX-License-Identifier: LGPL-2.1 OR MIT */
22
/*
3-
* AARCH64 specific definitions for NOLIBC
3+
* ARM64 specific definitions for NOLIBC
44
* Copyright (C) 2017-2022 Willy Tarreau <w@1wt.eu>
55
*/
66

7-
#ifndef _NOLIBC_ARCH_AARCH64_H
8-
#define _NOLIBC_ARCH_AARCH64_H
7+
#ifndef _NOLIBC_ARCH_ARM64_H
8+
#define _NOLIBC_ARCH_ARM64_H
99

1010
#include "compiler.h"
1111
#include "crt.h"
1212

13-
/* Syscalls for AARCH64 :
13+
/* Syscalls for ARM64 :
1414
* - registers are 64-bit
1515
* - stack is 16-byte aligned
1616
* - syscall number is passed in x8
@@ -150,4 +150,4 @@ void __attribute__((weak, noreturn)) __nolibc_entrypoint __no_stack_protector _s
150150
);
151151
__nolibc_entrypoint_epilogue();
152152
}
153-
#endif /* _NOLIBC_ARCH_AARCH64_H */
153+
#endif /* _NOLIBC_ARCH_ARM64_H */

tools/include/nolibc/arch.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#elif defined(__ARM_EABI__)
2121
#include "arch-arm.h"
2222
#elif defined(__aarch64__)
23-
#include "arch-aarch64.h"
23+
#include "arch-arm64.h"
2424
#elif defined(__mips__)
2525
#include "arch-mips.h"
2626
#elif defined(__powerpc__)

0 commit comments

Comments
 (0)