diff options
Diffstat (limited to 'bfd')
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elfnn-riscv.c | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index f2b1707..259825d 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,10 @@ 2016-12-20 Andrew Waterman <andrew@sifive.com> + * elfnn-riscv.c (_bfd_riscv_elf_merge_private_bfd_data): Use + EF_RISCV_FLOAT_ABI_SOFT instead of EF_RISCV_SOFT_FLOAT. + +2016-12-20 Andrew Waterman <andrew@sifive.com> + * elfnn-riscv.c (bfd_riscv_get_max_alignment): Return bfd_vma instead of unsigned int. diff --git a/bfd/elfnn-riscv.c b/bfd/elfnn-riscv.c index a9b0ac6..7f3ca72 100644 --- a/bfd/elfnn-riscv.c +++ b/bfd/elfnn-riscv.c @@ -2597,8 +2597,8 @@ _bfd_riscv_elf_merge_private_bfd_data (bfd *ibfd, struct bfd_link_info *info) return TRUE; } - /* Disallow linking soft-float and hard-float. */ - if ((old_flags ^ new_flags) & EF_RISCV_SOFT_FLOAT) + /* Disallow linking different float ABIs. */ + if ((old_flags ^ new_flags) & EF_RISCV_FLOAT_ABI) { (*_bfd_error_handler) (_("%B: can't link hard-float modules with soft-float modules"), ibfd); |