* ld-scripts/align2a.d: Don't assume anything about section

	padding or alignment, or max page size.  Allow 64-bit addresses.
	* ld-scripts/align2b.d: Likewise.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index a827a3768287d84e6696ac149ecdd2b087e87fe6..c85a57e9532a96b606ab301a1e5045ac494fd6af 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-18  Alan Modra  <amodra@bigpond.net.au>
+
+       * ld-scripts/align2a.d: Don't assume anything about section
+       padding or alignment, or max page size.  Allow 64-bit addresses.
+       * ld-scripts/align2b.d: Likewise.
+
 2005-02-17  Zack Weinberg  <zack@codesourcery.com>
 
        * ld-scripts/align.exp: Rename existing "ALIGN" test to "align1".

diff --git a/ld/testsuite/ld-scripts/align2a.d b/ld/testsuite/ld-scripts/align2a.d
index 2c5df455cbf6cc6042a1a80ae4c208d03f6a7028..873cfe1058501839340545fc39461d52501ea79a 100644 (file)
--- a/ld/testsuite/ld-scripts/align2a.d
+++ b/ld/testsuite/ld-scripts/align2a.d
@@ -5,9 +5,8 @@
 
 Sections:
 Idx +Name +Size +VMA +LMA +File +off +Algn
- +0 +\.text +00000004 +00000000 +00000000 +00001000 +2\*\*2
+ +0 +\.text +[^ ]* +0+ +0+ .*
  +CONTENTS, +ALLOC, +LOAD, +READONLY, +CODE
- +1 +\.data +00000004 +00000010 +00000010 +00001010 +2\*\*2
+ +1 +\.data +[^ ]* +0+10 +0+10 .*
  +CONTENTS, +ALLOC, +LOAD, +DATA
- +2 +\.bss +00000000 +00000014 +00000014 +00001014 +2\*\*2
- +ALLOC
+#pass

diff --git a/ld/testsuite/ld-scripts/align2b.d b/ld/testsuite/ld-scripts/align2b.d
index c74d3ab5dcf23d7283dba69f682610491d11b3be..457f04b1c42f062d76221ef63f6c59f6fd81ed4b 100644 (file)
--- a/ld/testsuite/ld-scripts/align2b.d
+++ b/ld/testsuite/ld-scripts/align2b.d
@@ -5,9 +5,8 @@
 
 Sections:
 Idx +Name +Size +VMA +LMA +File off +Algn
- +0 +\.text +00000004 +00000000 +00000000 +00001000 +2\*\*2
+ +0 +\.text +[^ ]* +0+ +0+ .*
  +CONTENTS, +ALLOC, +LOAD, +READONLY, +CODE
- +1 +\.data +00000004 +00000020 +00000020 +00001020 +2\*\*2
+ +1 +\.data +[^ ]* +0+20 +0+20 .*
  +CONTENTS, +ALLOC, +LOAD, +DATA
- +2 +\.bss +00000000 +00000024 +00000024 +00001024 +2\*\*2
- +ALLOC
+#pass