From b93900b62114145a1740694e11c22fe110952e64 Mon Sep 17 00:00:00 2001 From: Mark Shinwell Date: Mon, 18 Dec 2006 16:21:45 +0000 Subject: 2006-12-18 Mark Shinwell ld/testsuite/ * ld-arm/armthumb-lib.d: Correct address of lib_func2. * armthumb-lib.sym: Correct order of symbols. * mixed-lib.sym: Likewise. --- ChangeLog.csl | 7 +++++++ ld/testsuite/ld-arm/armthumb-lib.d | 2 +- ld/testsuite/ld-arm/armthumb-lib.sym | 18 +++++++++--------- ld/testsuite/ld-arm/mixed-lib.sym | 18 +++++++++--------- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/ChangeLog.csl b/ChangeLog.csl index 8d3656f..3794bd3 100644 --- a/ChangeLog.csl +++ b/ChangeLog.csl @@ -1,3 +1,10 @@ +2006-12-18 Mark Shinwell + + 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 Backport from mainline. diff --git a/ld/testsuite/ld-arm/armthumb-lib.d b/ld/testsuite/ld-arm/armthumb-lib.d index 66e0590..857326a 100644 --- 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\) .* : - .*: e59fc004 ldr ip, \[pc, #4\] ; 33c + .*: e59fc004 ldr ip, \[pc, #4\] ; 30c .*: 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 d05794c..db37d4a 100644 --- 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 4ccccdb..9f23662 100644 --- 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 -- cgit v1.1