From 93f4de3929aeb3e21d57950bfa96539599a92f2a Mon Sep 17 00:00:00 2001 From: Renlin Li Date: Tue, 24 Oct 2017 12:42:30 +0100 Subject: [PATCH] [BFD][PR21703]Override the new defined symbol with the old normal symbol when --allow-multiple-definition is provided. The behavior of _bfd_elf_merge_symbol and _bfd_generic_link_add_one_symbol is inconsistent. In multiple definition case, _bfd_elf_merge_symbol decided to override the old symbol definition with the new defintion, (size, type, target data) In _bfd_generic_link_add_one_symbol, it simply return without doing anything because of allow-multiple-definition is provided. This leaves the symbol in a wrong state. Here, following the documentation, I made this patch to force the old definition override the new definition if the old symbol is not dynamic or weak. Because, in those two cases, it's expected to do some merge. I have checked that, those two cases are properly handled. bfd/ PR ld/21703 * elflink.c (_bfd_elf_merge_symbol): Handle multiple definition case. ld/ PR ld/21703 * testsuite/ld-elf/elf.exp: Run new tests. * testsuite/ld-elf/pr21703-1.s: New. * testsuite/ld-elf/pr21703-2.s: New. * testsuite/ld-elf/pr21703-3.s: New. * testsuite/ld-elf/pr21703-4.s: New. * testsuite/ld-elf/pr21703-r.sd: New. * testsuite/ld-elf/pr21703-shared.sd: New. * testsuite/ld-elf/pr21703.sd: New. * testsuite/ld-elf/pr21703.ver: New. --- bfd/ChangeLog | 5 +++++ bfd/elflink.c | 13 +++++++++++++ ld/ChangeLog | 13 +++++++++++++ ld/testsuite/ld-elf/elf.exp | 12 ++++++++++++ ld/testsuite/ld-elf/pr21703-1.s | 6 ++++++ ld/testsuite/ld-elf/pr21703-2.s | 6 ++++++ ld/testsuite/ld-elf/pr21703-3.s | 15 +++++++++++++++ ld/testsuite/ld-elf/pr21703-4.s | 15 +++++++++++++++ ld/testsuite/ld-elf/pr21703-r.sd | 9 +++++++++ ld/testsuite/ld-elf/pr21703-shared.sd | 8 ++++++++ ld/testsuite/ld-elf/pr21703.sd | 4 ++++ ld/testsuite/ld-elf/pr21703.ver | 4 ++++ 12 files changed, 110 insertions(+) create mode 100644 ld/testsuite/ld-elf/pr21703-1.s create mode 100644 ld/testsuite/ld-elf/pr21703-2.s create mode 100644 ld/testsuite/ld-elf/pr21703-3.s create mode 100644 ld/testsuite/ld-elf/pr21703-4.s create mode 100644 ld/testsuite/ld-elf/pr21703-r.sd create mode 100644 ld/testsuite/ld-elf/pr21703-shared.sd create mode 100644 ld/testsuite/ld-elf/pr21703.sd create mode 100644 ld/testsuite/ld-elf/pr21703.ver diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 73d1f4b145..a534b216af 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2017-10-24 Renlin Li + + PR ld/21703 + * elflink.c (_bfd_elf_merge_symbol): Handle multiple definition case. + 2017-10-23 Nick Clifton PR 22319 diff --git a/bfd/elflink.c b/bfd/elflink.c index de13d04c89..20057f55f1 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -1036,6 +1036,7 @@ _bfd_elf_merge_symbol (bfd *abfd, bfd_boolean newweak, oldweak, newfunc, oldfunc; const struct elf_backend_data *bed; char *new_version; + bfd_boolean default_sym = *matched; *skip = FALSE; *override = FALSE; @@ -1557,6 +1558,18 @@ _bfd_elf_merge_symbol (bfd *abfd, sec = *psec; } + /* There are multiple definitions of a normal symbol. + Skip the default symbol as well. */ + if (olddef && !olddyn && !oldweak && newdef && !newdyn && !newweak + && !default_sym && h->def_regular) + { + /* Handle a multiple definition. */ + (*info->callbacks->multiple_definition) (info, &h->root, + abfd, sec, *pvalue); + *skip = TRUE; + return TRUE; + } + /* If both the old and the new symbols look like common symbols in a dynamic object, set the size of the symbol to the larger of the two. */ diff --git a/ld/ChangeLog b/ld/ChangeLog index ac96579e44..7319d72ef8 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,16 @@ +2017-10-24 Renlin Li + + PR ld/21703 + * testsuite/ld-elf/elf.exp: Run new tests. + * testsuite/ld-elf/pr21703-1.s: New. + * testsuite/ld-elf/pr21703-2.s: New. + * testsuite/ld-elf/pr21703-3.s: New. + * testsuite/ld-elf/pr21703-4.s: New. + * testsuite/ld-elf/pr21703-r.sd: New. + * testsuite/ld-elf/pr21703-shared.sd: New. + * testsuite/ld-elf/pr21703.sd: New. + * testsuite/ld-elf/pr21703.ver: New. + 2017-10-23 H.J. Lu * configure.tgt (i[3-7]86-*-linux-*): Move elf32_x86_64 from diff --git a/ld/testsuite/ld-elf/elf.exp b/ld/testsuite/ld-elf/elf.exp index 655f0daf23..eac29e0390 100644 --- a/ld/testsuite/ld-elf/elf.exp +++ b/ld/testsuite/ld-elf/elf.exp @@ -70,6 +70,18 @@ run_ld_link_tests [list \ {symbol3w.s} {} "symbol3w.a" ] \ ] +run_ld_link_tests [list \ + [list "PR ld/21703" \ + "--allow-multiple-definition tmpdir/pr21703-1.o tmpdir/pr21703-2.o" "" "" \ + {pr21703-1.s pr21703-2.s} {{readelf {-s} pr21703.sd}} "pr21703" ] \ + [list "PR ld/21703 -r" \ + "-r --allow-multiple-definition tmpdir/pr21703-3.o tmpdir/pr21703-4.o" "" "" \ + {pr21703-3.s pr21703-4.s} {{readelf {-s} pr21703-r.sd}} "pr21703.o" ] \ + [list "PR ld/21703 shared" \ + "-shared --allow-multiple-definition --version-script pr21703.ver tmpdir/pr21703-3.o tmpdir/pr21703-4.o" "" "" \ + {pr21703-3.s pr21703-4.s} {{readelf {--dyn-syms} pr21703-shared.sd}} "pr21703.so" ] \ +] + if { [check_shared_lib_support] } then { run_ld_link_tests { {"Build pr14170a.o" "" "" "" {pr14170a.s} {} "pr14170.a" } diff --git a/ld/testsuite/ld-elf/pr21703-1.s b/ld/testsuite/ld-elf/pr21703-1.s new file mode 100644 index 0000000000..92a4718402 --- /dev/null +++ b/ld/testsuite/ld-elf/pr21703-1.s @@ -0,0 +1,6 @@ + .text + .globl foo + .type foo, %function +foo: + .space 4 + .size foo, 4 diff --git a/ld/testsuite/ld-elf/pr21703-2.s b/ld/testsuite/ld-elf/pr21703-2.s new file mode 100644 index 0000000000..1d65304470 --- /dev/null +++ b/ld/testsuite/ld-elf/pr21703-2.s @@ -0,0 +1,6 @@ + .text + .globl foo + .type foo, %function +foo: + .space 16 + .size foo, 16 diff --git a/ld/testsuite/ld-elf/pr21703-3.s b/ld/testsuite/ld-elf/pr21703-3.s new file mode 100644 index 0000000000..6da6de8cfd --- /dev/null +++ b/ld/testsuite/ld-elf/pr21703-3.s @@ -0,0 +1,15 @@ + .text + .global foo + .type foo, %function +foo: + .space 4 + .size foo, 4 + + .global foo1 + .type foo1, %function +foo1: + .space 32 + .size foo1, 32 + + .symver foo, foo@FOO + .symver foo1, foo@@FOO1 diff --git a/ld/testsuite/ld-elf/pr21703-4.s b/ld/testsuite/ld-elf/pr21703-4.s new file mode 100644 index 0000000000..9390e9444e --- /dev/null +++ b/ld/testsuite/ld-elf/pr21703-4.s @@ -0,0 +1,15 @@ + .text + .global bar + .type bar, %function +bar: + .space 16 + .size bar, 16 + + .global bar1 + .type bar1, %function +bar1: + .space 8 + .size bar1, 8 + + .symver bar, foo@FOO + .symver bar1, foo@@FOO1 diff --git a/ld/testsuite/ld-elf/pr21703-r.sd b/ld/testsuite/ld-elf/pr21703-r.sd new file mode 100644 index 0000000000..6758088179 --- /dev/null +++ b/ld/testsuite/ld-elf/pr21703-r.sd @@ -0,0 +1,9 @@ +Symbol table '.symtab' contains .* entries: +#... +.*: [0-9a-fA-F]* +4 +FUNC +GLOBAL +DEFAULT +. foo@FOO +.*: [0-9a-fA-F]* +32 +FUNC +GLOBAL +DEFAULT +. foo1 +.*: [0-9a-fA-F]* +32 +FUNC +GLOBAL +DEFAULT +. foo@@FOO1 +.*: [0-9a-fA-F]* +8 +FUNC +GLOBAL +DEFAULT +. bar1 +.*: [0-9a-fA-F]* +4 +FUNC +GLOBAL +DEFAULT +. foo +.*: [0-9a-fA-F]* +16 +FUNC +GLOBAL +DEFAULT +. bar +#pass diff --git a/ld/testsuite/ld-elf/pr21703-shared.sd b/ld/testsuite/ld-elf/pr21703-shared.sd new file mode 100644 index 0000000000..9b6b1b928d --- /dev/null +++ b/ld/testsuite/ld-elf/pr21703-shared.sd @@ -0,0 +1,8 @@ +Symbol table '\.dynsym' contains [0-9]+ entries: + +Num: +Value +Size Type +Bind +Vis +Ndx Name +#... + +[0-9]+: +[0-9a-f]+ +4 +FUNC +GLOBAL +DEFAULT +[0-9] +foo@FOO + +[0-9]+: +[0-9a-f]+ +0 +OBJECT +GLOBAL +DEFAULT +ABS +FOO1 + +[0-9]+: +[0-9a-f]+ +32 +FUNC +GLOBAL +DEFAULT +[0-9] +foo@@FOO1 + +[0-9]+: +[0-9a-f]+ +0 +OBJECT +GLOBAL +DEFAULT +ABS +FOO +#... diff --git a/ld/testsuite/ld-elf/pr21703.sd b/ld/testsuite/ld-elf/pr21703.sd new file mode 100644 index 0000000000..955cf172e2 --- /dev/null +++ b/ld/testsuite/ld-elf/pr21703.sd @@ -0,0 +1,4 @@ +Symbol table '.symtab' contains .* entries: +#... +.*: [0-9a-fA-F]* +4 +FUNC +GLOBAL +DEFAULT +. foo +#pass diff --git a/ld/testsuite/ld-elf/pr21703.ver b/ld/testsuite/ld-elf/pr21703.ver new file mode 100644 index 0000000000..c36f292889 --- /dev/null +++ b/ld/testsuite/ld-elf/pr21703.ver @@ -0,0 +1,4 @@ +FOO +{ global: foo; local: *; }; +FOO1 +{ global: foo; local: *; };