From e1b83399bd49034841eb3034212aafab96ac319c Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Tue, 6 Jun 2023 00:39:55 -0700 Subject: [PATCH] Fix memmove() alias on aarch64 with --ftrace --- libc/intrin/aarch64/asmdefs.internal.h | 8 ++++---- libc/intrin/aarch64/memcpy.S | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libc/intrin/aarch64/asmdefs.internal.h b/libc/intrin/aarch64/asmdefs.internal.h index 2b8baed26..f18eb2bc1 100644 --- a/libc/intrin/aarch64/asmdefs.internal.h +++ b/libc/intrin/aarch64/asmdefs.internal.h @@ -53,10 +53,10 @@ GNU_PROPERTY (FEATURE_1_AND, FEATURE_1_BTI|FEATURE_1_PAC) #define ENTRY(name) ENTRY_ALIGN(name, 6) -#define ENTRY_ALIAS(name) \ - .global name; \ - .type name,%function; \ - name: +/* [jart] alias the proper way */ +#define ENTRY_ALIAS(sym, alias) \ + .global alias; \ + .equ alias,sym #define END(name) \ .cfi_endproc; \ diff --git a/libc/intrin/aarch64/memcpy.S b/libc/intrin/aarch64/memcpy.S index c7316cbe4..451b312ef 100644 --- a/libc/intrin/aarch64/memcpy.S +++ b/libc/intrin/aarch64/memcpy.S @@ -78,7 +78,7 @@ Copyright 2022 ARM Limited\n" The loop tail is handled by always copying 64 bytes from the end. */ -ENTRY_ALIAS (__memmove_aarch64_simd) +ENTRY_ALIAS (__memcpy_aarch64_simd, __memmove_aarch64_simd) ENTRY (__memcpy_aarch64_simd) PTR_ARG (0) PTR_ARG (1)