diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2016-02-24 15:13:35 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2016-02-26 05:38:33 -0800 |
| commit | 544ddf9322b1b83982e5cb84a54d084ee7e718ea (patch) | |
| tree | baaf3ae1887d82be93380b51c33aba4eec2991fe | |
| parent | f558a73bafecee6d3cd45031e44e6e40f80fb241 (diff) | |
| download | binutils-gdb-544ddf9322b1b83982e5cb84a54d084ee7e718ea.tar.gz | |
Update symbol version for symbol from linker script
We need to update symbol version for symbols from linker script.
Backport from master
bfd/
PR ld/19698
* elflink.c (bfd_elf_record_link_assignment): Set versioned if
symbol version is unknown.
ld/
PR ld/19698
* testsuite/ld-elf/pr19698.d: New file.
* testsuite/ld-elf/pr19698.s: Likewise.
* testsuite/ld-elf/pr19698.t: Likewise.
| -rw-r--r-- | bfd/ChangeLog | 9 | ||||
| -rw-r--r-- | bfd/elflink.c | 13 | ||||
| -rw-r--r-- | ld/ChangeLog | 10 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/pr19698.d | 10 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/pr19698.s | 5 | ||||
| -rw-r--r-- | ld/testsuite/ld-elf/pr19698.t | 11 |
6 files changed, 58 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e089e2aab49..4dbc32febce 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,6 +1,15 @@ 2016-02-26 H.J. Lu <hongjiu.lu@intel.com> Backport from master + 2016-02-24 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/19698 + * elflink.c (bfd_elf_record_link_assignment): Set versioned if + symbol version is unknown. + +2016-02-26 H.J. Lu <hongjiu.lu@intel.com> + + Backport from master 2016-02-01 H.J. Lu <hongjiu.lu@intel.com> PR ld/19553 diff --git a/bfd/elflink.c b/bfd/elflink.c index ae8d148ab99..8fcaaddfd44 100644 --- a/bfd/elflink.c +++ b/bfd/elflink.c @@ -555,6 +555,19 @@ bfd_elf_record_link_assignment (bfd *output_bfd, if (h == NULL) return provide; + if (h->versioned == unknown) + { + /* Set versioned if symbol version is unknown. */ + char *version = strrchr (name, ELF_VER_CHR); + if (version) + { + if (version > name && version[-1] != ELF_VER_CHR) + h->versioned = versioned_hidden; + else + h->versioned = versioned; + } + } + switch (h->root.type) { case bfd_link_hash_defined: diff --git a/ld/ChangeLog b/ld/ChangeLog index 10490054457..4f6abb91b6d 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,6 +1,16 @@ 2016-02-26 H.J. Lu <hongjiu.lu@intel.com> Backport from master + 2016-02-24 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/19698 + * testsuite/ld-elf/pr19698.d: New file. + * testsuite/ld-elf/pr19698.s: Likewise. + * testsuite/ld-elf/pr19698.t: Likewise. + +2016-02-26 H.J. Lu <hongjiu.lu@intel.com> + + Backport from master 2016-02-01 H.J. Lu <hongjiu.lu@intel.com> PR ld/19553 diff --git a/ld/testsuite/ld-elf/pr19698.d b/ld/testsuite/ld-elf/pr19698.d new file mode 100644 index 00000000000..a39f67a3ba9 --- /dev/null +++ b/ld/testsuite/ld-elf/pr19698.d @@ -0,0 +1,10 @@ +#ld: -shared $srcdir/$subdir/pr19698.t +#readelf : --dyn-syms --wide +#target: *-*-linux* *-*-gnu* *-*-solaris* + +Symbol table '\.dynsym' contains [0-9]+ entries: +#... + +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT +[0-9]+ +foo@VERS.1 +#... + +[0-9]+: +[0-9a-f]+ +[0-9a-f]+ +FUNC +GLOBAL +DEFAULT +[0-9]+ +foo@@VERS.2 +#pass diff --git a/ld/testsuite/ld-elf/pr19698.s b/ld/testsuite/ld-elf/pr19698.s new file mode 100644 index 00000000000..875dca49288 --- /dev/null +++ b/ld/testsuite/ld-elf/pr19698.s @@ -0,0 +1,5 @@ + .text + .globl foo + .type foo, %function +foo: + .byte 0 diff --git a/ld/testsuite/ld-elf/pr19698.t b/ld/testsuite/ld-elf/pr19698.t new file mode 100644 index 00000000000..09d9125019f --- /dev/null +++ b/ld/testsuite/ld-elf/pr19698.t @@ -0,0 +1,11 @@ +"foo@VERS.1" = foo; + +VERSION { +VERS.2 { + global: + foo; +}; + +VERS.1 { +}; +} |