Skip to content

libcxx: supports CXX_MINI_LOCALIZATION #17841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
v-zhangxiaomeng5 wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −4
Open

libcxx: supports CXX_MINI_LOCALIZATION #17841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion libs/libxx/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ choice
config LIBCXXTOOLCHAIN
bool "Toolchain C++ support"
select HAVE_CXXINITIALIZE
select LIBC_LOCALE
---help---
Use Standard C++ library from toolchain.

Expand Down Expand Up @@ -119,10 +118,22 @@ config CXX_RTTI
config CXX_WCHAR
bool "Enable Wide Character Support"

choice
prompt "C++ Locale and Stream select"
default CXX_NO_LOCALIZATION

config CXX_NO_LOCALIZATION
bool "No Locale and Stream Support"

config CXX_MINI_LOCALIZATION
bool "Enable mini Locale and Stream Support"

config CXX_LOCALIZATION
bool "Enable Locale and Stream Support"
depends on LIBC_LOCALE

endchoice

if UCLIBCXX

config UCLIBCXX_BUFSIZE
Expand Down
4 changes: 3 additions & 1 deletion libs/libxx/__config_site
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
/* #undef _LIBCPP_TYPEINFO_COMPARISON_IMPLEMENTATION */
/* #undef _LIBCPP_HAS_NO_FILESYSTEM */
/* #undef _LIBCPP_HAS_NO_RANDOM_DEVICE */
#ifndef CONFIG_CXX_LOCALIZATION
#if defined(CONFIG_CXX_NO_LOCALIZATION)
# define _LIBCPP_HAS_NO_LOCALIZATION
#elif defined(CONFIG_CXX_MINI_LOCALIZATION)
# define _LIBCPP_HAS_MINI_LOCALIZATION
#endif
#ifndef CONFIG_CXX_WCHAR
# define _LIBCPP_HAS_NO_WIDE_CHARACTERS
Expand Down
2 changes: 1 addition & 1 deletion libs/libxx/libcxx/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ if(CONFIG_LIBCXX)
file(GLOB SRCSTMP ${CMAKE_CURRENT_LIST_DIR}/libcxx/src/ryu/*.cpp)
list(APPEND SRCS ${SRCSTMP})

if(NOT CONFIG_CXX_LOCALIZATION)
if(CONFIG_CXX_NO_LOCALIZATION)
file(
GLOB
SRCSTMP
Expand Down
2 changes: 1 addition & 1 deletion libs/libxx/libcxx/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ CPPSRCS += $(wildcard libcxx/libcxx/src/experimental/*.cpp)
CPPSRCS += $(wildcard libcxx/libcxx/src/filesystem/*.cpp)
CPPSRCS += $(wildcard libcxx/libcxx/src/ryu/*.cpp)

ifeq ($(CONFIG_CXX_LOCALIZATION),)
ifeq ($(CONFIG_CXX_NO_LOCALIZATION),y)
LOCALE_CPPSRCS := libcxx/libcxx/src/ios.cpp
LOCALE_CPPSRCS += libcxx/libcxx/src/ios.instantiations.cpp
LOCALE_CPPSRCS += libcxx/libcxx/src/iostream.cpp
Expand Down
Loading