Skip to content

Commit 3845814

Browse files
authored
[libc][stdlib] Fix skipped libc.src.stdlib.freelist_malloc target for baremetal. (#96372)
Downstream build issue reported: https://ci.chromium.org/ui/p/fuchsia/builders/toolchain.ci/clang-linux-x64/b8744479865106393873/overview
1 parent a41a46c commit 3845814

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

libc/config/baremetal/arm/entrypoints.txt

+1
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ set(TARGET_LIBC_ENTRYPOINTS
176176
libc.src.stdlib.calloc
177177
libc.src.stdlib.div
178178
libc.src.stdlib.free
179+
libc.src.stdlib.freelist_malloc
179180
libc.src.stdlib.labs
180181
libc.src.stdlib.ldiv
181182
libc.src.stdlib.llabs

libc/config/baremetal/riscv/entrypoints.txt

+1
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ set(TARGET_LIBC_ENTRYPOINTS
172172
libc.src.stdlib.calloc
173173
libc.src.stdlib.div
174174
libc.src.stdlib.free
175+
libc.src.stdlib.freelist_malloc
175176
libc.src.stdlib.labs
176177
libc.src.stdlib.ldiv
177178
libc.src.stdlib.llabs

libc/src/stdlib/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,8 @@ else()
392392
COMPILE_OPTIONS
393393
-DLIBC_FREELIST_MALLOC_SIZE=${LIBC_CONF_FREELIST_MALLOC_BUFFER_SIZE}
394394
)
395-
if(LIBC_TARGET_OS_IS_BAREMETAL)
395+
get_target_property(freelist_malloc_is_skipped libc.src.stdlib.freelist_malloc "SKIPPED")
396+
if(LIBC_TARGET_OS_IS_BAREMETAL AND NOT freelist_malloc_is_skipped)
396397
add_entrypoint_object(
397398
malloc
398399
ALIAS

0 commit comments

Comments
 (0)