ARC: MWDT: fix include path for the case of C/C++ lib usage

Fix include path of headers provided by MWDT toolchain for the
case of MWDT C/C++ lib usage.

Signed-off-by: Eugeniy Paltsev <[email protected]>
Signed-off-by: Evgeniy Paltsev <[email protected]>

Author: evgeniy-paltsev

cmake/compiler/arcmwdt/compiler_flags.cmake

@@ -115,12 +115,11 @@ set_compiler_property(PROPERTY warning_error_misra_sane -Werror=vla)
 
 set_compiler_property(PROPERTY cstd -std=)
 
-if (NOT CONFIG_NEWLIB_LIBC AND
-    NOT CONFIG_NATIVE_APPLICATION)
+if (NOT CONFIG_ARCMWDT_LIBC)
   set_compiler_property(PROPERTY nostdinc -Hno_default_include -Hnoarcexlib)
-  set_compiler_property(APPEND PROPERTY nostdinc_include ${NOSTDINC})
 endif()
 
+set_compiler_property(APPEND PROPERTY nostdinc_include ${NOSTDINC})
 
 # C++ std options
 set_property(TARGET compiler-cpp PROPERTY dialect_cpp98 "-std=c++98")
@@ -173,7 +172,7 @@ set_compiler_property(PROPERTY security_canaries -fstack-protector-all)
 set_compiler_property(PROPERTY security_fortify "")
 
 # Required C++ flags when using mwdt
-set_property(TARGET compiler-cpp PROPERTY required "")
+set_property(TARGET compiler-cpp PROPERTY required "-Hcplus" "-Hoff=Stackcheck_alloca")
 
 # Compiler flag for turning off thread-safe initialization of local statics
 set_property(TARGET compiler-cpp PROPERTY no_threadsafe_statics "-fno-threadsafe-statics")

cmake/compiler/arcmwdt/target.cmake

@@ -26,6 +26,10 @@ set(NOSTDINC "")
 
 list(APPEND NOSTDINC ${TOOLCHAIN_HOME}/arc/inc)
 
+if(CONFIG_ARCMWDT_LIBC AND CONFIG_LIB_CPLUSPLUS)
+  list(APPEND NOSTDINC ${TOOLCHAIN_HOME}/arc/lib/src/c++/inc)
+endif()
+
 # For CMake to be able to test if a compiler flag is supported by the
 # toolchain we need to give CMake the necessary flags to compile and
 # link a dummy C file.