tools/nolibc: include arch.h from string.h

BugLink: https://bugs.launchpad.net/bugs/2089340

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: 553845eebd ("tools/nolibc: x86-64: Use `rep movsb` for `memcpy()` and `memmove()`")
Fixes: 12108aa8c1 ("tools/nolibc: x86-64: Use `rep stosb` for `memset()`")
Cc: stable@vger.kernel.org
Acked-by: Willy Tarreau <w@1wt.eu>
Link: https://lore.kernel.org/r/20240725-arch-has-func-v1-1-5521ed354acd@weissschuh.net
Signed-off-by: Thomas Weißschuh <linux@weissschuh.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Portia Stephens <portia.stephens@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>

This commit is contained in:

Thomas Weißschuh

2024-07-25 18:54:18 +02:00

committed by

Mehmet Basaran

parent 4c21094fb6

commit 6aca3607e4

1 changed files with 1 additions and 0 deletions

									
										tools/include/nolibc/string.h
									
		+1
		
												View File
												
				@@ -7,6 +7,7 @@

				#ifndef _NOLIBC_STRING_H

				#define _NOLIBC_STRING_H

				#include "arch.h"

				#include "std.h"

				static void *malloc(size_t len);