From 553f23ae74bee0bceb4d2b7e52e46699df2f6425 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Fri, 28 Aug 2009 15:11:16 +0000
Subject: Modified linker scripts for GCC 4.4.1.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1113 35acf78f-673a-0410-8e92-d51de3d6d3f4
---
 demos/ARM7-AT91SAM7X-GCC/ch.ld       | 86 +++++++++++++++++++-----------------
 demos/ARM7-AT91SAM7X-WEB-GCC/ch.ld   | 86 +++++++++++++++++++-----------------
 demos/ARM7-LPC214x-G++/ch.ld         |  5 +++
 demos/ARM7-LPC214x-GCC-minimal/ch.ld |  5 +++
 demos/ARM7-LPC214x-GCC/ch.ld         |  5 +++
 demos/ARMCM3-STM32F103-GCC/ch.ld     |  5 +++
 6 files changed, 110 insertions(+), 82 deletions(-)

diff --git a/demos/ARM7-AT91SAM7X-GCC/ch.ld b/demos/ARM7-AT91SAM7X-GCC/ch.ld
index 643453cd8..944a7f29d 100644
--- a/demos/ARM7-AT91SAM7X-GCC/ch.ld
+++ b/demos/ARM7-AT91SAM7X-GCC/ch.ld
@@ -30,8 +30,8 @@ __stacks_total_size__	= __und_stack_size__ + __abt_stack_size__ + __fiq_stack_si
 
 MEMORY
 {
-	flash : org = 0x100000, len = 256k
-	ram : org = 0x200020, len = 64k - 0x20
+    flash : org = 0x100000, len = 256k
+    ram : org = 0x200020, len = 64k - 0x20
 }
 
 __ram_start__		= ORIGIN(ram);
@@ -42,49 +42,53 @@ SECTIONS
 {
 	. = 0;
 
-	.text :
+	.text : ALIGN(16) SUBALIGN(16)
 	{
-		_text = .;
-		KEEP(*(vectors));
-                *(.text)
-		*(.text.*);
-		*(.rodata);
-		*(.rodata.*);
-		*(.glue_7t);
-		*(.glue_7);
-		*(.gcc*);
-		*(.ctors);
-		*(.dtors);
-		. = ALIGN(4);
-		_etext = .;
-	} > flash
+        _text = .;
+        KEEP(*(vectors))
+        *(.text)
+        *(.text.*);
+        *(.rodata);
+        *(.rodata.*);
+        *(.glue_7t);
+        *(.glue_7);
+        *(.gcc*);
+        *(.ctors);
+        *(.dtors);
+        . = ALIGN(4);
+        _etext = .;
+    } > flash
 
-	_textdata = _etext;
+    _textdata = _etext;
 
-	.data :
-	{
-		_data = .;
-		_data = .;
-		*(.data)
-		. = ALIGN(4);
-		*(.data.*)
-		. = ALIGN(4);
-		*(.ramtext)
-		. = ALIGN(4);
-		_edata = .;
-	} > ram AT > flash
+    .data :
+    {
+        _data = .;
+        *(.data)
+        . = ALIGN(4);
+        *(.data.*)
+        . = ALIGN(4);
+        *(.ramtext)
+        . = ALIGN(4);
+        _edata = .;
+    } > ram AT > flash
 
-	.bss :
-	{
-		_bss_start = .;
-		*(.bss)
-		. = ALIGN(4);
-		*(.bss.*)
-		. = ALIGN(4);
-		*(COMMON)
-		. = ALIGN(4);
-		_bss_end = .;
-	} > ram    
+    .bss :
+    {
+        _bss_start = .;
+        *(.bss)
+        . = ALIGN(4);
+        *(.bss.*)
+        . = ALIGN(4);
+        *(COMMON)
+        . = ALIGN(4);
+        _bss_end = .;
+    } > ram    
+    
+    /DISCARD/ :
+    {
+        *(.eh_*)
+    }
 }
 
 PROVIDE(end = .);
diff --git a/demos/ARM7-AT91SAM7X-WEB-GCC/ch.ld b/demos/ARM7-AT91SAM7X-WEB-GCC/ch.ld
index 643453cd8..944a7f29d 100644
--- a/demos/ARM7-AT91SAM7X-WEB-GCC/ch.ld
+++ b/demos/ARM7-AT91SAM7X-WEB-GCC/ch.ld
@@ -30,8 +30,8 @@ __stacks_total_size__	= __und_stack_size__ + __abt_stack_size__ + __fiq_stack_si
 
 MEMORY
 {
-	flash : org = 0x100000, len = 256k
-	ram : org = 0x200020, len = 64k - 0x20
+    flash : org = 0x100000, len = 256k
+    ram : org = 0x200020, len = 64k - 0x20
 }
 
 __ram_start__		= ORIGIN(ram);
@@ -42,49 +42,53 @@ SECTIONS
 {
 	. = 0;
 
-	.text :
+	.text : ALIGN(16) SUBALIGN(16)
 	{
-		_text = .;
-		KEEP(*(vectors));
-                *(.text)
-		*(.text.*);
-		*(.rodata);
-		*(.rodata.*);
-		*(.glue_7t);
-		*(.glue_7);
-		*(.gcc*);
-		*(.ctors);
-		*(.dtors);
-		. = ALIGN(4);
-		_etext = .;
-	} > flash
+        _text = .;
+        KEEP(*(vectors))
+        *(.text)
+        *(.text.*);
+        *(.rodata);
+        *(.rodata.*);
+        *(.glue_7t);
+        *(.glue_7);
+        *(.gcc*);
+        *(.ctors);
+        *(.dtors);
+        . = ALIGN(4);
+        _etext = .;
+    } > flash
 
-	_textdata = _etext;
+    _textdata = _etext;
 
-	.data :
-	{
-		_data = .;
-		_data = .;
-		*(.data)
-		. = ALIGN(4);
-		*(.data.*)
-		. = ALIGN(4);
-		*(.ramtext)
-		. = ALIGN(4);
-		_edata = .;
-	} > ram AT > flash
+    .data :
+    {
+        _data = .;
+        *(.data)
+        . = ALIGN(4);
+        *(.data.*)
+        . = ALIGN(4);
+        *(.ramtext)
+        . = ALIGN(4);
+        _edata = .;
+    } > ram AT > flash
 
-	.bss :
-	{
-		_bss_start = .;
-		*(.bss)
-		. = ALIGN(4);
-		*(.bss.*)
-		. = ALIGN(4);
-		*(COMMON)
-		. = ALIGN(4);
-		_bss_end = .;
-	} > ram    
+    .bss :
+    {
+        _bss_start = .;
+        *(.bss)
+        . = ALIGN(4);
+        *(.bss.*)
+        . = ALIGN(4);
+        *(COMMON)
+        . = ALIGN(4);
+        _bss_end = .;
+    } > ram    
+    
+    /DISCARD/ :
+    {
+        *(.eh_*)
+    }
 }
 
 PROVIDE(end = .);
diff --git a/demos/ARM7-LPC214x-G++/ch.ld b/demos/ARM7-LPC214x-G++/ch.ld
index a79694e7b..15d0fbe2f 100644
--- a/demos/ARM7-LPC214x-G++/ch.ld
+++ b/demos/ARM7-LPC214x-G++/ch.ld
@@ -87,6 +87,11 @@ SECTIONS
         . = ALIGN(4);
         _bss_end = .;
     } > ram    
+    
+    /DISCARD/ :
+    {
+        *(.eh_*)
+    }
 }
 
 PROVIDE(end = .);
diff --git a/demos/ARM7-LPC214x-GCC-minimal/ch.ld b/demos/ARM7-LPC214x-GCC-minimal/ch.ld
index 45bde5dea..9dd4d388e 100644
--- a/demos/ARM7-LPC214x-GCC-minimal/ch.ld
+++ b/demos/ARM7-LPC214x-GCC-minimal/ch.ld
@@ -87,6 +87,11 @@ SECTIONS
         . = ALIGN(4);
         _bss_end = .;
     } > ram    
+    
+    /DISCARD/ :
+    {
+        *(.eh_*)
+    }
 }
 
 PROVIDE(end = .);
diff --git a/demos/ARM7-LPC214x-GCC/ch.ld b/demos/ARM7-LPC214x-GCC/ch.ld
index 45bde5dea..9dd4d388e 100644
--- a/demos/ARM7-LPC214x-GCC/ch.ld
+++ b/demos/ARM7-LPC214x-GCC/ch.ld
@@ -87,6 +87,11 @@ SECTIONS
         . = ALIGN(4);
         _bss_end = .;
     } > ram    
+    
+    /DISCARD/ :
+    {
+        *(.eh_*)
+    }
 }
 
 PROVIDE(end = .);
diff --git a/demos/ARMCM3-STM32F103-GCC/ch.ld b/demos/ARMCM3-STM32F103-GCC/ch.ld
index 90a0093fe..22d5546a1 100644
--- a/demos/ARMCM3-STM32F103-GCC/ch.ld
+++ b/demos/ARMCM3-STM32F103-GCC/ch.ld
@@ -80,6 +80,11 @@ SECTIONS
         . = ALIGN(4);
         _bss_end = .;
     } > ram    
+    
+    /DISCARD/ :
+    {
+        *(.eh_*)
+    }
 }
 
 PROVIDE(end = .);
-- 
cgit v1.2.3