From 9e45144d3ad1420908cfdf84306c76f637829023 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 29 Oct 2012 19:32:05 +0000
Subject: C++ constructors work with ELF load now

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5273 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/configs/stm32f4discovery/scripts/gnu-elf.ld | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'nuttx/configs/stm32f4discovery/scripts/gnu-elf.ld')

diff --git a/nuttx/configs/stm32f4discovery/scripts/gnu-elf.ld b/nuttx/configs/stm32f4discovery/scripts/gnu-elf.ld
index 0153cf5fa..1f29f02f5 100644
--- a/nuttx/configs/stm32f4discovery/scripts/gnu-elf.ld
+++ b/nuttx/configs/stm32f4discovery/scripts/gnu-elf.ld
@@ -51,8 +51,8 @@ SECTIONS
        */
 
       *(.gnu.linkonce.t.*)
-      *(.init)
-      *(.fini)
+      *(.init)             /* Old ABI */
+      *(.fini)             /* Old ABI */
       _etext = . ;
     }
 
@@ -86,15 +86,17 @@ SECTIONS
 
   .ctors :
     {
-      _sctros = . ;
-      *(.ctors)
+      _sctors = . ;
+      *(.ctors)       /* Old ABI:  Unallocated */
+      *(.init_array)  /* New ABI:  Allocated */
       _edtors = . ;
     }
 
-  .ctors :
+  .dtors :
     {
       _sdtors = . ;
-      *(.dtors)
+      *(.dtors)       /* Old ABI:  Unallocated */
+      *(.fini_array)  /* New ABI:  Allocated */
       _edtors = . ;
     }
 
-- 
cgit v1.2.3