From ed175a129907f2fd887d3184198707a2dd725939 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <gingold@adacore.com>
Date: Thu, 3 Nov 2011 11:53:39 +0000
Subject: [PATCH] 2011-11-03  Tristan Gingold  <gingold@adacore.com>

	* scripttempl/aix.sc: Consider header size for .text and .data
	alignment.
---
 ld/ChangeLog          | 5 +++++
 ld/scripttempl/aix.sc | 5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2042763c2..8d610d3ca 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-03  Tristan Gingold  <gingold@adacore.com>
+
+	* scripttempl/aix.sc: Consider header size for .text and .data
+	alignment.
+
 2011-11-02  Tristan Gingold  <gingold@adacore.com>
 
 	* emultempl/aix.em (read_file_list): New function.
diff --git a/ld/scripttempl/aix.sc b/ld/scripttempl/aix.sc
index d592dbe59..adc5de6ba 100644
--- a/ld/scripttempl/aix.sc
+++ b/ld/scripttempl/aix.sc
@@ -11,7 +11,7 @@ SECTIONS
 {
   .pad 0 : { *(.pad) }
 
-  . = 0x10000000;
+  . = ALIGN (0x10000000 + SIZEOF_HEADERS, 32);
   .text ${RELOCATING-0} : {
     ${RELOCATING+PROVIDE (_text = .);}
     *(.text)
@@ -24,7 +24,8 @@ SECTIONS
     *(.tb)
     ${RELOCATING+PROVIDE (_etext = .);}
   }
-  . = ALIGN (0x10000000);
+
+  . = ALIGN (ALIGN (0x10000000) + (. & 0xfff), 32);
   .data . : {
     ${RELOCATING+PROVIDE (_data = .);}
     *(.data)
-- 
2.11.4.GIT