2006-12-18 Mark Shinwell <shinwell@codesourcery.com>

        ld/testsuite/
        * ld-arm/armthumb-lib.d: Correct address of lib_func2.
        * armthumb-lib.sym: Correct order of symbols.
        * mixed-lib.sym: Likewise.

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 8d3656f389de9ca49a66ccf98e82f735c7e8d7db..3794bd3d1414a75a1b0fc3ed4370ef573f6bd628 100644 (file)
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,10 @@
+2006-12-18  Mark Shinwell  <shinwell@codesourcery.com>
+
+       ld/testsuite/
+       * ld-arm/armthumb-lib.d: Correct address of lib_func2.
+       * armthumb-lib.sym: Correct order of symbols.
+       * mixed-lib.sym: Likewise.
+
 2006-12-13  Paul Brook  <paul@codesourcery.com>
 
        Backport from mainline.

diff --git a/ld/testsuite/ld-arm/armthumb-lib.d b/ld/testsuite/ld-arm/armthumb-lib.d
index 66e0590487af10c5534a1bb91117349848a0f75c..857326ab539db3be35ded37e84594c9de8ae9bcc 100644 (file)
--- a/ld/testsuite/ld-arm/armthumb-lib.d
+++ b/ld/testsuite/ld-arm/armthumb-lib.d
@@ -38,7 +38,7 @@ Disassembly of section .text:
  .*:   46c0            nop                     \(mov r8, r8\)
 
 .* <lib_func2>:
- .*:   e59fc004        ldr     ip, \[pc, #4\]  ; 33c <lib_func2\+0xc>
+ .*:   e59fc004        ldr     ip, \[pc, #4\]  ; 30c <lib_func2\+0xc>
  .*:   e08cc00f        add     ip, ip, pc
  .*:   e12fff1c        bx      ip
  .*:   ffffffe5        .*

diff --git a/ld/testsuite/ld-arm/armthumb-lib.sym b/ld/testsuite/ld-arm/armthumb-lib.sym
index d05794c093232f31abb874012c8273933dbcde6e..db37d4a317792dc9f34d9c532d7594bef130bb03 100644 (file)
--- a/ld/testsuite/ld-arm/armthumb-lib.sym
+++ b/ld/testsuite/ld-arm/armthumb-lib.sym
@@ -2,17 +2,17 @@
 Symbol table for image:
   Num Buc:    Value  Size   Type   Bind Vis      Ndx Name
    ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS _edata
-   ..  ..: .......0    20    FUNC GLOBAL DEFAULT   6 lib_func1
-   ..  ..: .......0     2    FUNC GLOBAL DEFAULT   6 lib_func2
-   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS _bss_end__
+   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __bss_start__
+   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS _end
+   ..  ..: ........     4  OBJECT GLOBAL DEFAULT   9 data_obj
    ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __bss_end__
+   ..  ..: .......0    20    FUNC GLOBAL DEFAULT   6 lib_func1
+   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __exidx_start
+   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT   9 __data_start
    ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS _stack
-   ..  ..: ........     4  OBJECT GLOBAL DEFAULT   9 data_obj
-   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __bss_start__
+   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __end__
    ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __bss_start
-   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS _end
    ..  ..: 00000000     0  NOTYPE GLOBAL DEFAULT UND app_func2
+   ..  ..: .......0     2    FUNC GLOBAL DEFAULT   6 lib_func2
+   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS _bss_end__
    ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __exidx_end
-   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT   9 __data_start
-   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __end__
-   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __exidx_start

diff --git a/ld/testsuite/ld-arm/mixed-lib.sym b/ld/testsuite/ld-arm/mixed-lib.sym
index 4ccccdb35aff625a008d343ce3e30a4dc607b2de..9f236620f2ff1297c487e2b38d84461693d02278 100644 (file)
--- a/ld/testsuite/ld-arm/mixed-lib.sym
+++ b/ld/testsuite/ld-arm/mixed-lib.sym
@@ -2,17 +2,17 @@
 Symbol table for image:
   Num Buc:    Value  Size   Type   Bind Vis      Ndx Name
    ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS _edata
-   ..  ..: .......0    20    FUNC GLOBAL DEFAULT   6 lib_func1
-   ..  ..: .......1     2    FUNC GLOBAL DEFAULT   6 lib_func2
-   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS _bss_end__
+   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __bss_start__
+   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS _end
+   ..  ..: ........     4  OBJECT GLOBAL DEFAULT   9 data_obj
    ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __bss_end__
+   ..  ..: .......0    20    FUNC GLOBAL DEFAULT   6 lib_func1
+   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __exidx_start
+   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT   9 __data_start
    ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS _stack
-   ..  ..: ........     4  OBJECT GLOBAL DEFAULT   9 data_obj
-   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __bss_start__
+   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __end__
    ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __bss_start
-   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS _end
    ..  ..: 00000000     0  NOTYPE GLOBAL DEFAULT UND app_func2
+   ..  ..: .......1     2    FUNC GLOBAL DEFAULT   6 lib_func2
+   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS _bss_end__
    ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __exidx_end
-   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT   9 __data_start
-   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __end__
-   ..  ..: ........     0  NOTYPE GLOBAL DEFAULT ABS __exidx_start