git: 429b03a00ba7 - main - libc: fix _FORTIFY_SOURCE build on aarch64

From: Kyle Evans <kevans_at_FreeBSD.org>
Date: Tue, 04 Mar 2025 19:56:23 UTC
The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=429b03a00ba74ae0188cce3f3064cfac023e18c5

commit 429b03a00ba74ae0188cce3f3064cfac023e18c5
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2025-03-04 19:53:34 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2025-03-04 19:53:34 +0000

    libc: fix _FORTIFY_SOURCE build on aarch64
    
    As with their amd64 counterparts, we need to undef these string funcs
    that _FORTIFY_SOURCE will have defined macros for to avoid breaking the
    build.
    
    Fixes:  bea89d038ac ("lib/libc/aarch64/string: add strlcat SIMD [...]")
    Fixes:  3dc5429158c ("lib/libc/aarch64/string: add strncat SIMD [...]")
---
 lib/libc/aarch64/string/strlcat.c | 2 ++
 lib/libc/aarch64/string/strncat.c | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/lib/libc/aarch64/string/strlcat.c b/lib/libc/aarch64/string/strlcat.c
index c3c996163ade..fe2e75d091c5 100644
--- a/lib/libc/aarch64/string/strlcat.c
+++ b/lib/libc/aarch64/string/strlcat.c
@@ -8,6 +8,8 @@
 
 #include <string.h>
 
+#undef strlcat	/* _FORTIFY_SOURCE */
+
 void *__memchr_aarch64(const void *, int, size_t);
 size_t __strlcpy(char *restrict, const char *restrict, size_t);
 
diff --git a/lib/libc/aarch64/string/strncat.c b/lib/libc/aarch64/string/strncat.c
index 33b278ac5e04..2c63ab50b3c3 100644
--- a/lib/libc/aarch64/string/strncat.c
+++ b/lib/libc/aarch64/string/strncat.c
@@ -8,6 +8,8 @@
 
 #include <string.h>
 
+#undef strncat	/* _FORTIFY_SOURCE */
+
 void *__memccpy(void *restrict, const void *restrict, int, size_t);
 
 char *