2011-11-03 Tristan Gingold <gingold@adacore.com>

	* scripttempl/aix.sc: Consider header size for .text and .data
	alignment.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 2042763c22971b1c7bb56ca04d80e7e367f614b0..8d610d3ca017c9ca5d5b76f8db87b23f2031d8f2 100644 (file)
--- 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 d592dbe59f1b787df93b06b41cdb8cfb6af79f18..adc5de6bae682807f1a356fd92d52628f9ec54e4 100644 (file)
--- 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)