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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e089e2aab4995ac8e6cac2dc7bf4e76856395258..4dbc32febceb6a416af2f7e7f7d0b1bef43ac81e 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,12 @@
+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

diff --git a/bfd/elflink.c b/bfd/elflink.c
index ae8d148ab993964f1a0581106b5a1365681b4b6f..8fcaaddfd44ac9bf4fdf77b4d3b51855809fbbbe 100644 (file)
--- 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 10490054457824ac9d8e7362e6e3ba85338ef03e..4f6abb91b6d5751556d61bdc09c3f7af7797be45 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,13 @@
+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

diff --git a/ld/testsuite/ld-elf/pr19698.d b/ld/testsuite/ld-elf/pr19698.d
new file mode 100644 (file)
index 0000000..a39f67a
--- /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 (file)
index 0000000..875dca4
--- /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 (file)
index 0000000..09d9125
--- /dev/null
+++ b/ld/testsuite/ld-elf/pr19698.t
@@ -0,0 +1,11 @@
+"foo@VERS.1" = foo;
+
+VERSION {
+VERS.2 {
+  global:
+    foo;
+};
+
+VERS.1 {
+};
+}