ld-arm/long-plt-format.d, ld-arm/arm-elf.exp: Adjust for arm-eabi.

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 84ca6b1..0c9f3ce 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2014-03-01  Yuri Gribov  <y.gribov@samsung.com>
+
+       * ld-arm/long-plt-format.d, ld-arm/arm-elf.exp: Adjust for arm-eabi.
+
 2014-02-27  Yuri Gribov  <y.gribov@samsung.com>
 
        * ld-arm/long-plt-format.s: New test case.

diff --git a/ld/testsuite/ld-arm/arm-elf.exp b/ld/testsuite/ld-arm/arm-elf.exp
index ec569ca..b6bde2b 100644 (file)
--- a/ld/testsuite/ld-arm/arm-elf.exp
+++ b/ld/testsuite/ld-arm/arm-elf.exp
@@ -188,7 +188,7 @@ set armelftests_common {
      "" {exec-got-1b.s}
      {{readelf --relocs exec-got-1.d}}
      "exec-got-1"}
-    {"Long PLT entries in executables" "--long-plt -shared --section-start=.plt=0x200 --section-start=.got=0xf0000300" ""
+    {"Long PLT entries in executables" "--long-plt -shared --section-start=.plt=0x1000 --section-start=.got=0xf0001100" ""
      "" {long-plt-format.s}
      {{objdump "-d -j .plt" long-plt-format.d}}
      "long-plt-format"}

diff --git a/ld/testsuite/ld-arm/long-plt-format.d b/ld/testsuite/ld-arm/long-plt-format.d
index c08cb71..c64b42f 100644 (file)
--- a/ld/testsuite/ld-arm/long-plt-format.d
+++ b/ld/testsuite/ld-arm/long-plt-format.d
@@ -3,13 +3,13 @@
 
 Disassembly of section .plt:
 
-00000200 <.plt>:
- 200:  .*
- 204:  .*
- 208:  .*
- 20c:  .*
- 210:  .*      .word   .*
- 214:  .*      add     ip, pc, #-268435456     ; 0xf0000000
- 218:  .*      add     ip, ip, #0, 12
- 21c:  .*      add     ip, ip, #0, 20
- 220:  .*      ldr     pc, [ip, #[0-9]*]!      ; 0x.*
+.* <.plt>:
+ .*:   .*
+ .*:   .*
+ .*:   .*
+ .*:   .*
+ .*:   .*      .word   .*
+ .*:   .*      add     ip, pc, #-268435456     ; 0xf0000000
+ .*:   .*      add     ip, ip, #0, 12
+ .*:   .*      add     ip, ip, #0, 20
+ .*:   .*      ldr     pc, [ip, #[0-9]*]!      ; 0x.*