Merge pull request #3 from RT-Thread/master

sync with official source

2 files changed, 76 insertions, 25 deletions

diff --git a/components/cplusplus/README.md b/components/cplusplus/README.md
index 44851db56b..d02048d1f1 100644
--- a/components/cplusplus/README.md
+++ b/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);
diff --git a/components/cplusplus/crt_init.c b/components/cplusplus/crt_init.c
index 20f81cdb54..958177c1f2 100644
--- a/components/cplusplus/crt_init.c
+++ b/components/cplusplus/crt_init.c
@@ -1,5 +1,39 @@
+/*
+* File      : crt_init.c
+* This file is part of Device File System in RT-Thread RTOS
+* COPYRIGHT (C) 2008-2011, RT-Thread Development Team
+*
+*  This program is free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2 of the License, or
+*  (at your option) any later version.
+*
+*  This program is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  You should have received a copy of the GNU General Public License along
+*  with this program; if not, write to the Free Software Foundation, Inc.,
+*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*
+* Change Logs:
+* Date           Author       Notes
+* 2014-12-03     Bernard      Add copyright header.
+* 2014-12-29     Bernard      Add cplusplus initialization for ARMCC.
+*/
+
 #include <rtthread.h>
 
+#ifdef __CC_ARM
+extern void $Super$$__cpp_initialize__aeabi_(void);
+/* we need to change the cpp_initialize order */
+void $Sub$$__cpp_initialize__aeabi_(void)
+{
+	/* empty */
+}
+#endif
+
 int cplusplus_system_init(void)
 {
 #if defined(__GNUC__) && !defined(__CC_ARM)
@@ -16,9 +50,25 @@ int cplusplus_system_init(void)
     {
         (*ctors_func)();
     }
+#elif defined(__CC_ARM)
+    /* 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;
 }
 INIT_COMPONENT_EXPORT(cplusplus_system_init);
-