Merge remote-tracking branch 'upstream/master'

components/cplusplus/README.md

@@ -4,35 +4,37 @@ This is the C++ component in RT-Thread RTOS. In order to support C++ language, t
 implement a basic environment, such as new/delete operators.
 
 Because RT-Thread RTOS is used in embedded system mostly, there are some rules for C++ applications:
+
 1. DOES NOT use exception.
 2. DOES NOT use Run-Time Type Information (RTTI).
 3. Template is discouraged and it easily causes code text large.
 4. Static class variables are discouraged. The time and place to call their constructor function could not be precisely controlled and make multi-threaded programming a nightmare.
 5. Multiple inheritance is strongly discouraged, as it can cause intolerable confusion.
 
-*NOTE*: The libc must be enable.
+*NOTE*: The libc (RT_USING_LIBC in rtconfig.h) must be enable.
 
 About GNU GCC compiler
 
 please add following string in your ld link script:
-// in your .text section
-        PROVIDE(__ctors_start__ = .);
-        /* old GCC version uses .ctors */
-        KEEP(*(SORT(.ctors.*)))
-        KEEP(*(.ctors))
-        /* new GCC version uses .init_array */
-        KEEP (*(SORT(.init_array.*)))
-        KEEP (*(.init_array))
-        PROVIDE(__ctors_end__ = .);
-
-        . = ALIGN(4);
-
-// as a standalone section if you use ARM target.
 
+    // in your .text section
+    PROVIDE(__ctors_start__ = .);
+    /* old GCC version uses .ctors */
+    KEEP(*(SORT(.ctors.*)))
+    KEEP(*(.ctors))
+    /* new GCC version uses .init_array */
+    KEEP (*(SORT(.init_array.*)))
+    KEEP (*(.init_array))
+    PROVIDE(__ctors_end__ = .);
+    
+    . = ALIGN(4);
+    
+    // as a standalone section if you use ARM target.
+    
     /* The .ARM.exidx section is used for C++ exception handling. */
     /* .ARM.exidx is sorted, so has to go in its own output section.  */
     __exidx_start = .;
-    .ARM.exidx :
+    ARM.exidx :
     {
         *(.ARM.exidx* .gnu.linkonce.armexidx.*)
 
@@ -40,14 +42,13 @@ please add following string in your ld link script:
         _sidata = .;
     } > CODE
     __exidx_end = .;
-
+    
     /* .data section which is used for initialized data */
 
-// in your .data section
-        PROVIDE(__dtors_start__ = .);
-        KEEP(*(SORT(.dtors.*)))
-        KEEP(*(.dtors))
-        PROVIDE(__dtors_end__ = .);
-
-        . = ALIGN(4);
-
+    // in your .data section
+    PROVIDE(__dtors_start__ = .);
+    KEEP(*(SORT(.dtors.*)))
+    KEEP(*(.dtors))
+    PROVIDE(__dtors_end__ = .);
+    
+    . = ALIGN(4);

components/cplusplus/crt_init.c

@@ -51,8 +51,22 @@ int cplusplus_system_init(void)
         (*ctors_func)();
     }
 #elif defined(__CC_ARM)
-    /* call armcc lib to initialize cplusplus */
-	$Super$$__cpp_initialize__aeabi_();
+    /* 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.
+     */
+    typedef void PROC();
+    extern const unsigned long SHT$$INIT_ARRAY$$Base[];
+    extern const unsigned long SHT$$INIT_ARRAY$$Limit[];
+    
+    const unsigned long *base = SHT$$INIT_ARRAY$$Base;
+    const unsigned long *lim  = SHT$$INIT_ARRAY$$Limit;
+
+    for (; base != lim; base++)
+    {
+        PROC *proc = (PROC*)((const char*)base + *base);
+        (*proc)();
+    }
 #endif
 
     return 0;