/* BFD back-end for Intel Hex objects.
- Copyright (C) 1995-2018 Free Software Foundation, Inc.
+ Copyright (C) 1995-2019 Free Software Foundation, Inc.
Written by Ian Lance Taylor of Cygnus Support <ian@cygnus.com>.
This file is part of BFD, the Binary File Descriptor library.
bfd_vma where;
bfd_byte *p;
bfd_size_type count;
- const bfd_vma sign = (bfd_vma) 0xffffffff80000000ULL;
- const bfd_vma top = (bfd_vma) 0xffffffff00000000ULL;
where = l->where;
- /* Check for unacceptable addresses sign extension.
- See PR 23699 for more details. */
- if ((where & sign) == top
- || ((where & top) != 0 && (where & top) != top))
- {
- _bfd_error_handler
- /* xgettext:c-format */
- (_("%pB 64-bit address %#" PRIx64 " out of range for Intel Hex file"),
- abfd, (uint64_t) where);
- bfd_set_error (bfd_error_bad_value);
- return FALSE;
- }
-
+#ifdef BFD64
+ /* IHex only supports 32-bit addresses, and we want to check
+ that 64-bit addresses are in range. This isn't quite as
+ obvious as it may seem, since some targets have 32-bit
+ addresses that are sign extended to 64 bits. So complain
+ only if addresses overflow both unsigned and signed 32-bit
+ integers. */
+ if (where > 0xffffffff
+ && where + 0x80000000 > 0xffffffff)
+ {
+ _bfd_error_handler
+ /* xgettext:c-format */
+ (_("%pB 64-bit address %#" PRIx64
+ " out of range for Intel Hex file"),
+ abfd, (uint64_t) where);
+ bfd_set_error (bfd_error_bad_value);
+ return FALSE;
+ }
where &= 0xffffffff;
+#endif
p = l->data;
count = l->size;
#define ihex_bfd_lookup_section_flags bfd_generic_lookup_section_flags
#define ihex_bfd_merge_sections bfd_generic_merge_sections
#define ihex_bfd_is_group_section bfd_generic_is_group_section
+#define ihex_bfd_group_name bfd_generic_group_name
#define ihex_bfd_discard_group bfd_generic_discard_group
#define ihex_section_already_linked _bfd_generic_section_already_linked
#define ihex_bfd_define_common_symbol bfd_generic_define_common_symbol