From: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
commit 6ea2987c9a7b6c5f37d08a3eaa664c9ff7467670 upstream.
string.h tests for the macros NOLIBC_ARCH_HAS_$FUNC to use the
architecture-optimized function variants.
However if string.h is included before arch.h header then that check
does not work, leading to duplicate function definitions.
Fixes: 553845eebd60 ("tools/nolibc: x86-64: Use `rep movsb` for `memcpy()` and `memmove()`")
Fixes: 12108aa8c1a1 ("tools/nolibc: x86-64: Use `rep stosb` for `memset()`")
Cc: stable@xxxxxxxxxxxxxxx
Acked-by: Willy Tarreau <w@xxxxxx>
Link: https://lore.kernel.org/r/20240725-arch-has-func-v1-1-5521ed354acd@xxxxxxxxxxxxxx
Signed-off-by: Thomas Weißschuh <linux@xxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
tools/include/nolibc/string.h | 1 +
1 file changed, 1 insertion(+)
--- a/tools/include/nolibc/string.h
+++ b/tools/include/nolibc/string.h
@@ -7,6 +7,7 @@
#ifndef _NOLIBC_STRING_H
#define _NOLIBC_STRING_H
+#include "arch.h"
#include "std.h"
static void *malloc(size_t len);
Patches currently in stable-queue which might be from linux@xxxxxxxxxxxxxx are
queue-6.10/drm-radeon-properly-handle-vbios-fake-edid-sizing.patch
queue-6.10/drm-amdgpu-properly-handle-vbios-fake-edid-sizing.patch
queue-6.10/acpi-sysfs-validate-return-type-of-_str-method.patch
queue-6.10/tools-nolibc-include-arch.h-from-string.h.patch
