diff options
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/elf32-i386.c | 5 | ||||
| -rw-r--r-- | bfd/elf64-x86-64.c | 5 | ||||
| -rw-r--r-- | ld/testsuite/ChangeLog | 9 | ||||
| -rw-r--r-- | ld/testsuite/ld-ifunc/ifunc-14c.s | 7 | ||||
| -rw-r--r-- | ld/testsuite/ld-ifunc/ifunc-14e-i386.d | 12 | ||||
| -rw-r--r-- | ld/testsuite/ld-ifunc/ifunc-14e-x86-64.d | 12 | ||||
| -rw-r--r-- | ld/testsuite/ld-ifunc/ifunc-14f-i386.d | 12 | ||||
| -rw-r--r-- | ld/testsuite/ld-ifunc/ifunc-14f-x86-64.d | 12 |
9 files changed, 79 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 2ceee8dc1e4..48f94dad222 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2012-12-21 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/14980 + * elf32-i386.c (elf_i386_adjust_dynamic_symbol): Properly + adjust h->plt.refcount. + * elf64-x86-64.c (elf_x86_64_adjust_dynamic_symbol): Likewise. + 2012-12-19 H.J. Lu <hongjiu.lu@intel.com> * elf32-i386.c (elf_i386_relocate_section): Replace diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index fce70b95cfa..f76c7a7f404 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -2031,8 +2031,11 @@ elf_i386_adjust_dynamic_symbol (struct bfd_link_info *info, if (pc_count || count) { h->needs_plt = 1; - h->plt.refcount += 1; h->non_got_ref = 1; + if (h->plt.refcount <= 0) + h->plt.refcount = 1; + else + h->plt.refcount += 1; } } diff --git a/bfd/elf64-x86-64.c b/bfd/elf64-x86-64.c index a37f793e232..11ec917e696 100644 --- a/bfd/elf64-x86-64.c +++ b/bfd/elf64-x86-64.c @@ -2090,8 +2090,11 @@ elf_x86_64_adjust_dynamic_symbol (struct bfd_link_info *info, if (pc_count || count) { h->needs_plt = 1; - h->plt.refcount += 1; h->non_got_ref = 1; + if (h->plt.refcount <= 0) + h->plt.refcount = 1; + else + h->plt.refcount += 1; } } diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog index a97bd4214a8..16bffd89368 100644 --- a/ld/testsuite/ChangeLog +++ b/ld/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2012-12-21 H.J. Lu <hongjiu.lu@intel.com> + + PR ld/14980 + * ld-ifunc/ifunc-14c.s: New file. + * ld-ifunc/ifunc-14e-i386.d: Likewise. + * ld-ifunc/ifunc-14e-x86-64.d: Likewise. + * ld-ifunc/ifunc-14f-i386.d: Likewise. + * ld-ifunc/ifunc-14f-x86-64.d: Likewise. + 2012-12-19 Alan Modra <amodra@gmail.com> PR ld/14962 diff --git a/ld/testsuite/ld-ifunc/ifunc-14c.s b/ld/testsuite/ld-ifunc/ifunc-14c.s new file mode 100644 index 00000000000..3cde56e89ae --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-14c.s @@ -0,0 +1,7 @@ + .text + .globl xxx + .type xxx, @function +xxx: + jmp foo + .size xxx, .-xxx + .hidden foo diff --git a/ld/testsuite/ld-ifunc/ifunc-14e-i386.d b/ld/testsuite/ld-ifunc/ifunc-14e-i386.d new file mode 100644 index 00000000000..53809870cca --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-14e-i386.d @@ -0,0 +1,12 @@ +#source: ifunc-14a.s +#source: ifunc-14c.s +#source: ifunc-14b.s +#ld: -shared -m elf_i386 -z nocombreloc +#as: --32 +#readelf: -r --wide +#target: x86_64-*-* i?86-*-* + +#failif +#... +.* +R_386_NONE +.* +#... diff --git a/ld/testsuite/ld-ifunc/ifunc-14e-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-14e-x86-64.d new file mode 100644 index 00000000000..0955c92f138 --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-14e-x86-64.d @@ -0,0 +1,12 @@ +#source: ifunc-14a.s +#source: ifunc-14c.s +#source: ifunc-14b.s +#ld: -shared -m elf_x86_64 -z nocombreloc +#as: --64 +#readelf: -r --wide +#target: x86_64-*-* + +#failif +#... +.* +R_X86_64_NONE +.* +#... diff --git a/ld/testsuite/ld-ifunc/ifunc-14f-i386.d b/ld/testsuite/ld-ifunc/ifunc-14f-i386.d new file mode 100644 index 00000000000..ed3dc539d0f --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-14f-i386.d @@ -0,0 +1,12 @@ +#source: ifunc-14a.s +#source: ifunc-14b.s +#source: ifunc-14c.s +#ld: -shared -m elf_i386 -z nocombreloc +#as: --32 +#readelf: -r --wide +#target: x86_64-*-* i?86-*-* + +#failif +#... +.* +R_386_NONE +.* +#... diff --git a/ld/testsuite/ld-ifunc/ifunc-14f-x86-64.d b/ld/testsuite/ld-ifunc/ifunc-14f-x86-64.d new file mode 100644 index 00000000000..12fb2257a84 --- /dev/null +++ b/ld/testsuite/ld-ifunc/ifunc-14f-x86-64.d @@ -0,0 +1,12 @@ +#source: ifunc-14a.s +#source: ifunc-14b.s +#source: ifunc-14c.s +#ld: -shared -m elf_x86_64 -z nocombreloc +#as: --64 +#readelf: -r --wide +#target: x86_64-*-* + +#failif +#... +.* +R_X86_64_NONE +.* +#... |