ARC: init constructors for MWDT

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

Author: evgeniy-paltsev

cmake/linker/arcmwdt/target.cmake

@@ -110,13 +110,13 @@ macro(toolchain_ld_baremetal)
   zephyr_ld_options(
     -Hlld
     -Hnosdata
-    -Hnocrt
     -Xtimer0 # to suppress the warning message
     -Hnoxcheck_obj
     -Hnocplus
     -Hcl
     -Hheap=0
     -Hnoivt
+    -arcv2hs
   )
 
   # Funny thing is if this is set to =error, some architectures will

include/arch/arc/v2/linker.ld

@@ -87,7 +87,7 @@ SECTIONS {
  * zephyr_linker_sources() Cmake function.
  */
 #include <snippets-rom-start.ld>
-		*(.text .text.*)
+		*(.text .text* .text.*)
 		*(.gnu.linkonce.t.*)
 
 	. = ALIGN(4);
@@ -115,6 +115,32 @@ SECTIONS {
 
 #ifdef __MWDT_LINKER_CMD__
 /* TODO: add mwdt specific ROM C++ sections */
+
+	SECTION_PROLOGUE(_RODATA_SECTION_NAME,,) {
+		. = ALIGN(4);
+		_fctors = .;
+		KEEP(*(.ctors .ctors* .ctors.*))
+		_ectors = .;
+
+		. = ALIGN(4);
+		_fdtors = .;
+		KEEP(*(.dtors .dtors* .dtors.*))
+		_edtors = .;
+
+		. = ALIGN(4);
+		_feh_frame = .;
+		KEEP(*(.eh_frame .eh_frame* .eh_frame.*))
+		_eeh_frame = .;
+	} GROUP_LINK_IN(ROMABLE_REGION)
+
+	SECTION_PROLOGUE(.init,,ALIGN(4)) {
+		KEEP(*(.init*))
+	} GROUP_LINK_IN(ROMABLE_REGION)
+
+	SECTION_PROLOGUE(.fini,,ALIGN(4)) {
+		KEEP(*(.fini*))
+	} GROUP_LINK_IN(ROMABLE_REGION)
+
 #else
 #include <linker/cplusplus-rom.ld>
 #endif /* __MWDT_LINKER_CMD__ */

include/linker/common-rom.ld

@@ -37,7 +37,7 @@
 	}
 	ASSERT(SIZEOF(initlevel_error) == 0, "Undefined initialization levels used.")
 
-#ifdef CONFIG_CPLUSPLUS
+#if defined(CONFIG_CPLUSPLUS) && !defined(__MWDT_LINKER_CMD__)
 	SECTION_PROLOGUE(_CTOR_SECTION_NAME,,)
 	{
 		/*

include/sys/cbprintf.h

@@ -20,6 +20,8 @@
 extern "C" {
 #endif
 
+#define Z_C_GENERIC 0
+
 /* Determine if _Generic is supported.
  * In general it's a C11 feature but it was added also in:
  * - GCC 4.9.0 https://gcc.gnu.org/gcc-4.9/changes.html

kernel/init.c

@@ -153,11 +153,14 @@ static void bg_thread_main(void *unused1, void *unused2, void *unused3)
 	boot_banner();
 
 #ifdef CONFIG_CPLUSPLUS
-	/* Process the .ctors and .init_array sections */
-	extern void __do_global_ctors_aux(void);
-	extern void __do_init_array_aux(void);
-	__do_global_ctors_aux();
-	__do_init_array_aux();
+//	/* Process the .ctors and .init_array sections */
+//	extern void __do_global_ctors_aux(void);
+//	extern void __do_init_array_aux(void);
+//	__do_global_ctors_aux();
+//	__do_init_array_aux();
+
+	_init();
+//	_mwrtl_init();
 #endif
 
 	/* Final init level before app starts */

subsys/cpp/CMakeLists.txt

@@ -1,10 +1,10 @@
 # SPDX-License-Identifier: Apache-2.0
 
-zephyr_sources(
-  cpp_init_array.c
-  cpp_ctors.c
-  cpp_dtors.c
-)
+#zephyr_sources(
+#  cpp_init_array.c
+#  cpp_ctors.c
+#  cpp_dtors.c
+#)
 
 if (NOT CONFIG_LIB_CPLUSPLUS AND
         (NOT CONFIG_MINIMAL_LIBC OR