From 520c7b56ac91e91120c59d7a85466ec9394277cf Mon Sep 17 00:00:00 2001 From: Jiong Wang Date: Mon, 24 Nov 2014 13:43:39 +0000 Subject: [PATCH] [AArch64] Cortex-A53 Erratum 835769 -- sort maps 2014-11-24 Tejas Belagod bfd/ * elfnn-aarch64.c (elf_aarch64_compare_mapping): New. (erratum_835769_scan): Sort map list. --- bfd/ChangeLog | 5 +++++ bfd/elfnn-aarch64.c | 27 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 4472daf51a6..aed2b2cd764 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2014-11-24 Tejas Belagod + + * elfnn-aarch64.c (elf_aarch64_compare_mapping): New. + (erratum_835769_scan): Sort map list. + 2014-11-24 Alan Modra * elf64-ppc.c (plt_stub_pad): Correct. diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c index 19ad4d29b57..0879db97be8 100644 --- a/bfd/elfnn-aarch64.c +++ b/bfd/elfnn-aarch64.c @@ -2937,6 +2937,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, @@ -2974,6 +2997,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; -- 2.30.2