From 04a8c937f4f3b17518ff25d1454a8f56dcf86306 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 3 May 2007 20:32:05 +0000
Subject: [PATCH] 2007-05-03	Joel Sherrill <joel@OARcorp.com>

	* startup/linkcmds: Add alignment between data and bss to avoid linking
	errors when compiling with gcc 4.2.x
---
 c/src/lib/libbsp/arm/armulator/ChangeLog        | 5 +++++
 c/src/lib/libbsp/arm/armulator/startup/linkcmds | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/c/src/lib/libbsp/arm/armulator/ChangeLog b/c/src/lib/libbsp/arm/armulator/ChangeLog
index e07cc79af4..30847714fe 100644
--- a/c/src/lib/libbsp/arm/armulator/ChangeLog
+++ b/c/src/lib/libbsp/arm/armulator/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-03	Joel Sherrill <joel@OARcorp.com>
+
+	* startup/linkcmds: Add alignment between data and bss to avoid linking
+	errors when compiling with gcc 4.2.x
+
 2007-04-12	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* bsp_specs: Remove qrtems_debug.
diff --git a/c/src/lib/libbsp/arm/armulator/startup/linkcmds b/c/src/lib/libbsp/arm/armulator/startup/linkcmds
index 3eaa757162..c841f4b9e9 100644
--- a/c/src/lib/libbsp/arm/armulator/startup/linkcmds
+++ b/c/src/lib/libbsp/arm/armulator/startup/linkcmds
@@ -52,7 +52,8 @@ SECTIONS
 	CONSTRUCTORS
 	 _edata = .;
     }  
-    .bss SIZEOF(.data) + ADDR(.data):
+    . = ALIGN(256) + (. & (256 - 1));
+    .bss :
     { 
 	 _bss_start = .;
 	_clear_start = .;