| commit | 03379228b2cf56a5ef111ca1af5ab18dfa81fa93 | [log] [tgz] |
|---|---|---|
| author | Olivier Deprez <olivier.deprez@arm.com> | Fri Feb 02 09:48:27 2024 +0100 |
| committer | Olivier Deprez <olivier.deprez@arm.com> | Fri Feb 02 09:49:01 2024 +0100 |
| tree | 428c02317cd1976ba6261e61ae8cea8738d13c5e | |
| parent | f287df00a0ddea3678e4b29690b7e68a33862e9c [diff] |
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 <olivier.deprez@arm.com> Change-Id: Ie4b7e04880d4cd871e7b51cd8ff5bddcf8d0308c
diff --git a/lib/libc/libc.mk b/lib/libc/libc.mk index 633386c..03e1fb3 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 fb8117f..4879818 100644 --- a/lib/libc/libc_common.mk +++ b/lib/libc/libc_common.mk
@@ -14,7 +14,6 @@ memcpy_s.c \ memmove.c \ memrchr.c \ - memset.c \ printf.c \ putchar.c \ puts.c \