* ld-powerpc/vxworks-relax.s: Add branches to match expected output.

	* ld-powerpc/vxworks-relax-2.s: Likewise.
	* ld-powerpc/vxworks1-lib.rd: Reorder reloc sections.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 69c6626..4691310 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-20  Alan Modra  <amodra@gmail.com>
+
+       * ld-powerpc/vxworks-relax.s: Add branches to match expected output.
+       * ld-powerpc/vxworks-relax-2.s: Likewise.
+       * ld-powerpc/vxworks1-lib.rd: Reorder reloc sections.
+
 2010-07-19  Andreas Schwab  <schwab@redhat.com>
 
        * ld-mmix/bspec1.d: Ignore "Key to Flags" contents.

diff --git a/ld/testsuite/ld-powerpc/vxworks-relax-2.s b/ld/testsuite/ld-powerpc/vxworks-relax-2.s
index 4e58124..bfb87aa 100644 (file)
--- a/ld/testsuite/ld-powerpc/vxworks-relax-2.s
+++ b/ld/testsuite/ld-powerpc/vxworks-relax-2.s
@@ -4,11 +4,12 @@ _start:
        lis 9,elsewhere@ha
         la 0,elsewhere@l(9)
        bl      undefined
-
+       b       .
 
        .section .far,"ax",@progbits
 elsewhere:
        bl      _start
+       b       .
 
        .section .pad
        .space 0x4000000

diff --git a/ld/testsuite/ld-powerpc/vxworks-relax.s b/ld/testsuite/ld-powerpc/vxworks-relax.s
index b4ebb9a..60ec418 100644 (file)
--- a/ld/testsuite/ld-powerpc/vxworks-relax.s
+++ b/ld/testsuite/ld-powerpc/vxworks-relax.s
@@ -3,11 +3,12 @@ _start:
        bl      elsewhere
        lis 9,elsewhere@ha
         la 0,elsewhere@l(9)
-
+       b       .
 
        .section .far,"ax",@progbits
 elsewhere:
        bl      _start
+       b       .
 
        .section .pad
        .space 0x4000000

diff --git a/ld/testsuite/ld-powerpc/vxworks1-lib.rd b/ld/testsuite/ld-powerpc/vxworks1-lib.rd
index 113462f..40a5d55 100644 (file)
--- a/ld/testsuite/ld-powerpc/vxworks1-lib.rd
+++ b/ld/testsuite/ld-powerpc/vxworks1-lib.rd
@@ -1,4 +1,9 @@
 
+Relocation section '\.rela\.plt' at offset .* contains 2 entries:
+ Offset     Info    Type            Sym\.Value  Sym\. Name \+ Addend
+0009040c  .*15 R_PPC_JMP_SLOT    00000000   sexternal \+ 0
+00090410  .*15 R_PPC_JMP_SLOT    00080c48   sglobal \+ 0
+
 Relocation section '\.rela\.dyn' at offset .* contains 5 entries:
  Offset     Info    Type            Sym\.Value  Sym\. Name \+ Addend
 00090800  00000016 R_PPC_RELATIVE * 00080c44
@@ -6,8 +11,3 @@ Relocation section '\.rela\.dyn' at offset .* contains 5 entries:
 00080c12  .*04 R_PPC_ADDR16_LO   00000000   __GOTT_BASE__ \+ 0
 00080c16  .*03 R_PPC_ADDR16      00000000   __GOTT_INDEX__ \+ 0
 00090414  .*14 R_PPC_GLOB_DAT    00090c00   x \+ 0
-
-Relocation section '\.rela\.plt' at offset .* contains 2 entries:
- Offset     Info    Type            Sym\.Value  Sym\. Name \+ Addend
-0009040c  .*15 R_PPC_JMP_SLOT    00000000   sexternal \+ 0
-00090410  .*15 R_PPC_JMP_SLOT    00080c48   sglobal \+ 0