From d994e48c5565a0c7aea54384a1b15a19623fe209 Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Wed, 19 Sep 2012 16:23:39 +0200
Subject: [PATCH] Delayed static object construction after hardware setup

---
 .../ATMEL/sam3xa/source/gcc/startup_sam3xa.c  |   7 +++++--
 .../arduino_due_x/libsam_sam3x8e_gcc_rel.a    | Bin 86354 -> 86302 bytes
 .../libsam_sam3x8e_gcc_rel.a.txt              |   1 -
 .../sam/variants/arduino_due_x/variant.cpp    |   7 ++++++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/hardware/arduino/sam/system/CMSIS/Device/ATMEL/sam3xa/source/gcc/startup_sam3xa.c b/hardware/arduino/sam/system/CMSIS/Device/ATMEL/sam3xa/source/gcc/startup_sam3xa.c
index 55e9e8b50..224edaef3 100644
--- a/hardware/arduino/sam/system/CMSIS/Device/ATMEL/sam3xa/source/gcc/startup_sam3xa.c
+++ b/hardware/arduino/sam/system/CMSIS/Device/ATMEL/sam3xa/source/gcc/startup_sam3xa.c
@@ -44,7 +44,8 @@ extern uint32_t _estack;
 int main(void);
 /** \endcond */
 
-void __libc_init_array(void);
+// Arduino: we must setup hardware before doing this
+// void __libc_init_array(void);
 
 /* Default empty handler */
 void Dummy_Handler(void);
@@ -272,7 +273,9 @@ void Reset_Handler(void)
 	}
 
 	/* Initialize the C library */
-	__libc_init_array();
+
+	// Arduino: we must setup hardware before doing this
+	//__libc_init_array();
 
 	/* Branch to main function */
 	main();
diff --git a/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a b/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a
index a8f27438f547a868fc9aa6f040b888e1f3d1bd1f..822990651270eb1ce2ed99bfa977cfe85551ed13 100644
GIT binary patch
delta 2358
zcmc(hZD?Cn7{~wTwn@9%rpcPMsp)K&)^;<qz1d5WP2HMSx3v{1L$rbnyB3ilSedwf
zs9qJpi9^fIuyxdzwVM=tA?qzfhm(CMC~P10B5Y%Y*0z!<7AmWlK^dMWxplb@3{(U!
zJpJ9@bI+6W+<Q2jUL1COH0<d2=SB6+;ZRgR8TcT_I0DT7k74|S$%VTS>G1YK_?-Vq
z7<c?3{V|BY8?n6*|1NxYDwIFgkC-<c3%<;1MZyE|m?#~qyymbHk#xdL)g%k-nWcuV
zbyg;t8PoSvWo34z%>25ywm3UeYA(H%%(G?2`uFGC5@!Ek^Ii7L!pM8}B6H}o8_OMU
zp~=h4FDCXDSykywsk#2*0qZ5AdZxiMm!GtLCzC1535TPH18YUE?3`K^ENLxiJKE&9
zP|{W~y*ribZ&u-Hd8a9L>Gvc8%7U&|*>v-gtHmXcO|5q3w+-&Rm6X3#l&_e_G}J{l
zwP?;v9~QEEyvEU22t?(FGu1Lao+~G2Y8<0#)S^5Y^Saf|3aYWLap{?@6GJleahYtN
zb&Kz0=WLxLC4g7ug+tXvqq#s_MUfh>rVsiZ9jd%qhHmYb?Q>qyKH%{RzkF@3L-fe2
za|c3u)Ie1YO~pz$@w_5kiz+<GL!aXE^MHDOP`>_CgK?T=&oiH7KF@rKd7+vjdzNzM
zwRShK!Jfc2=B>=1VBW>Nhxsea-?q8o#QU~{6C=#y%uh2v$NU=eUzp#_c0(;ho?0=L
zOD`NPjF<Tu=Jm|CGT*^`H}gGNZqS7LvJ&JkGk=5myUdR=|CIR{^KWnav!Dsj-cF?b
z3iBlMMdl*M{smpk{qorL=S=_4XEmdpK6EkgI8p7%4x$Hmnz#~phFAi06TL|9B5jot
z@>W3YNN6q~pXdYBhKE)T(Dv5u22=?&KcF5#s{qy$R|7in9vFzyO(pOku?lD;t^pn<
z27q0}YT!{~4Ulg5UaR3+tKmAU;k8!7>#T<Fvl<QpJyfq|e~EZM&`Yd0fH&!;0XRrh
zZ5<+pfPUfz;0SReFi6}43=ua2pAf^qC@}(jPE>CbCvE}8iCclMhz|hY5Y=0rAwC35
z5RGlX_jI!zI7e&*&J$z655y+m3b7fOB&yFcO?(8HBklmM6L$i?5_bU$#1^2lyQ}_%
zhN{1=(8f*a|41T{s;ZE#>-2ZvR7@0_sreHXwi73Dsz6-UY{yCB%OY`=rH;FWKi3+S
iIVTg7Uh!g%y>OpT1Z{^^X<|$lf4G+m6YBgLF8&ivw||5H

delta 2362
zcmc(hZD?Cn7{~wTwl`h7m!xf0Q@gEMvNhYfwR!1m_oDV?bA8!|Ap@rjvf2tO4vn?C
z4oa^K!GUEfJ=0d*WNr$DMd%hK{UBPTANFC;b`v(3+ODm%h?U|Cc2LmsBsZ@2fq@gj
z3r~Le{W&l9+{4YuhZpr57xnIfjPhWxd`Csu70-KV#x-E>e=Or6CKrx2B+40uaP9n0
z%6Q;F{*w^@w5r~P_;=-cP)B*U<WlTcecom6mcKWWCGxHo-qFn<kO*Q68)mYs$zo~K
zW-|#U+jKlzSZGZK+kJLxviR0ah9$Y${pvDH5bN%%S#C|{FP%ws3ei-L#Li#-C3VM%
zBrg^nZdz&fDoftZ)*HuDi!hU+ThFA%Nhax`@}R%Rvq`)m8^>1{JL{bd?^o+%&W5as
zrx(%-YE<Ray<NR<^Y<Beloi|SW%a$A_By-#Xnd`n+0eHyQ+_qRF*Y&YrHOWV<pr<a
zzXGU~?@W62C;&~acjwB{NrxDacPD*fR%TB5#K$r)<<mw)ucJs5>Ck{qIo9RX2hxEd
z`RSC`7Rdy*r}Yl45UsLy+9?i7QJXJcpMFlwGB$lY@S++!bve|Rh$^8<4TT)o(5Xn*
zZ>qA9fz$HD52ePJ%2KU7s?`YdN#;K@|C9MDHQ3Ve)-f-(x`7I7fIZ9)Fh9)vDD&5t
zpJaZ<;)V?$SOOdRnSajwYvv=&zh^$jd~vB8>X9#3JEXG2M$s1JGcRHuVqVF7Kl4M(
zo0qsj6GoN<<Q>dUF+a=v0`n;ILFU8v-2hEEdOt|`cg%leevi2=&H4m$nY)>9Q=YtJ
z&uln596r|ad{emPrIxmEV{2>UiP-$?b<F?{(yrKnLqzpX9VTW2M~FE<Gcgx9N^~Y)
zIc+u2MxLiWhz)>xhoP+kmJ#y-^?LyAQGi}ktpHG6p{)U2#I?XyqOlI})0aY^g6IZz
z6W0TkL=Uis=mlzt8-V@9jlcn7k+}e$xqwaP0ydiq*kUfA7&u1l)vOWXw&Vf~tpsSN
zpcHtMsP5(zF#vQCgFrVi1e_(70e!^nz&YY$zy)GC&`(sWh!S@I1H_%cXT)8=AW^OE
z3*zIz5MV%i0vM*?N#Gi>61YyR0!E3|z&FGi;5Jb`j&F&3feGSMz%+3mFiWfjej?TZ
z^Tc|fvAL<_<x=<GS0GfD{F7pya>H|<tT7LfP+T1}b6U#iNO8qGR*GAeC@&syh=O#p
iRdSSgzf-)Dmg*RHyF``stcrK~#UBo9pPnkwW&aB(rG<q6

diff --git a/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a.txt b/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a.txt
index 6ded8fa2f..1854c378a 100644
--- a/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a.txt
+++ b/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a.txt
@@ -288,7 +288,6 @@ startup_sam3xa.o:
 00000000 W USART3_Handler
 00000000 W UsageFault_Handler
 00000000 W WDT_Handler
-         U __libc_init_array
          U _erelocate
          U _estack
          U _etext
diff --git a/hardware/arduino/sam/variants/arduino_due_x/variant.cpp b/hardware/arduino/sam/variants/arduino_due_x/variant.cpp
index 2f40e24e1..1719aca3e 100644
--- a/hardware/arduino/sam/variants/arduino_due_x/variant.cpp
+++ b/hardware/arduino/sam/variants/arduino_due_x/variant.cpp
@@ -338,7 +338,9 @@ void USART3_Handler( void )
 extern "C" {
 #endif
 
-extern void init( void )
+void __libc_init_array(void);
+
+void init( void )
 {
   SystemInit() ;
 
@@ -352,6 +354,9 @@ extern void init( void )
   // Disable watchdog, common to all SAM variants
   WDT_Disable( WDT ) ;
 
+  // Initialize C library
+  __libc_init_array();
+
   // Initialize Serial port UART, common to all SAM3 variants
   PIO_Configure(
     g_APinDescription[PINS_UART].pPort,