diff --git a/kal/libc/Kconfig b/kal/libc/Kconfig index 2b171549..34f3304e 100644 --- a/kal/libc/Kconfig +++ b/kal/libc/Kconfig @@ -43,6 +43,7 @@ rsource "newlib/Kconfig" config LIBC_ICCARM bool "iar libc" + depends on COMPILER_ICCARM rsource "iccarm/Kconfig" endchoice diff --git a/kal/libc/iccarm/Kconfig b/kal/libc/iccarm/Kconfig index 196d88ac..aa2790dc 100644 --- a/kal/libc/iccarm/Kconfig +++ b/kal/libc/iccarm/Kconfig @@ -35,4 +35,10 @@ config LIBC_ICCARM_FS help This enables POSIX style file system related APIs. +config LIBC_ICCARM_MALLOC + bool "Enable POSIX malloc/free API support" + default y + help + This enables POSIX malloc/free related APIs. + endif # LIBC_ICCARM diff --git a/kal/libc/newlib/Kconfig b/kal/libc/newlib/Kconfig index 3f3e92f7..0c38db35 100644 --- a/kal/libc/newlib/Kconfig +++ b/kal/libc/newlib/Kconfig @@ -36,4 +36,10 @@ config LIBC_NEWLIB_FS help This enables POSIX style file system related APIs. +config LIBC_NEWLIB_MALLOC + bool "Enable POSIX malloc/free API support" + default y + help + This enables POSIX malloc/free related APIs. + endif # LIBC_NEWLIB diff --git a/kal/libc/newlib/porting/src/malloc.c b/kal/libc/newlib/porting/src/malloc.c index ec8ef278..8e840d15 100644 --- a/kal/libc/newlib/porting/src/malloc.c +++ b/kal/libc/newlib/porting/src/malloc.c @@ -34,6 +34,7 @@ #include "los_memory.h" #include +#ifdef LOSCFG_LIBC_NEWLIB_MALLOC void *zalloc(size_t size) { void *ptr = NULL; @@ -111,3 +112,4 @@ void *__wrap__calloc_r(struct _reent *reent, size_t nitems, size_t size) } return ptr; } +#endif