Fix phdrs2 test

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 551aaf9..6d942d7 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-07  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       * ld-scripts/phdrs2.s: Use .p2align instead of .align.
+        Use section names .foo and .bar instead of .text and .data.
+        * ld-scripts/phdrs2.t: Refer to .foo and .bar instead of .text
+        and .data.
+
 2002-06-06  David Heine <dlheine@tensilica.com>
 
        * ld-scripts/phdrs2.exp: New file: Run second phdrs test.

diff --git a/ld/testsuite/ld-scripts/phdrs2.s b/ld/testsuite/ld-scripts/phdrs2.s
index 8092c18..1e29ddc 100644 (file)
--- a/ld/testsuite/ld-scripts/phdrs2.s
+++ b/ld/testsuite/ld-scripts/phdrs2.s
@@ -1,7 +1,7 @@
-       .text
-       .align 4
+       .section .foo, "ax"
+       .p2align 2
        .long   1
 
-       .data
-       .align 4
+       .section .bar, "aw"
+       .p2align 2
        .long   2

diff --git a/ld/testsuite/ld-scripts/phdrs2.t b/ld/testsuite/ld-scripts/phdrs2.t
index 0d32b39..bccbcec 100644 (file)
--- a/ld/testsuite/ld-scripts/phdrs2.t
+++ b/ld/testsuite/ld-scripts/phdrs2.t
@@ -1,23 +1,23 @@
 PHDRS
 {
-  text PT_LOAD ;
-  data PT_LOAD ;
+  Foo PT_LOAD ;
+  Bar PT_LOAD ;
 }
 
 SECTIONS
 {
   . = 0x800000 - 1;
-  /* The PHDRS generated should start at the aligned .text section
+  /* The PHDRS generated should start at the aligned .foo section
      address, not the unaligned .empty section address */
   .empty : { 
        EMPTY_START = ABSOLUTE(.) ;
        *(.empty) 
        EMPTY_END = ABSOLUTE(.) ;
-       } : text
-  .text : { *(.text) } :text
-  .data : { *(.data)
+       } : Foo
+  .foo : { *(.foo) } : Foo
+  .bar : { *(.bar)
        LONG(EMPTY_START) ;
-        } :data
+        } : Bar
        
   /DISCARD/ : { *(.*) }
 }