diff options
Diffstat (limited to 'gold')
| -rw-r--r-- | gold/ChangeLog | 5 | ||||
| -rw-r--r-- | gold/powerpc.cc | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/gold/ChangeLog b/gold/ChangeLog index 14b764e..66c7fca 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,8 @@ +2014-11-21 Alan Modra <amodra@gmail.com> + + * powerpc.cc (Target_powerpc::Relocate::relocate): Correct test + for undefined weaks. + 2014-11-20 Alan Modra <amodra@gmail.com> * powerpc.cc (Stub_control::Stub_control): Init stub14_group_size_ diff --git a/gold/powerpc.cc b/gold/powerpc.cc index 0442e56..4c90e38 100644 --- a/gold/powerpc.cc +++ b/gold/powerpc.cc @@ -7672,10 +7672,10 @@ Target_powerpc<size, big_endian>::Relocate::relocate( break; } if (status != Powerpc_relocate_functions<size, big_endian>::STATUS_OK - && !has_stub_value - && !(gsym != NULL - && gsym->is_weak_undefined() - && is_branch_reloc(r_type))) + && (has_stub_value + || !(gsym != NULL + && gsym->is_weak_undefined() + && is_branch_reloc(r_type)))) { gold_error_at_location(relinfo, relnum, rela.get_r_offset(), _("relocation overflow")); |