diff options
| author | BruceOu <[email protected]> | 2022-01-09 10:06:01 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-01-09 10:06:01 +0800 |
| commit | 6278523af7be1d89603fb7eb834397c52aa2c6d7 (patch) | |
| tree | 5858f02fceeb71da3d7d3065a577673e51dad635 /components/cplusplus | |
| parent | 77ccb89590e7f5f97fdc2f9ed2671849fbafd510 (diff) | |
| parent | f21af8362b22b1f19fcf7b519192f5c71b4fa8d9 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'components/cplusplus')
| -rw-r--r-- | components/cplusplus/Kconfig | 2 | ||||
| -rw-r--r-- | components/cplusplus/cxx_crt_init.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/cplusplus/Kconfig b/components/cplusplus/Kconfig index 3d5757fe42..0877ff9938 100644 --- a/components/cplusplus/Kconfig +++ b/components/cplusplus/Kconfig @@ -10,7 +10,7 @@ if RT_USING_CPLUSPLUS bool "Enable c++11 threading feature support" default n select RT_USING_POSIX_FS - select RT_USING_POSIX_DEVIO + select RT_USING_POSIX_STDIO select RT_USING_PTHREADS select RT_USING_RTC diff --git a/components/cplusplus/cxx_crt_init.c b/components/cplusplus/cxx_crt_init.c index 977dee6ee9..46946089ff 100644 --- a/components/cplusplus/cxx_crt_init.c +++ b/components/cplusplus/cxx_crt_init.c @@ -13,7 +13,7 @@ #include <rtthread.h> -#if defined(__CC_ARM) || defined(__CLANG_ARM) +#if defined(__ARMCC_VERSION) extern void $Super$$__cpp_initialize__aeabi_(void); /* we need to change the cpp_initialize order */ RT_WEAK void $Sub$$__cpp_initialize__aeabi_(void) @@ -36,7 +36,7 @@ RT_WEAK void *__dso_handle = 0; RT_WEAK int cplusplus_system_init(void) { -#if defined(__CC_ARM) || defined(__CLANG_ARM) +#if defined(__ARMCC_VERSION) /* If there is no SHT$$INIT_ARRAY, calling * $Super$$__cpp_initialize__aeabi_() will cause fault. At least until Keil5.12 * the problem still exists. So we have to initialize the C++ runtime by ourself. |