From 918c022ea7de90660f8e0bdb36ed7cb52757459d Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 10 Sep 2010 11:05:24 +0100 Subject: [PATCH] Rebase on 2.20.51.0.11 tarball. (BZ 631771) --- .gitignore | 1 + binutils-2.20.51.0.11-compress-compile.patch | 19 +++++++ binutils-2.20.51.0.2-build-id.patch | 56 +++++++++++++------- binutils.spec | 19 ++++--- sources | 2 +- 5 files changed, 68 insertions(+), 29 deletions(-) create mode 100644 binutils-2.20.51.0.11-compress-compile.patch diff --git a/.gitignore b/.gitignore index dd599d6..13d056b 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ binutils-2.20.51.0.7.tar.bz2 binutils-2.20.51.0.7 i386 binutils-2.20.51.0.10.tar.bz2 +/binutils-2.20.51.0.11.tar.bz2 diff --git a/binutils-2.20.51.0.11-compress-compile.patch b/binutils-2.20.51.0.11-compress-compile.patch new file mode 100644 index 0000000..ca455e9 --- /dev/null +++ b/binutils-2.20.51.0.11-compress-compile.patch @@ -0,0 +1,19 @@ +*** ../binutils-2.20.51.0.11.orig/bfd/compress.c 2010-09-10 10:00:37.000000000 +0100 +--- bfd/compress.c 2010-09-10 10:02:20.000000000 +0100 +*************** bfd_compress_section_contents (bfd *abfd +*** 94,100 **** + bfd_set_error (bfd_error_invalid_operation); + return FALSE; + #else +! bfd_size_type compressed_size; + bfd_byte *compressed_buffer; + + compressed_size = compressBound (uncompressed_size) + 12; +--- 94,100 ---- + bfd_set_error (bfd_error_invalid_operation); + return FALSE; + #else +! uLongf compressed_size; + bfd_byte *compressed_buffer; + + compressed_size = compressBound (uncompressed_size) + 12; diff --git a/binutils-2.20.51.0.2-build-id.patch b/binutils-2.20.51.0.2-build-id.patch index 02abef4..c136b30 100644 --- a/binutils-2.20.51.0.2-build-id.patch +++ b/binutils-2.20.51.0.2-build-id.patch @@ -28,24 +28,40 @@ diff -rcp ../binutils-2.20.51.0.7.original/bfd/elfcode.h ./bfd/elfcode.h } return TRUE; -diff -rcp ../binutils-2.20.51.0.7.original/bfd/section.c ./bfd/section.c -*** ../binutils-2.20.51.0.7.original/bfd/section.c 2010-04-08 15:29:32.000000000 +0100 ---- ./bfd/section.c 2010-04-08 15:29:39.000000000 +0100 -*************** bfd_malloc_and_get_section (bfd *abfd, s -*** 1488,1494 **** - return TRUE; - - p = (bfd_byte *) -! bfd_malloc (sec->rawsize > sec->size ? sec->rawsize : sec->size); - if (p == NULL) - return FALSE; - *buf = p; ---- 1488,1494 ---- - return TRUE; - - p = (bfd_byte *) -! bfd_zmalloc (sec->rawsize > sec->size ? sec->rawsize : sec->size); - if (p == NULL) - return FALSE; - *buf = p; diff -rcp ../binutils-2.20.51.0.7.original/bfd/section.c.orig ./bfd/section.c.orig +*** ../binutils-2.20.51.0.11.orig/bfd/compress.c 2010-09-10 08:44:47.000000000 +0100 +--- bfd/compress.c 2010-09-10 08:46:16.000000000 +0100 +*************** bfd_get_full_section_contents (bfd *abfd +*** 174,180 **** + case COMPRESS_SECTION_NONE: + if (p == NULL) + { +! p = (bfd_byte *) bfd_malloc (sz); + if (p == NULL) + return FALSE; + need_free = TRUE; +--- 174,180 ---- + case COMPRESS_SECTION_NONE: + if (p == NULL) + { +! p = (bfd_byte *) bfd_zmalloc (sz); + if (p == NULL) + return FALSE; + need_free = TRUE; +*************** fail_compressed: +*** 234,240 **** + uncompressed_buffer = p; + else + { +! uncompressed_buffer = (bfd_byte *) bfd_malloc (uncompressed_size); + if (uncompressed_buffer == NULL) + goto fail_compressed; + } +--- 234,240 ---- + uncompressed_buffer = p; + else + { +! uncompressed_buffer = (bfd_byte *) bfd_zmalloc (uncompressed_size); + if (uncompressed_buffer == NULL) + goto fail_compressed; + } diff --git a/binutils.spec b/binutils.spec index 5d075fe..8ecce18 100644 --- a/binutils.spec +++ b/binutils.spec @@ -16,8 +16,8 @@ Summary: A GNU collection of binary utilities Name: %{?cross}binutils%{?_with_debug:-debug} -Version: 2.20.51.0.10 -Release: 3%{?dist} +Version: 2.20.51.0.11 +Release: 1%{?dist} License: GPLv3+ Group: Development/Tools URL: http://sources.redhat.com/binutils @@ -31,9 +31,9 @@ Patch05: binutils-2.20.51.0.2-version.patch Patch06: binutils-2.20.51.0.2-set-long-long.patch Patch07: binutils-2.20.51.0.2-build-id.patch Patch08: binutils-2.20.51.0.10-copy-osabi.patch -Patch09: binutils-2.20.51.0.10-update-gold.patch -Patch10: binutils-2.20.51.0.10-sec-merge-emit.patch -Patch11: binutils-2.20.51.0.10-ldlex-add-caret-pling.patch +Patch09: binutils-2.20.51.0.10-sec-merge-emit.patch +Patch10: binutils-2.20.51.0.10-ldlex-add-caret-pling.patch +Patch11: binutils-2.20.51.0.11-compress-compile.patch %define gold_arches %ix86 x86_64 @@ -132,9 +132,9 @@ using libelf instead of BFD. %patch06 -p0 -b .set-long-long~ %patch07 -p0 -b .build-id~ %patch08 -p0 -b .copy-osabi~ -%patch09 -p0 -b .update-gold~ -%patch10 -p0 -b .sec-merge-emit~ -%patch11 -p0 -b .ldlex~ +%patch09 -p0 -b .sec-merge-emit~ +%patch10 -p0 -b .ldlex~ +%patch11 -p0 -b .compress~ # We cannot run autotools as there is an exact requirement of autoconf-2.59. @@ -417,6 +417,9 @@ exit 0 %endif # %{isnative} %changelog +* Fri Sep 10 2010 Nick Clifton - 2.20.51.0.11-1 +- Rebase on 2.20.51.0.11 tarball. (BZ 631771) + * Fri Aug 20 2010 Nick Clifton - 2.20.51.0.10-3 - Allow ^ and ! characters in linker script wildcard patterns. (BZ 621742) diff --git a/sources b/sources index 07f1d6c..efcd71e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7dfcff0aeb3e590f1403a761271103f binutils-2.20.51.0.10.tar.bz2 +d2306466e669700abbb3d1a64b10d5d2 binutils-2.20.51.0.11.tar.bz2