From 84f1b567bb140a51db3dd7032e34707ffe7974d2 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Tue, 5 May 2009 11:28:36 +0000
Subject: [PATCH]         * scripttempl/avr.sc (MEMORY): Use DATA_ORIGIN.      
   * emulparams/avr1.sh (DATA_ORIGIN): Add.         * emulparams/avr2.sh
 (DATA_ORIGIN): Add.         * emulparams/avr25.sh (DATA_ORIGIN): Add.        
 * emulparams/avr3.sh (DATA_ORIGIN): Add.         * emulparams/avr31.sh
 (DATA_ORIGIN): Add.         * emulparams/avr35.sh (DATA_ORIGIN): Add.        
 * emulparams/avr4.sh (DATA_ORIGIN): Add.         * emulparams/avr5.sh
 (DATA_ORIGIN): Add.         * emulparams/avr51.sh (DATA_ORIGIN): Add.        
 (DATA_LENGTH): Update.         * emulparams/avr6.sh (DATA_ORIGIN): Add.      
   (DATA_LENGTH): Update.

---
 ld/ChangeLog           | 16 ++++++++++++++++
 ld/emulparams/avr1.sh  |  1 +
 ld/emulparams/avr2.sh  |  1 +
 ld/emulparams/avr25.sh |  1 +
 ld/emulparams/avr3.sh  |  1 +
 ld/emulparams/avr31.sh |  1 +
 ld/emulparams/avr35.sh |  1 +
 ld/emulparams/avr4.sh  |  1 +
 ld/emulparams/avr5.sh  |  1 +
 ld/emulparams/avr51.sh |  3 ++-
 ld/emulparams/avr6.sh  |  3 ++-
 ld/scripttempl/avr.sc  |  2 +-
 12 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 83461c8e6a2..a13b98534ba 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,19 @@
+2009-05-05  Anatoly Sokolov  <aesok@post.ru>
+
+	* scripttempl/avr.sc (MEMORY): Use DATA_ORIGIN.
+	* emulparams/avr1.sh (DATA_ORIGIN): Add.
+	* emulparams/avr2.sh (DATA_ORIGIN): Add.
+	* emulparams/avr25.sh (DATA_ORIGIN): Add.
+	* emulparams/avr3.sh (DATA_ORIGIN): Add.
+	* emulparams/avr31.sh (DATA_ORIGIN): Add.
+	* emulparams/avr35.sh (DATA_ORIGIN): Add.
+	* emulparams/avr4.sh (DATA_ORIGIN): Add.
+	* emulparams/avr5.sh (DATA_ORIGIN): Add.
+	* emulparams/avr51.sh (DATA_ORIGIN): Add.
+	(DATA_LENGTH): Update.
+	* emulparams/avr6.sh (DATA_ORIGIN): Add.
+	(DATA_LENGTH): Update.
+
 2009-05-04  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 	* NEWS:  Mention new feature.
diff --git a/ld/emulparams/avr1.sh b/ld/emulparams/avr1.sh
index 7d907fe008d..2f6af99a7a0 100644
--- a/ld/emulparams/avr1.sh
+++ b/ld/emulparams/avr1.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=8K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0
 EXTRA_EM_FILE=avrelf
diff --git a/ld/emulparams/avr2.sh b/ld/emulparams/avr2.sh
index 2bd677bfc8c..cb35bb95b9e 100644
--- a/ld/emulparams/avr2.sh
+++ b/ld/emulparams/avr2.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=8K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf
diff --git a/ld/emulparams/avr25.sh b/ld/emulparams/avr25.sh
index 12a002389bc..2965347efc7 100644
--- a/ld/emulparams/avr25.sh
+++ b/ld/emulparams/avr25.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=8K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf
diff --git a/ld/emulparams/avr3.sh b/ld/emulparams/avr3.sh
index ff559e6d29a..a0b86c4ec4b 100644
--- a/ld/emulparams/avr3.sh
+++ b/ld/emulparams/avr3.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=128K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf
diff --git a/ld/emulparams/avr31.sh b/ld/emulparams/avr31.sh
index e5481816681..6e1ee0a8fb9 100644
--- a/ld/emulparams/avr31.sh
+++ b/ld/emulparams/avr31.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=128K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf
diff --git a/ld/emulparams/avr35.sh b/ld/emulparams/avr35.sh
index 6186186442b..abc6790b079 100644
--- a/ld/emulparams/avr35.sh
+++ b/ld/emulparams/avr35.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=64K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf
diff --git a/ld/emulparams/avr4.sh b/ld/emulparams/avr4.sh
index 2f57cb0eb76..deaf3e738d5 100644
--- a/ld/emulparams/avr4.sh
+++ b/ld/emulparams/avr4.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=8K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf
diff --git a/ld/emulparams/avr5.sh b/ld/emulparams/avr5.sh
index 69090beedef..2d0fc4fab87 100644
--- a/ld/emulparams/avr5.sh
+++ b/ld/emulparams/avr5.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=128K
+DATA_ORIGIN=0x800060
 DATA_LENGTH=0xffa0
 EXTRA_EM_FILE=avrelf
diff --git a/ld/emulparams/avr51.sh b/ld/emulparams/avr51.sh
index be8e8f5febb..2069dfe3b96 100644
--- a/ld/emulparams/avr51.sh
+++ b/ld/emulparams/avr51.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=128K
-DATA_LENGTH=0xffa0
+DATA_ORIGIN=0x800100
+DATA_LENGTH=0xff00
 EXTRA_EM_FILE=avrelf
diff --git a/ld/emulparams/avr6.sh b/ld/emulparams/avr6.sh
index 5326488ec47..c1a4fab6c8a 100644
--- a/ld/emulparams/avr6.sh
+++ b/ld/emulparams/avr6.sh
@@ -7,5 +7,6 @@ EMBEDDED=yes
 TEMPLATE_NAME=elf32
 
 TEXT_LENGTH=1024K
-DATA_LENGTH=0xffa0
+DATA_ORIGIN=0x800200
+DATA_LENGTH=0xfe00
 EXTRA_EM_FILE=avrelf
diff --git a/ld/scripttempl/avr.sc b/ld/scripttempl/avr.sc
index 23b30462697..4545b720095 100644
--- a/ld/scripttempl/avr.sc
+++ b/ld/scripttempl/avr.sc
@@ -5,7 +5,7 @@ OUTPUT_ARCH(${ARCH})
 MEMORY
 {
   text   (rx)   : ORIGIN = 0, LENGTH = $TEXT_LENGTH
-  data   (rw!x) : ORIGIN = 0x800060, LENGTH = $DATA_LENGTH
+  data   (rw!x) : ORIGIN = $DATA_ORIGIN, LENGTH = $DATA_LENGTH
   eeprom (rw!x) : ORIGIN = 0x810000, LENGTH = 64K
 }
 
-- 
2.30.2