diff --git a/CMakeLists.txt b/CMakeLists.txt index 0788c10a5ebf35..091a4b906ca67b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,7 +221,7 @@ zephyr_compile_options(${OPTIMIZATION_FLAG}) zephyr_compile_options($<$:$>) # @Intent: Obtain compiler specific flags for compiling under different ISO standards of C++ -if(CONFIG_CPLUSPLUS) +if(CONFIG_CPP) # From kconfig choice, pick a single dialect. # Kconfig choice ensures only one of these CONFIG_STD_CPP* is set. if(CONFIG_STD_CPP98) diff --git a/arch/arc/arcmwdt/CMakeLists.txt b/arch/arc/arcmwdt/CMakeLists.txt index 9fb901c9b73c53..30c581d385af25 100644 --- a/arch/arc/arcmwdt/CMakeLists.txt +++ b/arch/arc/arcmwdt/CMakeLists.txt @@ -1,5 +1,5 @@ # SPDX-License-Identifier: Apache-2.0 -if(CONFIG_ARCMWDT_LIBC OR CONFIG_CPLUSPLUS) +if(CONFIG_ARCMWDT_LIBC OR CONFIG_CPP) zephyr_sources(arcmwdt-dtr-stubs.c) endif() diff --git a/arch/arm/core/aarch32/CMakeLists.txt b/arch/arm/core/aarch32/CMakeLists.txt index bd08189d38eeec..5facf7b12c7574 100644 --- a/arch/arm/core/aarch32/CMakeLists.txt +++ b/arch/arm/core/aarch32/CMakeLists.txt @@ -15,7 +15,7 @@ zephyr_library_sources( ) zephyr_library_sources_ifdef(CONFIG_GEN_SW_ISR_TABLE isr_wrapper.S) -zephyr_library_sources_ifdef(CONFIG_CPLUSPLUS __aeabi_atexit.c) +zephyr_library_sources_ifdef(CONFIG_CPP __aeabi_atexit.c) zephyr_library_sources_ifdef(CONFIG_IRQ_OFFLOAD irq_offload.c) zephyr_library_sources_ifdef(CONFIG_SW_VECTOR_RELAY irq_relay.S) zephyr_library_sources_ifdef(CONFIG_THREAD_LOCAL_STORAGE ../common/tls.c) diff --git a/cmake/compiler/gcc/target.cmake b/cmake/compiler/gcc/target.cmake index a98a83cfbc45c9..de3d80a9e6ca81 100644 --- a/cmake/compiler/gcc/target.cmake +++ b/cmake/compiler/gcc/target.cmake @@ -43,7 +43,7 @@ if(${CMAKE_C_COMPILER} STREQUAL CMAKE_C_COMPILER-NOTFOUND) message(FATAL_ERROR "C compiler ${CROSS_COMPILE}${CC} not found - Please check your toolchain installation") endif() -if(CONFIG_CPLUSPLUS) +if(CONFIG_CPP) set(cplusplus_compiler ${CROSS_COMPILE}${C++}) else() if(EXISTS ${CROSS_COMPILE}${C++}) diff --git a/cmake/compiler/host-gcc/target.cmake b/cmake/compiler/host-gcc/target.cmake index d7ded5d9b4b1e9..41e36b99a27ab3 100644 --- a/cmake/compiler/host-gcc/target.cmake +++ b/cmake/compiler/host-gcc/target.cmake @@ -4,7 +4,7 @@ find_program(CMAKE_C_COMPILER gcc) -if(CONFIG_CPLUSPLUS) +if(CONFIG_CPP) set(cplusplus_compiler g++) else() if(EXISTS g++) diff --git a/cmake/compiler/xcc/target.cmake b/cmake/compiler/xcc/target.cmake index 6775de2d0f4487..a23c9d5bde68cf 100644 --- a/cmake/compiler/xcc/target.cmake +++ b/cmake/compiler/xcc/target.cmake @@ -7,7 +7,7 @@ set_ifndef(C++ g++) find_program(CMAKE_C_COMPILER ${CROSS_COMPILE}${CC} PATHS ${TOOLCHAIN_HOME} NO_DEFAULT_PATH) -if(CONFIG_CPLUSPLUS) +if(CONFIG_CPP) set(cplusplus_compiler ${CROSS_COMPILE}${C++}) else() if(EXISTS ${CROSS_COMPILE}${C++}) diff --git a/cmake/linker_script/arm/linker.cmake b/cmake/linker_script/arm/linker.cmake index 231c9df8a76b17..9cad47539c4707 100644 --- a/cmake/linker_script/arm/linker.cmake +++ b/cmake/linker_script/arm/linker.cmake @@ -84,7 +84,7 @@ zephyr_linker_section_configure(SECTION .text INPUT ".glue_7") zephyr_linker_section_configure(SECTION .text INPUT ".vfp11_veneer") zephyr_linker_section_configure(SECTION .text INPUT ".v4_bx") -if(CONFIG_CPLUSPLUS) +if(CONFIG_CPP) zephyr_linker_section(NAME .ARM.extab GROUP ROM_REGION) zephyr_linker_section_configure(SECTION .ARM.extab INPUT ".gnu.linkonce.armextab.*") endif() diff --git a/cmake/linker_script/common/common-rom.cmake b/cmake/linker_script/common/common-rom.cmake index f4c8a8998708ee..fc882b7824d42a 100644 --- a/cmake/linker_script/common/common-rom.cmake +++ b/cmake/linker_script/common/common-rom.cmake @@ -31,7 +31,7 @@ zephyr_linker_section_configure(SECTION initlevel_error INPUT ".z_init_[_A-Z0-9] # ASSERT(SIZEOF(initlevel_error) == 0, "Undefined initialization levels used.") -if(CONFIG_CPLUSPLUS) +if(CONFIG_CPP) zephyr_linker_section(NAME ctors KVMA RAM_REGION GROUP RODATA_REGION NOINPUT) # # The compiler fills the constructor pointers table below, diff --git a/cmake/modules/extensions.cmake b/cmake/modules/extensions.cmake index 37f3e2643e4703..9c2abfe7526db1 100644 --- a/cmake/modules/extensions.cmake +++ b/cmake/modules/extensions.cmake @@ -1859,7 +1859,7 @@ endfunction() # Support an optional second option for when the first option is not # supported. function(target_cc_option_fallback target scope option1 option2) - if(CONFIG_CPLUSPLUS) + if(CONFIG_CPP) foreach(lang C CXX) # For now, we assume that all flags that apply to C/CXX also # apply to ASM. @@ -2051,7 +2051,7 @@ function(check_set_compiler_property) separate_arguments(option UNIX_COMMAND ${option}) endif() - if(CONFIG_CPLUSPLUS) + if(CONFIG_CPP) zephyr_check_compiler_flag(CXX "${option}" check) if(${check}) diff --git a/doc/develop/application/index.rst b/doc/develop/application/index.rst index 4a8a0d7b088b23..00894c353e4f52 100644 --- a/doc/develop/application/index.rst +++ b/doc/develop/application/index.rst @@ -613,7 +613,7 @@ assignment: .. code-block:: none - CONFIG_CPLUSPLUS=y + CONFIG_CPP=y Looking at :ref:`existing samples ` is a good way to get started. diff --git a/doc/develop/languages/cpp/index.rst b/doc/develop/languages/cpp/index.rst index 28364c41e736fa..2e9f0357480c56 100644 --- a/doc/develop/languages/cpp/index.rst +++ b/doc/develop/languages/cpp/index.rst @@ -11,7 +11,7 @@ Enabling C++ Support Zephyr supports applications written in both C and C++. However, to use C++ in an application you must configure Zephyr to include C++ support by selecting -the :kconfig:option:`CONFIG_CPLUSPLUS` in the application configuration file. +the :kconfig:option:`CONFIG_CPP` in the application configuration file. To enable C++ support, the compiler toolchain must also include a C++ compiler and the included compiler must be supported by the Zephyr build system. The diff --git a/include/zephyr/arch/arc/v2/linker.ld b/include/zephyr/arch/arc/v2/linker.ld index c6748c850e3d76..9c0e53f92c1502 100644 --- a/include/zephyr/arch/arc/v2/linker.ld +++ b/include/zephyr/arch/arc/v2/linker.ld @@ -130,12 +130,12 @@ SECTIONS { #include #include -#if defined(CONFIG_CPLUSPLUS) && !defined(CONFIG_CPP_STATIC_INIT_GNU) && defined(__MWDT_LINKER_CMD__) +#if defined(CONFIG_CPP) && !defined(CONFIG_CPP_STATIC_INIT_GNU) && defined(__MWDT_LINKER_CMD__) . = ALIGN(4); _fctors = .; KEEP(*(.ctors*)) _ectors = .; -#endif /* CONFIG_CPLUSPLUS && !CONFIG_CPP_STATIC_INIT_GNU && __MWDT_LINKER_CMD__ */ +#endif /* CONFIG_CPP && !CONFIG_CPP_STATIC_INIT_GNU && __MWDT_LINKER_CMD__ */ MPU_ALIGN(ABSOLUTE(.) - __rom_region_start); } GROUP_LINK_IN(ROMABLE_REGION) @@ -293,11 +293,11 @@ SECTIONS { #endif /DISCARD/ : { -#if defined(CONFIG_CPLUSPLUS) && !defined(CONFIG_CPP_STATIC_INIT_GNU) && defined(__MWDT_LINKER_CMD__) +#if defined(CONFIG_CPP) && !defined(CONFIG_CPP_STATIC_INIT_GNU) && defined(__MWDT_LINKER_CMD__) *(.dtors*) *(.fini*) *(.eh_frame*) -#endif /* CONFIG_CPLUSPLUS && !CONFIG_CPP_STATIC_INIT_GNU && __MWDT_LINKER_CMD__ */ +#endif /* CONFIG_CPP && !CONFIG_CPP_STATIC_INIT_GNU && __MWDT_LINKER_CMD__ */ *(.note.GNU-stack) *(.got.plt) *(.igot.plt) diff --git a/include/zephyr/arch/arm/aarch32/cortex_a_r/scripts/linker.ld b/include/zephyr/arch/arm/aarch32/cortex_a_r/scripts/linker.ld index 2a3d7a2d39ebad..fb206d8d7e6f73 100644 --- a/include/zephyr/arch/arm/aarch32/cortex_a_r/scripts/linker.ld +++ b/include/zephyr/arch/arm/aarch32/cortex_a_r/scripts/linker.ld @@ -153,7 +153,7 @@ SECTIONS . = ALIGN(_region_min_align); } GROUP_LINK_IN(ROMABLE_REGION) -#if defined (CONFIG_CPLUSPLUS) +#if defined (CONFIG_CPP) SECTION_PROLOGUE(.ARM.extab,,) { /* diff --git a/include/zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld b/include/zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld index 9620f96f40647f..567e213fe6d158 100644 --- a/include/zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld +++ b/include/zephyr/arch/arm/aarch32/cortex_m/scripts/linker.ld @@ -148,7 +148,7 @@ SECTIONS __text_region_end = .; -#if defined (CONFIG_CPLUSPLUS) +#if defined (CONFIG_CPP) SECTION_PROLOGUE(.ARM.extab,,) { /* diff --git a/include/zephyr/arch/arm64/scripts/linker.ld b/include/zephyr/arch/arm64/scripts/linker.ld index 1a608150ef5de9..5500e8c1386434 100644 --- a/include/zephyr/arch/arm64/scripts/linker.ld +++ b/include/zephyr/arch/arm64/scripts/linker.ld @@ -127,7 +127,7 @@ SECTIONS __text_region_end = .; __text_region_size = __text_region_end - __text_region_start; -#if defined (CONFIG_CPLUSPLUS) +#if defined (CONFIG_CPP) SECTION_PROLOGUE(.ARM.extab,,) { /* diff --git a/include/zephyr/linker/cplusplus-ram.ld b/include/zephyr/linker/cplusplus-ram.ld index eacb3bfb8a6cbe..59849f033eecac 100644 --- a/include/zephyr/linker/cplusplus-ram.ld +++ b/include/zephyr/linker/cplusplus-ram.ld @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#if defined (CONFIG_CPLUSPLUS) +#if defined (CONFIG_CPP) SECTION_DATA_PROLOGUE(.gcc_except_table,,ONLY_IF_RW) { *(.gcc_except_table .gcc_except_table.*) @@ -18,4 +18,4 @@ } GROUP_DATA_LINK_IN(RAMABLE_REGION, ROMABLE_REGION) #endif /* CONFIG_EXCEPTIONS */ -#endif /* CONFIG_CPLUSPLUS */ +#endif /* CONFIG_CPP */ diff --git a/include/zephyr/linker/cplusplus-rom.ld b/include/zephyr/linker/cplusplus-rom.ld index a8a0bb07c78a60..82be0f4dd28dfa 100644 --- a/include/zephyr/linker/cplusplus-rom.ld +++ b/include/zephyr/linker/cplusplus-rom.ld @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -#if defined (CONFIG_CPLUSPLUS) +#if defined (CONFIG_CPP) SECTION_PROLOGUE(.gcc_except_table,,ONLY_IF_RO) { *(.gcc_except_table .gcc_except_table.*) @@ -23,4 +23,4 @@ } GROUP_ROM_LINK_IN(RAMABLE_REGION, ROMABLE_REGION) #endif /* CONFIG_EXCEPTIONS */ -#endif /* CONFIG_CPLUSPLUS */ +#endif /* CONFIG_CPP */ diff --git a/include/zephyr/spinlock.h b/include/zephyr/spinlock.h index 11a45766a46810..2ba01a70ba3c4c 100644 --- a/include/zephyr/spinlock.h +++ b/include/zephyr/spinlock.h @@ -57,7 +57,7 @@ struct k_spinlock { #endif /* CONFIG_SPIN_LOCK_TIME_LIMIT */ #endif /* CONFIG_SPIN_VALIDATE */ -#if defined(CONFIG_CPLUSPLUS) && !defined(CONFIG_SMP) && \ +#if defined(CONFIG_CPP) && !defined(CONFIG_SMP) && \ !defined(CONFIG_SPIN_VALIDATE) /* If CONFIG_SMP and CONFIG_SPIN_VALIDATE are both not defined * the k_spinlock struct will have no members. The result diff --git a/kernel/init.c b/kernel/init.c index 5354218c355765..3db6cec0eecbc5 100644 --- a/kernel/init.c +++ b/kernel/init.c @@ -296,7 +296,7 @@ static void bg_thread_main(void *unused1, void *unused2, void *unused3) #endif boot_banner(); -#if defined(CONFIG_CPLUSPLUS) +#if defined(CONFIG_CPP) void z_cpp_init_static(void); z_cpp_init_static(); #endif diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index c67789cec36797..454309cad0428c 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -4,7 +4,7 @@ if(NOT CONFIG_EXTERNAL_LIBC) add_subdirectory(libc) add_subdirectory(posix) endif() -add_subdirectory_ifdef(CONFIG_CPLUSPLUS cpp) +add_subdirectory_ifdef(CONFIG_CPP cpp) add_subdirectory(os) add_subdirectory(util) add_subdirectory_ifdef(CONFIG_SMF smf) diff --git a/samples/cpp/cpp_synchronization/prj.conf b/samples/cpp/cpp_synchronization/prj.conf index a4c3fe1b5c641d..4c99ccacbe80a1 100644 --- a/samples/cpp/cpp_synchronization/prj.conf +++ b/samples/cpp/cpp_synchronization/prj.conf @@ -1,3 +1,3 @@ -CONFIG_CPLUSPLUS=y +CONFIG_CPP=y CONFIG_CPP_MAIN=y CONFIG_MINIMAL_LIBC_MALLOC_ARENA_SIZE=128 diff --git a/samples/modules/chre/prj.conf b/samples/modules/chre/prj.conf index 7e08ba08993866..4998fc2a34e374 100644 --- a/samples/modules/chre/prj.conf +++ b/samples/modules/chre/prj.conf @@ -3,7 +3,7 @@ CONFIG_LOG=y CONFIG_LOG_MODE_MINIMAL=y CONFIG_CHRE_LOG_LEVEL_DBG=y -CONFIG_CPLUSPLUS=y +CONFIG_CPP=y CONFIG_STD_CPP17=y CONFIG_LIB_CPLUSPLUS=y CONFIG_CPP_MAIN=y diff --git a/samples/modules/tflite-micro/hello_world/README.rst b/samples/modules/tflite-micro/hello_world/README.rst index 77c7b6b7eeef20..2b344ff7f08433 100644 --- a/samples/modules/tflite-micro/hello_world/README.rst +++ b/samples/modules/tflite-micro/hello_world/README.rst @@ -93,7 +93,7 @@ TensorFlow, you must enable the below Kconfig options in your :file:`prj.conf`: .. code-block:: kconfig - CONFIG_CPLUSPLUS=y + CONFIG_CPP=y CONFIG_NEWLIB_LIBC=y CONFIG_TENSORFLOW_LITE_MICRO=y diff --git a/samples/modules/tflite-micro/hello_world/prj.conf b/samples/modules/tflite-micro/hello_world/prj.conf index 50cb743a3305c5..96987ef394f638 100644 --- a/samples/modules/tflite-micro/hello_world/prj.conf +++ b/samples/modules/tflite-micro/hello_world/prj.conf @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ==============================================================================s -CONFIG_CPLUSPLUS=y +CONFIG_CPP=y CONFIG_LIB_CPLUSPLUS=y CONFIG_NEWLIB_LIBC=y CONFIG_TENSORFLOW_LITE_MICRO=y diff --git a/samples/modules/tflite-micro/magic_wand/README.rst b/samples/modules/tflite-micro/magic_wand/README.rst index 65a79053aa873c..b57875a806a8b2 100644 --- a/samples/modules/tflite-micro/magic_wand/README.rst +++ b/samples/modules/tflite-micro/magic_wand/README.rst @@ -106,7 +106,7 @@ TensorFlow, you must enable the below Kconfig options in your :file:`prj.conf`: .. code-block:: kconfig - CONFIG_CPLUSPLUS=y + CONFIG_CPP=y CONFIG_NEWLIB_LIBC=y CONFIG_TENSORFLOW_LITE_MICRO=y diff --git a/samples/modules/tflite-micro/magic_wand/prj.conf b/samples/modules/tflite-micro/magic_wand/prj.conf index f16149d5e7db64..66fdd8199bf21d 100644 --- a/samples/modules/tflite-micro/magic_wand/prj.conf +++ b/samples/modules/tflite-micro/magic_wand/prj.conf @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # ============================================================================== -CONFIG_CPLUSPLUS=y +CONFIG_CPP=y CONFIG_LIB_CPLUSPLUS=y CONFIG_NEWLIB_LIBC=y CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y diff --git a/samples/modules/tflite-micro/tflm_ethosu/prj.conf b/samples/modules/tflite-micro/tflm_ethosu/prj.conf index 8530e6fbe832f1..8346ed659b4aec 100644 --- a/samples/modules/tflite-micro/tflm_ethosu/prj.conf +++ b/samples/modules/tflite-micro/tflm_ethosu/prj.conf @@ -1,6 +1,6 @@ #application default configuration # include TFLM based on CMSIS NN optimization and ETHOSU acceleration -CONFIG_CPLUSPLUS=y +CONFIG_CPP=y CONFIG_LIB_CPLUSPLUS=y CONFIG_NEWLIB_LIBC=y CONFIG_TENSORFLOW_LITE_MICRO=y diff --git a/samples/net/sockets/echo_client/boards/atsamr21_xpro.conf b/samples/net/sockets/echo_client/boards/atsamr21_xpro.conf index b39d72eed9c31c..5426e8ba625cb2 100644 --- a/samples/net/sockets/echo_client/boards/atsamr21_xpro.conf +++ b/samples/net/sockets/echo_client/boards/atsamr21_xpro.conf @@ -6,7 +6,7 @@ # # Reduced buffers to fit into SAMR21 SoC -CONFIG_CPLUSPLUS=n +CONFIG_CPP=n CONFIG_NET_PKT_RX_COUNT=6 CONFIG_NET_PKT_TX_COUNT=6 diff --git a/samples/net/sockets/echo_server/boards/atsamr21_xpro.conf b/samples/net/sockets/echo_server/boards/atsamr21_xpro.conf index b39d72eed9c31c..5426e8ba625cb2 100644 --- a/samples/net/sockets/echo_server/boards/atsamr21_xpro.conf +++ b/samples/net/sockets/echo_server/boards/atsamr21_xpro.conf @@ -6,7 +6,7 @@ # # Reduced buffers to fit into SAMR21 SoC -CONFIG_CPLUSPLUS=n +CONFIG_CPP=n CONFIG_NET_PKT_RX_COUNT=6 CONFIG_NET_PKT_TX_COUNT=6 diff --git a/samples/subsys/logging/syst/CMakeLists.txt b/samples/subsys/logging/syst/CMakeLists.txt index cf49731458ed6a..f99597bcbc58b3 100644 --- a/samples/subsys/logging/syst/CMakeLists.txt +++ b/samples/subsys/logging/syst/CMakeLists.txt @@ -6,7 +6,7 @@ project(syst) target_sources(app PRIVATE src/main.c) -if(CONFIG_CPLUSPLUS) +if(CONFIG_CPP) # When building for C++, force C++ compilation set_source_files_properties(src/main.c PROPERTIES LANGUAGE CXX) endif() diff --git a/samples/subsys/logging/syst/sample.yaml b/samples/subsys/logging/syst/sample.yaml index 6f3b6bf4e9fd65..f715a2646c30e2 100644 --- a/samples/subsys/logging/syst/sample.yaml +++ b/samples/subsys/logging/syst/sample.yaml @@ -88,7 +88,7 @@ tests: regex: - "SYS-T RAW DATA: " extra_configs: - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y filter: (TOOLCHAIN_HAS_NEWLIB == 1) or CONFIG_PICOLIBC_SUPPORTED sample.logger.syst.immediate_cpp: toolchain_exclude: xcc @@ -104,7 +104,7 @@ tests: regex: - "SYS-T RAW DATA: " extra_configs: - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y filter: (TOOLCHAIN_HAS_NEWLIB == 1) or CONFIG_PICOLIBC_SUPPORTED sample.logger.syst.catalog.deferred_cpp: toolchain_exclude: xcc @@ -121,7 +121,7 @@ tests: - "SYS-T RAW DATA: " extra_configs: - CONFIG_LOG_MIPI_SYST_USE_CATALOG=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y filter: (TOOLCHAIN_HAS_NEWLIB == 1) or CONFIG_PICOLIBC_SUPPORTED sample.logger.syst.catalog.immediate_cpp: toolchain_exclude: xcc @@ -137,5 +137,5 @@ tests: - "SYS-T RAW DATA: " extra_configs: - CONFIG_LOG_MIPI_SYST_USE_CATALOG=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y filter: (TOOLCHAIN_HAS_NEWLIB == 1) or CONFIG_PICOLIBC_SUPPORTED diff --git a/subsys/net/l2/openthread/Kconfig b/subsys/net/l2/openthread/Kconfig index 781787c1f4c18c..51cb0c2cceb3a3 100644 --- a/subsys/net/l2/openthread/Kconfig +++ b/subsys/net/l2/openthread/Kconfig @@ -23,7 +23,7 @@ menuconfig NET_L2_OPENTHREAD select SETTINGS if FLASH select OPENTHREAD_SETTINGS_RAM if !FLASH - select CPLUSPLUS + select CPP select REBOOT select ENTROPY_GENERATOR diff --git a/subsys/testsuite/ztest/include/zephyr/arch/cpu.h b/subsys/testsuite/ztest/include/zephyr/arch/cpu.h index 3f49c4a25b8deb..5969b0ce10927a 100644 --- a/subsys/testsuite/ztest/include/zephyr/arch/cpu.h +++ b/subsys/testsuite/ztest/include/zephyr/arch/cpu.h @@ -14,7 +14,7 @@ extern "C" { /* Architecture thread structure */ struct _callee_saved { -#ifdef CONFIG_CPLUSPLUS +#ifdef CONFIG_CPP /* C++ does not allow empty structs, add an extra 1 byte */ uint8_t c; #endif @@ -23,7 +23,7 @@ struct _callee_saved { typedef struct _callee_saved _callee_saved_t; struct _thread_arch { -#ifdef CONFIG_CPLUSPLUS +#ifdef CONFIG_CPP /* C++ does not allow empty structs, add an extra 1 byte */ uint8_t c; #endif diff --git a/tests/lib/cbprintf_package/CMakeLists.txt b/tests/lib/cbprintf_package/CMakeLists.txt index 45dc4c869d1ae9..e39cc917a953da 100644 --- a/tests/lib/cbprintf_package/CMakeLists.txt +++ b/tests/lib/cbprintf_package/CMakeLists.txt @@ -5,7 +5,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(cbprintf_package) target_sources(app PRIVATE src/main.c) -if(CONFIG_CPLUSPLUS) +if(CONFIG_CPP) # When testing for C++ force test file C++ compilation set_source_files_properties(src/main.c PROPERTIES LANGUAGE CXX) endif() diff --git a/tests/lib/cbprintf_package/testcase.yaml b/tests/lib/cbprintf_package/testcase.yaml index 980a952a846c06..d5145901f1d862 100644 --- a/tests/lib/cbprintf_package/testcase.yaml +++ b/tests/lib/cbprintf_package/testcase.yaml @@ -57,19 +57,19 @@ tests: # Same test but with test compiled as C++ libraries.cbprintf_package_cpp: extra_configs: - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_CBPRINTF_COMPLETE=y libraries.cbprintf_package_no_generic_cpp: extra_configs: - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_COMPILER_OPT="-DZ_C_GENERIC=0" libraries.cbprintf_package_fp_cpp: filter: CONFIG_CPU_HAS_FPU extra_configs: - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_CBPRINTF_FP_SUPPORT=y - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_FPU=y @@ -77,7 +77,7 @@ tests: libraries.cbprintf_package_fp_align_offset_cpp: filter: CONFIG_CPU_HAS_FPU extra_configs: - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_CBPRINTF_FP_SUPPORT=y - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_COMPILER_OPT="-DCBPRINTF_PACKAGE_ALIGN_OFFSET=1" @@ -86,7 +86,7 @@ tests: libraries.cbprintf_package_long_double_cpp: filter: CONFIG_CPU_HAS_FPU extra_configs: - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_CBPRINTF_FP_SUPPORT=y - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_CBPRINTF_PACKAGE_LONGDOUBLE=y @@ -96,7 +96,7 @@ tests: libraries.cbprintf_package_long_double_align_offset_cpp: filter: CONFIG_CPU_HAS_FPU extra_configs: - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_CBPRINTF_FP_SUPPORT=y - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_CBPRINTF_PACKAGE_LONGDOUBLE=y @@ -106,7 +106,7 @@ tests: libraries.cbprintf_package_nano_cpp: extra_configs: - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_CBPRINTF_NANO=y libraries.cbprintf_package.picolibc: @@ -138,7 +138,7 @@ tests: filter: CONFIG_PICOLIBC_SUPPORTED tags: picolibc extra_configs: - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_PICOLIBC=y @@ -146,7 +146,7 @@ tests: filter: CONFIG_PICOLIBC_SUPPORTED tags: picolibc extra_configs: - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_COMPILER_OPT="-DZ_C_GENERIC=0" - CONFIG_PICOLIBC=y @@ -155,7 +155,7 @@ tests: filter: CONFIG_CPU_HAS_FPU and CONFIG_PICOLIBC_SUPPORTED tags: picolibc extra_configs: - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_CBPRINTF_FP_SUPPORT=y - CONFIG_CBPRINTF_COMPLETE=y - CONFIG_FPU=y diff --git a/tests/lib/cpp/cxx/prj.conf b/tests/lib/cpp/cxx/prj.conf index 8a7c01269138fe..76420fd7ca2224 100644 --- a/tests/lib/cpp/cxx/prj.conf +++ b/tests/lib/cpp/cxx/prj.conf @@ -1,4 +1,4 @@ -CONFIG_CPLUSPLUS=y +CONFIG_CPP=y CONFIG_NET_BUF=y CONFIG_ZTEST=y CONFIG_ZTEST_STACK_SIZE=2048 diff --git a/tests/lib/cpp/libcxx/prj.conf b/tests/lib/cpp/libcxx/prj.conf index 9d5040e5c49400..e5d6cdeea778bf 100644 --- a/tests/lib/cpp/libcxx/prj.conf +++ b/tests/lib/cpp/libcxx/prj.conf @@ -1,4 +1,4 @@ -CONFIG_CPLUSPLUS=y +CONFIG_CPP=y CONFIG_LIB_CPLUSPLUS=y CONFIG_STD_CPP17=y CONFIG_ZTEST=y diff --git a/tests/net/all/prj.conf b/tests/net/all/prj.conf index f6522a9fb31fa2..18d701d3a8308c 100644 --- a/tests/net/all/prj.conf +++ b/tests/net/all/prj.conf @@ -412,7 +412,7 @@ CONFIG_SHELL_MQTT_INIT_LOG_LEVEL_ERR=y #CONFIG_FLASH=y #CONFIG_FLASH_PAGE_LAYOUT=y #CONFIG_FLASH_HAS_PAGE_LAYOUT=y -#CONFIG_CPLUSPLUS=y +#CONFIG_CPP=y #CONFIG_REBOOT=y # IEEE 802.15.4, these cannot be compiled atm as qemu does not support these diff --git a/tests/subsys/logging/log_api/CMakeLists.txt b/tests/subsys/logging/log_api/CMakeLists.txt index 9338d2676cf772..375aecbea1d4ec 100644 --- a/tests/subsys/logging/log_api/CMakeLists.txt +++ b/tests/subsys/logging/log_api/CMakeLists.txt @@ -7,7 +7,7 @@ project(log_api) target_sources(app PRIVATE src/main.c src/mock_frontend.c src/mock_backend.c src/test_module.c src/test_module2.c) -if(CONFIG_CPLUSPLUS) +if(CONFIG_CPP) # When testing for C++ force test file C++ compilation set_source_files_properties(src/main.c PROPERTIES LANGUAGE CXX) endif() diff --git a/tests/subsys/logging/log_api/testcase.yaml b/tests/subsys/logging/log_api/testcase.yaml index 79961d308dfaa5..b54aea3ee4bd02 100644 --- a/tests/subsys/logging/log_api/testcase.yaml +++ b/tests/subsys/logging/log_api/testcase.yaml @@ -135,25 +135,25 @@ tests: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_LOG_MODE_OVERFLOW=y - CONFIG_LOG_RUNTIME_FILTERING=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_deferred_overflow_cpp: extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_LOG_MODE_OVERFLOW=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_deferred_no_overflow_cpp: extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_LOG_MODE_OVERFLOW=n - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_deferred_static_filter_cpp: extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_deferred_printk_cpp: extra_configs: @@ -162,74 +162,74 @@ tests: - CONFIG_LOG_PRINTK=y # When LOG_PRINTK is enabled, thread must process otherwise test output would be lost. - CONFIG_LOG_PROCESS_THREAD=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_deferred_func_prefix_cpp: extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y - CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_deferred_64b_timestamp_cpp: extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_LOG_TIMESTAMP_64BIT=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_immediate_cpp: extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_immediate_printk_cpp: extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - CONFIG_LOG_PRINTK=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_immediate_rt_filter_cpp: extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - CONFIG_LOG_RUNTIME_FILTERING=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_immediate_static_filter_cpp: extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_immediate_64b_timestamp_cpp: extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - CONFIG_LOG_TIMESTAMP_64BIT=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_frontend_dbg_cpp: extra_configs: - CONFIG_LOG_FRONTEND=y - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_frontend_cpp: extra_configs: - CONFIG_LOG_FRONTEND=y - CONFIG_LOG_MODE_DEFERRED=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_frontend_immediate_cpp: extra_configs: - CONFIG_LOG_FRONTEND=y - CONFIG_LOG_MODE_IMMEDIATE=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_frontend_only_cpp: extra_configs: - CONFIG_LOG_FRONTEND=y - CONFIG_LOG_FRONTEND_ONLY=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_api_frontend_no_backends_cpp: extra_configs: @@ -239,7 +239,7 @@ tests: - CONFIG_LOG_BACKEND_RTT=n - CONFIG_LOG_BACKEND_NATIVE_POSIX=n - CONFIG_LOG_BACKEND_XTENSA_SIM=n - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y extra_args: EXTRA_CPPFLAGS=-DNO_BACKENDS=1 logging.log_api_deferred_overflow_rt_filter.tagged_args: @@ -357,7 +357,7 @@ tests: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_LOG_MODE_OVERFLOW=y - CONFIG_LOG_RUNTIME_FILTERING=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_LOG_USE_TAGGED_ARGUMENTS=y logging.log_api_deferred_overflow_cpp.tagged_args: @@ -365,7 +365,7 @@ tests: extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_LOG_MODE_OVERFLOW=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_LOG_USE_TAGGED_ARGUMENTS=y logging.log_api_deferred_no_overflow_cpp.tagged_args: @@ -373,7 +373,7 @@ tests: extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_LOG_MODE_OVERFLOW=n - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_LOG_USE_TAGGED_ARGUMENTS=y logging.log_api_deferred_static_filter_cpp.tagged_args: @@ -381,7 +381,7 @@ tests: extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_LOG_USE_TAGGED_ARGUMENTS=y logging.log_api_deferred_printk_cpp.tagged_args: @@ -392,7 +392,7 @@ tests: - CONFIG_LOG_PRINTK=y # When LOG_PRINTK is enabled, thread must process otherwise test output would be lost. - CONFIG_LOG_PROCESS_THREAD=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_LOG_USE_TAGGED_ARGUMENTS=y logging.log_api_deferred_func_prefix_cpp.tagged_args: @@ -401,7 +401,7 @@ tests: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y - CONFIG_LOG_FUNC_NAME_PREFIX_DBG=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_LOG_USE_TAGGED_ARGUMENTS=y logging.log_api_deferred_64b_timestamp_cpp.tagged_args: @@ -409,14 +409,14 @@ tests: extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_LOG_TIMESTAMP_64BIT=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_LOG_USE_TAGGED_ARGUMENTS=y logging.log_api_immediate_cpp.tagged_args: toolchain_exclude: xcc extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_LOG_USE_TAGGED_ARGUMENTS=y logging.log_api_immediate_printk_cpp.tagged_args: @@ -424,7 +424,7 @@ tests: extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - CONFIG_LOG_PRINTK=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_LOG_USE_TAGGED_ARGUMENTS=y logging.log_api_immediate_rt_filter_cpp.tagged_args: @@ -432,7 +432,7 @@ tests: extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - CONFIG_LOG_RUNTIME_FILTERING=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_LOG_USE_TAGGED_ARGUMENTS=y logging.log_api_immediate_static_filter_cpp.tagged_args: @@ -440,7 +440,7 @@ tests: extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - CONFIG_SAMPLE_MODULE_LOG_LEVEL_DBG=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_LOG_USE_TAGGED_ARGUMENTS=y logging.log_api_immediate_64b_timestamp_cpp.tagged_args: @@ -448,5 +448,5 @@ tests: extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - CONFIG_LOG_TIMESTAMP_64BIT=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y - CONFIG_LOG_USE_TAGGED_ARGUMENTS=y diff --git a/tests/subsys/logging/log_stack/CMakeLists.txt b/tests/subsys/logging/log_stack/CMakeLists.txt index 635e729d2e9b19..02a65e67cd8848 100644 --- a/tests/subsys/logging/log_stack/CMakeLists.txt +++ b/tests/subsys/logging/log_stack/CMakeLists.txt @@ -5,7 +5,7 @@ find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(log_stack) target_sources(app PRIVATE src/main.c) -if(CONFIG_CPLUSPLUS) +if(CONFIG_CPP) # When testing for C++ force test file C++ compilation set_source_files_properties(src/main.c PROPERTIES LANGUAGE CXX) endif() diff --git a/tests/subsys/logging/log_stack/testcase.yaml b/tests/subsys/logging/log_stack/testcase.yaml index da6c24d2444134..514df7a8f22f8f 100644 --- a/tests/subsys/logging/log_stack/testcase.yaml +++ b/tests/subsys/logging/log_stack/testcase.yaml @@ -27,20 +27,20 @@ tests: logging.log_stack_deferred_cpp: extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_stack_deferred_cpp_no_opt: filter: not CONFIG_MIPS extra_configs: - CONFIG_LOG_MODE_DEFERRED=y - CONFIG_NO_OPTIMIZATIONS=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_stack_immediate_cpp: extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y logging.log_stack_immediate_cpp_no_opt: filter: not CONFIG_MIPS extra_configs: - CONFIG_LOG_MODE_IMMEDIATE=y - CONFIG_NO_OPTIMIZATIONS=y - - CONFIG_CPLUSPLUS=y + - CONFIG_CPP=y diff --git a/tests/subsys/logging/log_switch_format/CMakeLists.txt b/tests/subsys/logging/log_switch_format/CMakeLists.txt index 7b76a47ba110a5..580bd6eed73a93 100644 --- a/tests/subsys/logging/log_switch_format/CMakeLists.txt +++ b/tests/subsys/logging/log_switch_format/CMakeLists.txt @@ -7,7 +7,7 @@ project(log_switch_format) FILE(GLOB app_sources src/*.c) target_sources(app PRIVATE ${app_sources}) -if(CONFIG_CPLUSPLUS) +if(CONFIG_CPP) # When building for C++, force C++ compilation set_source_files_properties(src/*.c PROPERTIES LANGUAGE CXX) endif() diff --git a/tests/ztest/base/CMakeLists.txt b/tests/ztest/base/CMakeLists.txt index 8062eda0ca560e..a05ac990abb34e 100644 --- a/tests/ztest/base/CMakeLists.txt +++ b/tests/ztest/base/CMakeLists.txt @@ -12,7 +12,7 @@ else() find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE}) project(base) - if(CONFIG_CPLUSPLUS) + if(CONFIG_CPP) message(STATUS "adding main.cpp") target_sources(app PRIVATE src/main.cpp) else() diff --git a/tests/ztest/base/prj_cpp.conf b/tests/ztest/base/prj_cpp.conf index 5576ef1f48addf..08f98b1c603362 100644 --- a/tests/ztest/base/prj_cpp.conf +++ b/tests/ztest/base/prj_cpp.conf @@ -1,5 +1,5 @@ CONFIG_ZTEST=y CONFIG_ZTEST_NEW_API=y -CONFIG_CPLUSPLUS=y +CONFIG_CPP=y CONFIG_LIB_CPLUSPLUS=y diff --git a/tests/ztest/fail/core/prj.conf b/tests/ztest/fail/core/prj.conf index 6fa939ecf50810..47f7ec308bc4a7 100644 --- a/tests/ztest/fail/core/prj.conf +++ b/tests/ztest/fail/core/prj.conf @@ -4,5 +4,5 @@ CONFIG_ZTEST=y CONFIG_ZTEST_NEW_API=y -CONFIG_CPLUSPLUS=y +CONFIG_CPP=y CONFIG_LIB_CPLUSPLUS=y diff --git a/tests/ztest/fail/prj.conf b/tests/ztest/fail/prj.conf index 6fa939ecf50810..47f7ec308bc4a7 100644 --- a/tests/ztest/fail/prj.conf +++ b/tests/ztest/fail/prj.conf @@ -4,5 +4,5 @@ CONFIG_ZTEST=y CONFIG_ZTEST_NEW_API=y -CONFIG_CPLUSPLUS=y +CONFIG_CPP=y CONFIG_LIB_CPLUSPLUS=y