[libc-commits] [libc] 3845814 - [libc][stdlib] Fix skipped libc.src.stdlib.freelist_malloc target for baremetal. (#96372)

[via libc-commits]

Author: lntue
Date: 2024-06-21T22:42:07-04:00
New Revision: 38458144bf74417aa36bdd468ce3b3d482cdaf99

URL: https://github.com/llvm/llvm-project/commit/38458144bf74417aa36bdd468ce3b3d482cdaf99
DIFF: https://github.com/llvm/llvm-project/commit/38458144bf74417aa36bdd468ce3b3d482cdaf99.diff

LOG: [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

Added: 
    

Modified: 
    libc/config/baremetal/arm/entrypoints.txt
    libc/config/baremetal/riscv/entrypoints.txt
    libc/src/stdlib/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/libc/config/baremetal/arm/entrypoints.txt b/libc/config/baremetal/arm/entrypoints.txt
index 1443d1e44e10a..b8e97783c7723 100644
--- a/libc/config/baremetal/arm/entrypoints.txt
+++ b/libc/config/baremetal/arm/entrypoints.txt
@@ -176,6 +176,7 @@ set(TARGET_LIBC_ENTRYPOINTS
     libc.src.stdlib.calloc
     libc.src.stdlib.div
     libc.src.stdlib.free
+    libc.src.stdlib.freelist_malloc
     libc.src.stdlib.labs
     libc.src.stdlib.ldiv
     libc.src.stdlib.llabs

diff  --git a/libc/config/baremetal/riscv/entrypoints.txt b/libc/config/baremetal/riscv/entrypoints.txt
index 99ae20b726ae2..c9070c2691b19 100644
--- a/libc/config/baremetal/riscv/entrypoints.txt
+++ b/libc/config/baremetal/riscv/entrypoints.txt
@@ -172,6 +172,7 @@ set(TARGET_LIBC_ENTRYPOINTS
     libc.src.stdlib.calloc
     libc.src.stdlib.div
     libc.src.stdlib.free
+    libc.src.stdlib.freelist_malloc
     libc.src.stdlib.labs
     libc.src.stdlib.ldiv
     libc.src.stdlib.llabs

diff  --git a/libc/src/stdlib/CMakeLists.txt b/libc/src/stdlib/CMakeLists.txt
index 7d99fdf38141a..a5d5ac5f32b06 100644
--- a/libc/src/stdlib/CMakeLists.txt
+++ b/libc/src/stdlib/CMakeLists.txt
@@ -392,7 +392,8 @@ else()
     COMPILE_OPTIONS
       -DLIBC_FREELIST_MALLOC_SIZE=${LIBC_CONF_FREELIST_MALLOC_BUFFER_SIZE}
   )
-  if(LIBC_TARGET_OS_IS_BAREMETAL)
+  get_target_property(freelist_malloc_is_skipped libc.src.stdlib.freelist_malloc "SKIPPED")
+  if(LIBC_TARGET_OS_IS_BAREMETAL AND NOT freelist_malloc_is_skipped)
     add_entrypoint_object(
       malloc
       ALIAS