From e2c98640c931519dddf1bd1cd19ceb6f9fa48eaa Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Mon, 13 Aug 2012 12:45:36 +0200
Subject: [PATCH] Fixed platforms.txt linker step. Increased stack size.

---
 hardware/arduino/sam/platform.txt                             | 4 ++--
 .../sam/variants/arduino_due_x/linker_scripts/gcc/flash.ld    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hardware/arduino/sam/platform.txt b/hardware/arduino/sam/platform.txt
index 17c43448b..4f5d812a1 100644
--- a/hardware/arduino/sam/platform.txt
+++ b/hardware/arduino/sam/platform.txt
@@ -7,7 +7,7 @@ compiler.path={runtime.ide.path}/hardware/tools/g++_arm_none_eabi/bin/
 #compiler.path=C:/arm-none-eabi-gcc-4_6/bin/
 compiler.c.cmd=arm-none-eabi-gcc
 compiler.c.flags=-c -g -Os -w -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -Dprintf=iprintf
-compiler.c.elf.cmd=arm-none-eabi-gcc
+compiler.c.elf.cmd=arm-none-eabi-g++
 compiler.c.elf.flags=-Os -Wl,--gc-sections
 compiler.S.flags=-c -g -assembler-with-cpp
 compiler.cpp.cmd=arm-none-eabi-g++
@@ -62,7 +62,7 @@ tools.bossac.path={runtime.ide.path}/hardware/tools
 
 tools.bossac.upload.params.verbose=-i -d
 tools.bossac.upload.params.quiet=
-tools.bossac.upload.pattern="{path}/{cmd}" {upload.verbose} --port={serial.port.file} -e -w -v -b "{build.path}/{build.project_name}.bin"
+tools.bossac.upload.pattern="{path}/{cmd}" {upload.verbose} --port={serial.port.file} -e -w -v -b "{build.path}/{build.project_name}.bin" -R
 
 # specialized tool for adk2 to twiddle the erase line before running bossac
 tools.adk2install.cmd=adk2install
diff --git a/hardware/arduino/sam/variants/arduino_due_x/linker_scripts/gcc/flash.ld b/hardware/arduino/sam/variants/arduino_due_x/linker_scripts/gcc/flash.ld
index 8d652b606..c081401f7 100644
--- a/hardware/arduino/sam/variants/arduino_due_x/linker_scripts/gcc/flash.ld
+++ b/hardware/arduino/sam/variants/arduino_due_x/linker_scripts/gcc/flash.ld
@@ -41,7 +41,7 @@ MEMORY
 }
 
 /* The stack size used by the application. NOTE: you need to adjust  */
-STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : 0x2000 ;
+STACK_SIZE = DEFINED(STACK_SIZE) ? STACK_SIZE : 0x8000 ;
 
 /* Section Definitions */
 SECTIONS
@@ -117,7 +117,7 @@ SECTIONS
     } > ram
 
     /* .bss section which is used for uninitialized data */
-    .bss (NOLOAD) :
+    .bss ALIGN(4) (NOLOAD) :
     {
         . = ALIGN(4);
         _sbss = . ;