From c424e0e973d0cee8125e328fa2716473961afad4 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 5 May 2003 03:33:09 +0000 Subject: bfd/ 2003-05-04 H.J. Lu * elflink.h (elf_merge_symbol): Correctly handle weak definiton. ld/testsuite/ 2003-05-04 H.J. Lu * ld-elfvers/vers18.dsym: Updated for weak definiton change. * ld-elfvers/vers18.ver: Likewise. * ld-elfvers/vers19.ver: Likewise. * ld-elfweak/elfweak.exp: Remove xfail. --- ld/testsuite/ld-elfvers/vers18.dsym | 2 +- ld/testsuite/ld-elfvers/vers18.ver | 7 +------ ld/testsuite/ld-elfvers/vers19.ver | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) (limited to 'ld/testsuite/ld-elfvers') diff --git a/ld/testsuite/ld-elfvers/vers18.dsym b/ld/testsuite/ld-elfvers/vers18.dsym index dc3ad7b..c60237a 100644 --- a/ld/testsuite/ld-elfvers/vers18.dsym +++ b/ld/testsuite/ld-elfvers/vers18.dsym @@ -1,7 +1,7 @@ -[0-9a-f]* w DF (\*UND\*) [0-9a-f]* VERS_2.0 (0x[0-9a-f][0-9a-f] )?show_foo [0]* g DO \*ABS\* [0]* VERS_1.1 VERS_1.1 [0]* g DO \*ABS\* [0]* VERS_1.2 VERS_1.2 [0]* g DO \*ABS\* [0]* VERS_2.0 VERS_2.0 [0-9a-f]* w DF (.text|\*ABS\*) [0-9a-f]* \(Base\) (0x[0-9a-f][0-9a-f] )?show_foo [0-9a-f]* w DF (.text|\*ABS\*) [0-9a-f]* \(VERS_1.1\) (0x[0-9a-f][0-9a-f] )?show_foo [0-9a-f]* w DF (.text|\*ABS\*) [0-9a-f]* \(VERS_1.2\) (0x[0-9a-f][0-9a-f] )?show_foo +[0-9a-f]* w DF (.text|\*ABS\*) [0-9a-f]* VERS_2.0 (0x[0-9a-f][0-9a-f] )?show_foo diff --git a/ld/testsuite/ld-elfvers/vers18.ver b/ld/testsuite/ld-elfvers/vers18.ver index 5df92c8..c6b14e8 100644 --- a/ld/testsuite/ld-elfvers/vers18.ver +++ b/ld/testsuite/ld-elfvers/vers18.ver @@ -3,10 +3,5 @@ Version definitions: 2 0x00 0x0a7927b1 VERS_1.1 3 0x00 0x0a7927b2 VERS_1.2 VERS_1.1 -4 0x02 0x0a7922b0 VERS_2.0 +4 0x00 0x0a7922b0 VERS_2.0 VERS_1.2 - -Version References: - required from tmpdir/vers17.so: - 0x0a7922b0 0x00 05 VERS_2.0 - diff --git a/ld/testsuite/ld-elfvers/vers19.ver b/ld/testsuite/ld-elfvers/vers19.ver index 5969797..28a52c4 100644 --- a/ld/testsuite/ld-elfvers/vers19.ver +++ b/ld/testsuite/ld-elfvers/vers19.ver @@ -1,3 +1,3 @@ Version References: - required from vers17.so: + required from tmpdir/vers18.so: 0x0a7922b0 0x00 0[23] VERS_2.0 -- cgit v1.1