From 707cb7bc049a036f19ae8b89973502cd1752b9d8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>
Date: Fri, 11 Feb 2005 18:42:57 +0000
Subject: Subtle fix for international support

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5915 a1c6a512-1295-4272-9138-f99709370657
---
 firmware/app.lds | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'firmware/app.lds')

diff --git a/firmware/app.lds b/firmware/app.lds
index 30c8a0d524..edb259aa2b 100644
--- a/firmware/app.lds
+++ b/firmware/app.lds
@@ -36,8 +36,18 @@ SECTIONS
 	*(.vectors)
 	}> ICMEM  AT> FIRMWARE
 
+/* We start at 0x2000, to avoid overwriting Archos' loader datasegment.
+ * If it turns out that we won't call back the loader, this can be set to 0.
+ */
+.bss 0x2000 : {
+	*(.bss)
+	. = ALIGN(2);
+	}> DRAM	
 
-.data 0x2000: { 
+/* Data is put after BSS, to have all strings addresses > VIRT_PTR + VIRT_SIZE.
+   Strings are in rodata, so what we really assert is (.rodata > VIRT_PTR + VIRT_SIZE)
+   See settings.h for details */
+.data ALIGN(2): { 
 	*(.data) 
 	. = ALIGN(2);
 	*(.rodata) 
@@ -46,10 +56,6 @@ SECTIONS
 	. = ALIGN(2);
 	}> DRAM AT> FIRMWARE
 
-.bss ALIGN(2) : {
-	*(.bss)
-	. = ALIGN(2);
-	}> DRAM	
 
 .stack ALIGN(2) : {	
    . = . + 0x2000;
-- 
cgit v1.2.3