Don't check shared/export_dynamic/ref_dynamic for type mismatch

There is nothing linker can do when a type mismatched default definition
are made dynamic by info->shared, info->export_dynamic or h->ref_dynamic.
But we do want to avoid exporting it when building PIE.  Let's remove
those checks.

bfd/

	PR ld/2404
	* elflink.c (_bfd_elf_merge_symbol): Don't check info->shared,
	info->export_dynamic, nor !h->ref_dynamic for type mismatch when
	adding the default version.

ld/testsuite/

	PR ld/2404
	* ld-elf/shared.exp: Add a PIE test for PR ld/2404.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6e1e334189b0545145ebdbcfecf5a8299677e857..5923bc397427271446182e713c04e99d21fb4753 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/2404
+       * elflink.c (_bfd_elf_merge_symbol): Don't check info->shared,
+       info->export_dynamic nor h->ref_dynamic for type mismatch when
+       adding the default version.
+
 2014-01-16  Alan Modra  <amodra@gmail.com>
 
        * elfxx-mips.c (mips_elf_record_got_page_entry): Pass in a

diff --git a/bfd/elflink.c b/bfd/elflink.c
index 7dcafd67f1e1c2e2c90c16cda96be6ca96642795..8ba0888c19a2f3232b5c5df2f6ec826eba4077ae 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -1090,9 +1090,6 @@ _bfd_elf_merge_symbol (bfd *abfd,
      the type of existing regular definition mismatch.  We only do it
      if the existing regular definition won't be dynamic.  */
   if (pold_alignment == NULL
-      && !info->shared
-      && !info->export_dynamic
-      && !h->ref_dynamic
       && newdyn
       && newdef
       && !olddyn

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 84729b6cee428aeb7e641ea1cf5b479e924057ea..ac65a3a5d1d44a02619f0844a03392770fa6612c 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/2404
+       * ld-elf/shared.exp: Add a PIE test for PR ld/2404.
+
 2014-01-20  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR ld/2404

diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp
index afc262c184c7e13494fe06c4dfd0fc3b21a44b76..bbfd464574e3eb77f2c3a798db1dbb2f6dac1632 100644 (file)
--- a/ld/testsuite/ld-elf/shared.exp
+++ b/ld/testsuite/ld-elf/shared.exp
@@ -453,3 +453,29 @@ set run_cxx_tests {
 
 run_cc_link_tests $build_cxx_tests
 run_ld_link_exec_tests [] $run_cxx_tests
+
+if { [istarget *-*-linux*]
+     || [istarget *-*-nacl*]
+     || [istarget *-*-gnu*] } {
+    run_cc_link_tests [list \
+       [list \
+           "Build libpr2404b.a with PIE" \
+           "" \
+           "-fPIE" \
+           { pr2404b.c } \
+           {} \
+           "libpr2404b.a" \
+       ] \
+    ]
+    run_ld_link_exec_tests [] [list \
+       [list \
+           "Run pr2404 with PIE" \
+           "-pie tmpdir/pr2404b.o tmpdir/libpr2404a.so" \
+           "" \
+           { dummy.c } \
+           "pr2404pie" \
+           "pr2404.out" \
+           "-fPIE" \
+       ] \
+    ]
+}