rpms
/
binutils
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use 64bit indicies in archives for s390 binaries. (#835957)

This commit is contained in:
Nick Clifton 2012-07-17 14:48:39 +01:00
parent 45e2b47aa7
commit debfc6d605
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
binutils-2.22.52.0.4-s390-64bit-archive.patch Normal file
View File

@ -0,0 +1,24 @@
*** ../binutils-2.22.52.0.4.orig/bfd/elf64-s390.c 2012-07-17 14:23:44.271929502 +0100
--- bfd/elf64-s390.c 2012-07-17 14:29:27.037918661 +0100
*************** const struct elf_size_info s390_elf64_si
*** 3391,3394 ****
--- 3391,3409 ----
#define bfd_elf64_mkobject elf_s390_mkobject
#define elf_backend_object_p elf_s390_object_p
+ /* Enable ELF64 archive functions. */
+ #define bfd_elf64_archive_functions
+ extern bfd_boolean bfd_elf64_archive_slurp_armap (bfd *);
+ extern bfd_boolean bfd_elf64_archive_write_armap (bfd *, unsigned int, struct orl *, unsigned int, int);
+
+ #define bfd_elf64_archive_slurp_extended_name_table _bfd_archive_coff_slurp_extended_name_table
+ #define bfd_elf64_archive_construct_extended_name_table _bfd_archive_coff_construct_extended_name_table
+ #define bfd_elf64_archive_truncate_arname _bfd_archive_coff_truncate_arname
+ #define bfd_elf64_archive_read_ar_hdr _bfd_archive_coff_read_ar_hdr
+ #define bfd_elf64_archive_write_ar_hdr _bfd_archive_coff_write_ar_hdr
+ #define bfd_elf64_archive_openr_next_archived_file _bfd_archive_coff_openr_next_archived_file
+ #define bfd_elf64_archive_get_elt_at_index _bfd_archive_coff_get_elt_at_index
+ #define bfd_elf64_archive_generic_stat_arch_elt _bfd_archive_coff_generic_stat_arch_elt
+ #define bfd_elf64_archive_update_armap_timestamp _bfd_archive_coff_update_armap_timestamp
+
#include "elf64-target.h"

8
binutils.spec
View File

@ -17,7 +17,7 @@
Summary: A GNU collection of binary utilities
Name: %{?cross}binutils%{?_with_debug:-debug}
Version: 2.22.52.0.4
Release: 5%{?dist}
Release: 6%{?dist}
License: GPLv3+
Group: Development/Tools
URL: http://sources.redhat.com/binutils
@ -44,6 +44,8 @@ Patch10: binutils-2.22.52.0.4-dwz.patch
Patch11: binutils-2.22.52.0.4-ar-4Gb.patch
# Import of patch for FSF PR #14189
Patch12: binutils-2.22.52.0.4-arm-plt-refcount.patch
# Potential patch to fix BZ835957
Patch13: binutils-2.22.52.0.4-s390-64bit-archive.patch
%define gold_arches %ix86 x86_64
@ -148,6 +150,7 @@ using libelf instead of BFD.
%patch10 -p0 -b .dwz~
%patch11 -p0 -b .ar4Gb~
%patch12 -p0 -b .arm-plt-refcount~
%patch13 -p0 -b .s390-64bit-archive~
# We cannot run autotools as there is an exact requirement of autoconf-2.59.
@ -442,6 +445,9 @@ exit 0
%endif # %{isnative}
%changelog
* Tue Jul 17 2012 Nick Clifton <nickc@redhat.com> - 2.22.52.0.4-6
- Use 64bit indicies in archives for s390 binaries. (#835957)
* Thu Jul 05 2012 Nick Clifton <nickc@redhat.com> - 2.22.52.0.4-5
- Catch attempts to create a broken symbol index with archives > 4Gb in size. (#835957)