summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Dahl <post@lespocky.de>2012-02-01 12:54:50 +0100
committerMichael Olbrich <m.olbrich@pengutronix.de>2012-02-01 13:15:36 +0100
commitd479d445f08a4aa32f9c552533dcfaf0d25f8478 (patch)
tree040a82e94f8a3c18e6d013bbafdc33d466be8a2a
parent1b336ef5804b78089db8cf9336a457563acaaa52 (diff)
downloadptxdist-d479d445f08a4aa32f9c552533dcfaf0d25f8478.tar.gz
ptxdist-d479d445f08a4aa32f9c552533dcfaf0d25f8478.tar.xz
add patch fixing at91bootstrap build with gcc 4.6.x, and recreate patch series
Signed-off-by: Alexander Dahl <post@lespocky.de> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch4
-rw-r--r--patches/Bootstrap-v1.16/0002-elf32-littlearm.lds-fix-overlap-linker-error.patch31
-rw-r--r--patches/Bootstrap-v1.16/series4
3 files changed, 35 insertions, 4 deletions
diff --git a/patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch b/patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch
index b2a4b5e73..707d10537 100644
--- a/patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch
+++ b/patches/Bootstrap-v1.16/0001-crt0_gnu.S-fix-image-size.patch
@@ -1,4 +1,3 @@
-From ed5f0b461a5652c7852f1fd7846be7b4814237de Mon Sep 17 00:00:00 2001
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Thu, 17 Feb 2011 15:21:09 +0100
Subject: [PATCH] crt0_gnu.S: fix image size
@@ -46,6 +45,3 @@ index a33952f..bf02b93 100644
}
/* collect all uninitialized .bss sections */
---
-1.7.2.3
-
diff --git a/patches/Bootstrap-v1.16/0002-elf32-littlearm.lds-fix-overlap-linker-error.patch b/patches/Bootstrap-v1.16/0002-elf32-littlearm.lds-fix-overlap-linker-error.patch
new file mode 100644
index 000000000..19b736b41
--- /dev/null
+++ b/patches/Bootstrap-v1.16/0002-elf32-littlearm.lds-fix-overlap-linker-error.patch
@@ -0,0 +1,31 @@
+From: Alexander Dahl <post@lespocky.de>
+Date: Wed, 1 Feb 2012 12:49:15 +0100
+Subject: [PATCH] elf32-littlearm.lds: fix overlap linker error
+
+circumvent gcc 4.6.x linker overlap error, suggestion from AT91 forum at
+http://www.at91.com/forum/viewtopic.php/f,12/t,20624/
+
+This patch applies to Bootstrap-v1.16.
+
+Signed-off-by: Alexander Dahl <post@lespocky.de>
+---
+ elf32-littlearm.lds | 6 +++++-
+ 1 files changed, 5 insertions(+), 1 deletions(-)
+
+diff --git a/elf32-littlearm.lds b/elf32-littlearm.lds
+index bf02b93..d85680c 100644
+--- a/elf32-littlearm.lds
++++ b/elf32-littlearm.lds
+@@ -14,7 +14,11 @@ SECTIONS
+ }
+
+ /* collect all initialized .data sections */
+- .data : AT ( ADDR (.text) + SIZEOF (.text) ) {
++ . = ALIGN(4);
++ .dummy : {
++ _edummy = .;
++ }
++ .data : AT ( LOADADDR(.dummy) ) {
+ _sdata = .;
+ *(.vectors)
+ *(.data)
diff --git a/patches/Bootstrap-v1.16/series b/patches/Bootstrap-v1.16/series
index 3355399ec..95a2b3f00 100644
--- a/patches/Bootstrap-v1.16/series
+++ b/patches/Bootstrap-v1.16/series
@@ -1 +1,5 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
0001-crt0_gnu.S-fix-image-size.patch
+0002-elf32-littlearm.lds-fix-overlap-linker-error.patch
+# 6daacb9f08ce1b5f27a02b02d35aa2ee - git-ptx-patches magic