diff options
| author | Kai Tietz <kai.tietz@onevision.com> | 2011-04-09 16:05:58 +0000 |
|---|---|---|
| committer | Kai Tietz <kai.tietz@onevision.com> | 2011-04-09 16:05:58 +0000 |
| commit | 1cafbaf10ee11d9e9eb6c3bd92fd9bcbc29001bf (patch) | |
| tree | 22e759dc9124dad49a455eb6c464277b2dba305b | |
| parent | 1ee7d54cce1395409f7ec28486f91d037d10c139 (diff) | |
| download | binutils-redhat-1cafbaf10ee11d9e9eb6c3bd92fd9bcbc29001bf.tar.gz | |
2011-04-09 Kai Tietz <ktietz@redhat.com>
* peXXigen.c (_bfd_XXi_final_link_postscripte): Sort pdata in temporary
buffer and use rawsize for sorting.
* coffcode.h (coff_compute_section_file_positions): Set rawsize
before doing alignment.
| -rw-r--r-- | bfd/ChangeLog | 7 | ||||
| -rw-r--r-- | bfd/coffcode.h | 4 | ||||
| -rw-r--r-- | bfd/libbfd.h | 2 | ||||
| -rw-r--r-- | bfd/peXXigen.c | 22 |
4 files changed, 26 insertions, 9 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a7242776c6..5c29370df5 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2011-04-09 Kai Tietz <ktietz@redhat.com> + + * peXXigen.c (_bfd_XXi_final_link_postscripte): Sort pdata in temporary + buffer and use rawsize for sorting. + * coffcode.h (coff_compute_section_file_positions): Set rawsize + before doing alignment. + 2011-04-09 H.J. Lu <hongjiu.lu@intel.com> * elf32-i386.c (elf_i386_relocate_section): Return relocation diff --git a/bfd/coffcode.h b/bfd/coffcode.h index 6ee3db90e5..9db86b5be6 100644 --- a/bfd/coffcode.h +++ b/bfd/coffcode.h @@ -3297,6 +3297,8 @@ coff_compute_section_file_positions (bfd * abfd) if (!(current->flags & SEC_HAS_CONTENTS)) continue; + current->rawsize = current->size; + #ifdef COFF_IMAGE_WITH_PE /* Make sure we skip empty sections in a PE image. */ if (current->size == 0) @@ -3363,7 +3365,7 @@ coff_compute_section_file_positions (bfd * abfd) #ifdef COFF_IMAGE_WITH_PE /* Set the padded size. */ - current->size = (current->size + page_size -1) & -page_size; + current->size = (current->size + page_size - 1) & -page_size; #endif sofar += current->size; diff --git a/bfd/libbfd.h b/bfd/libbfd.h index 2e7df4f11c..e1717718db 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -2289,7 +2289,7 @@ bfd_boolean bfd_generic_merge_sections bfd_byte *bfd_generic_get_relocated_section_contents (bfd *abfd, - struct bfd_link_info *link_info, + struct bfd_link_info *alink_info, struct bfd_link_order *link_order, bfd_byte *data, bfd_boolean relocatable, diff --git a/bfd/peXXigen.c b/bfd/peXXigen.c index 322c5ea8e4..e5065464c0 100644 --- a/bfd/peXXigen.c +++ b/bfd/peXXigen.c @@ -2458,15 +2458,23 @@ _bfd_XXi_final_link_postscript (bfd * abfd, struct coff_final_link_info *pfinfo) if (sec) { - bfd_size_type x = sec->rawsize ? sec->rawsize : sec->size; + bfd_size_type x = sec->rawsize; + bfd_byte *tmp_data = NULL; - if (x && bfd_get_section_contents (abfd, sec, pfinfo->contents, 0, x)) + if (x) + tmp_data = bfd_malloc (x); + + if (tmp_data != NULL) { - qsort (pfinfo->contents, - (size_t) ((sec->size <x ? sec->size : x) / 12), - 12, sort_x64_pdata); - bfd_set_section_contents (pfinfo->output_bfd, sec, - pfinfo->contents, 0, x); + if (bfd_get_section_contents (abfd, sec, tmp_data, 0, x)) + { + qsort (tmp_data, + (size_t) (x / 12), + 12, sort_x64_pdata); + bfd_set_section_contents (pfinfo->output_bfd, sec, + tmp_data, 0, x); + } + free (tmp_data); } } } |