add .init_array support

rust-embedded · Apr 9, 2017 · 201d4e2 · 201d4e2
1 parent eeaf566
commit 201d4e2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/cortex-m-rt/Cargo.toml b/cortex-m-rt/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Jorge Aparicio <[email protected]>"]
 
 [dependencies]
-r0 = "0.2.0"
+r0 = "0.2.1"
 
 [dependencies.cortex-m]
 optional = true

diff --git a/cortex-m-rt/link.x b/cortex-m-rt/link.x
@@ -17,6 +17,9 @@ SECTIONS
 
     *(.text.*);
     *(.rodata.*);
+    _init_array_start = ALIGN(4);
+    KEEP(*(.init_array));
+    _init_array_end = ALIGN(4);
   } > FLASH
 
   .bss : ALIGN(4)

diff --git a/cortex-m-rt/src/lib.rs b/cortex-m-rt/src/lib.rs
@@ -57,10 +57,14 @@ unsafe extern "C" fn reset_handler() -> ! {
         static mut _sdata: u32;
 
         static _sidata: u32;
+
+        static _init_array_start: extern "C" fn();
+        static _init_array_end: extern "C" fn();
     }
 
     ::r0::zero_bss(&mut _sbss, &mut _ebss);
     ::r0::init_data(&mut _sdata, &mut _edata, &_sidata);
+    ::r0::run_init_array(&_init_array_start, &_init_array_end);
 
     // NOTE `rustc` forces this signature on us. See `src/lang_items.rs`
     extern "C" {