From 84eb3ef6c9f596e968b4f9b83a3a01deda2a8a9d Mon Sep 17 00:00:00 2001 From: Olivier Deprez Date: Fri, 2 Feb 2024 09:48:27 +0100 Subject: [PATCH] fix(libc): memset inclusion to libc makefiles Fix [1] is introducing another problem in that memset is added twice to the libc makefile when OVERRIDE_LIBC=1 (the C and asm implementations). Correct by adding memset.c when OVERRIDE_LIBC=0 and memset.S when OVERRIDE_LIBC=1. [1] https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/26091 Signed-off-by: Olivier Deprez Change-Id: Ie4b7e04880d4cd871e7b51cd8ff5bddcf8d0308c --- lib/libc/libc.mk | 3 +++ lib/libc/libc_common.mk | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/libc/libc.mk b/lib/libc/libc.mk index 633386cbc..03e1fb31d 100644 --- a/lib/libc/libc.mk +++ b/lib/libc/libc.mk @@ -6,3 +6,6 @@ # include lib/libc/libc_common.mk + +LIBC_SRCS += $(addprefix lib/libc/, \ + memset.c) diff --git a/lib/libc/libc_common.mk b/lib/libc/libc_common.mk index fb8117f22..4879818da 100644 --- a/lib/libc/libc_common.mk +++ b/lib/libc/libc_common.mk @@ -14,7 +14,6 @@ LIBC_SRCS := $(addprefix lib/libc/, \ memcpy_s.c \ memmove.c \ memrchr.c \ - memset.c \ printf.c \ putchar.c \ puts.c \