diff options
| author | Jiong Wang <jiong.wang@arm.com> | 2014-11-24 13:46:43 +0000 |
|---|---|---|
| committer | Jiong Wang <jiong.wang@arm.com> | 2014-11-24 13:46:43 +0000 |
| commit | 4ff5ed1fd57ee30a8049c0ff6095d83ce2de0ddb (patch) | |
| tree | df9cae615dc71f43ee5a2d4124d89280db5cab9b | |
| parent | 136a940ac535e464d2a7a86880ce1f1a5554c484 (diff) | |
| download | binutils-gdb-4ff5ed1fd57ee30a8049c0ff6095d83ce2de0ddb.tar.gz | |
[AArch64] Cortex-A53 Erratum 835769 -- sort maps
2014-11-24 Tejas Belagod <tejas.belagod@arm.com>
bfd/
* elfnn-aarch64.c (elf_aarch64_compare_mapping): New.
(erratum_835769_scan): Sort map list.
| -rw-r--r-- | bfd/ChangeLog | 5 | ||||
| -rw-r--r-- | bfd/elfnn-aarch64.c | 27 |
2 files changed, 32 insertions, 0 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index fa584237569..1be9e53c032 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2014-11-24 Tejas Belagod <tejas.belagod@arm.com> + + * elfnn-aarch64.c (elf_aarch64_compare_mapping): New. + (erratum_835769_scan): Sort map list. + 2014-10-24 Tejas Belagod <tejas.belagod@arm.com> * bfd-in.h (bfd_elf64_aarch64_set_options): Add a parameter. diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 9fc734f0ad9..d47b47eb520 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -2936,6 +2936,29 @@ aarch64_erratum_sequence (uint32_t insn_1, uint32_t insn_2) return FALSE; } +/* Used to order a list of mapping symbols by address. */ + +static int +elf_aarch64_compare_mapping (const void *a, const void *b) +{ + const elf_aarch64_section_map *amap = (const elf_aarch64_section_map *) a; + const elf_aarch64_section_map *bmap = (const elf_aarch64_section_map *) b; + + if (amap->vma > bmap->vma) + return 1; + else if (amap->vma < bmap->vma) + return -1; + else if (amap->type > bmap->type) + /* Ensure results do not depend on the host qsort for objects with + multiple mapping symbols at the same address by sorting on type + after vma. */ + return 1; + else if (amap->type < bmap->type) + return -1; + else + return 0; +} + static bfd_boolean erratum_835769_scan (bfd *input_bfd, struct bfd_link_info *info, @@ -2973,6 +2996,10 @@ erratum_835769_scan (bfd *input_bfd, return TRUE; sec_data = elf_aarch64_section_data (section); + + qsort (sec_data->map, sec_data->mapcount, + sizeof (elf_aarch64_section_map), elf_aarch64_compare_mapping); + for (span = 0; span < sec_data->mapcount; span++) { unsigned int span_start = sec_data->map[span].vma; |