adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

libc: share time() between minimal libc and armclang libc

Browse source 
Introduce a place to share implementations of libc functions that
are needed by different libc versions.  Place time() in this common
location so it can be shared when building for either minimal libc or
armclang libc.

Signed-off-by: Kumar Gala <kumar.gala@intel.com>
This commit is contained in:
Kumar Gala 2023-03-24 19:10:50 +00:00 committed by Carles Cufí
parent a7aafcbbdc
commit 672aeace88
8 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmake/toolchain/armclang/Kconfig
View file

@ -15,6 +15,7 @@ choice LIBC_IMPLEMENTATION
config ARMCLANG_STD_LIBC config ARMCLANG_STD_LIBC
bool "ARM Compiler C library" bool "ARM Compiler C library"
select COMMON_LIBC_TIME if POSIX_CLOCK
help help
Use the full Arm Compiler runtime libraries. Use the full Arm Compiler runtime libraries.
A reduced Zephyr minimal libc will be used for library functionality A reduced Zephyr minimal libc will be used for library functionality

2
lib/libc/CMakeLists.txt
View file

@ -5,3 +5,5 @@ add_subdirectory_ifdef(CONFIG_ARMCLANG_STD_LIBC armstdc)
add_subdirectory_ifdef(CONFIG_MINIMAL_LIBC minimal) add_subdirectory_ifdef(CONFIG_MINIMAL_LIBC minimal)
add_subdirectory_ifdef(CONFIG_NEWLIB_LIBC newlib) add_subdirectory_ifdef(CONFIG_NEWLIB_LIBC newlib)
add_subdirectory_ifdef(CONFIG_PICOLIBC picolibc) add_subdirectory_ifdef(CONFIG_PICOLIBC picolibc)
add_subdirectory(common)

1
lib/libc/Kconfig
View file

@ -75,6 +75,7 @@ endchoice # LIBC_IMPLEMENTATION
config HAS_NEWLIB_LIBC_NANO config HAS_NEWLIB_LIBC_NANO
bool bool
rsource "common/Kconfig"
rsource "minimal/Kconfig" rsource "minimal/Kconfig"
rsource "newlib/Kconfig" rsource "newlib/Kconfig"
rsource "picolibc/Kconfig" rsource "picolibc/Kconfig"

4
lib/libc/common/CMakeLists.txt Normal file
View file

@ -0,0 +1,4 @@
# SPDX-License-Identifier: Apache-2.0
zephyr_library()
zephyr_library_sources_ifdef(CONFIG_COMMON_LIBC_TIME source/time/time.c)

7
lib/libc/common/Kconfig Normal file
View file

@ -0,0 +1,7 @@
# Copyright (c) 2023 Intel Corporation
# SPDX-License-Identifier: Apache-2.0
config COMMON_LIBC_TIME
bool
help
common implementation of time().

0
lib/libc/minimal/source/time/time.c → lib/libc/common/source/time/time.c
View file

1
lib/libc/minimal/CMakeLists.txt
View file

@ -33,7 +33,6 @@ zephyr_library_sources(
if(CONFIG_MINIMAL_LIBC_TIME) if(CONFIG_MINIMAL_LIBC_TIME)
zephyr_library_sources(source/time/gmtime.c) zephyr_library_sources(source/time/gmtime.c)
zephyr_library_sources_ifdef(CONFIG_POSIX_CLOCK source/time/time.c)
endif() endif()
zephyr_library_sources_ifdef(CONFIG_MINIMAL_LIBC_RAND source/stdlib/rand.c) zephyr_library_sources_ifdef(CONFIG_MINIMAL_LIBC_RAND source/stdlib/rand.c)

1
lib/libc/minimal/Kconfig
View file

@ -66,6 +66,7 @@ config MINIMAL_LIBC_RAND
config MINIMAL_LIBC_TIME config MINIMAL_LIBC_TIME
bool "Time functions" bool "Time functions"
select COMMON_LIBC_TIME if POSIX_CLOCK
default y default y
help help
Enable time() and gmtime_r() for the minimal libc. Enable time() and gmtime_r() for the minimal libc.