From 3bc4b8d12ee0a1fe8751352f89cb970724504683 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Tue, 13 Nov 2012 17:56:06 +0100 Subject: [PATCH] - updated to 2.23.51.0.5 - updated pt_pax_flags patch - updated build_id patch (is it still needed?) --- binutils-build-id.patch | 17 ++++++++--------- binutils-pt_pax_flags.patch | 32 ++++++++++++++++---------------- binutils.spec | 15 ++++++++------- 3 files changed, 32 insertions(+), 32 deletions(-) diff --git a/binutils-build-id.patch b/binutils-build-id.patch index f325321..f76d058 100644 --- a/binutils-build-id.patch +++ b/binutils-build-id.patch @@ -1,6 +1,6 @@ ---- bfd/compress.c.jj 2010-12-24 11:40:19.000000000 +0100 -+++ bfd/compress.c 2011-01-28 15:40:19.869777126 +0100 -@@ -174,7 +174,7 @@ bfd_get_full_section_contents (bfd *abfd +--- binutils-2.23.51.0.5/bfd/compress.c.orig 2012-11-12 17:45:23.000000000 +0100 ++++ binutils-2.23.51.0.5/bfd/compress.c 2012-11-13 17:20:33.925842054 +0100 +@@ -178,7 +178,7 @@ bfd_get_full_section_contents (bfd *abfd case COMPRESS_SECTION_NONE: if (p == NULL) { @@ -9,13 +9,12 @@ if (p == NULL) return FALSE; } -@@ -214,7 +214,7 @@ bfd_get_full_section_contents (bfd *abfd - if (!ret) +@@ -218,7 +218,7 @@ bfd_get_full_section_contents (bfd *abfd goto fail_compressed; -- uncompressed_buffer = (bfd_byte *) bfd_malloc (uncompressed_size); -+ uncompressed_buffer = (bfd_byte *) bfd_zmalloc (uncompressed_size); - if (uncompressed_buffer == NULL) + if (p == NULL) +- p = (bfd_byte *) bfd_malloc (sz); ++ p = (bfd_byte *) bfd_zmalloc (sz); + if (p == NULL) goto fail_compressed; - diff --git a/binutils-pt_pax_flags.patch b/binutils-pt_pax_flags.patch index 7d520f4..3fba357 100644 --- a/binutils-pt_pax_flags.patch +++ b/binutils-pt_pax_flags.patch @@ -81,12 +81,12 @@ && (segment->p_type != PT_TLS \ || (section->flags & SEC_THREAD_LOCAL)) \ && (segment->p_type == PT_LOAD \ ---- binutils-2.17.50.0.13/bfd/elflink.c.orig 2007-03-16 20:44:46.377789106 +0100 -+++ binutils-2.17.50.0.13/bfd/elflink.c 2007-03-16 20:45:24.781816352 +0100 -@@ -5296,16 +5296,30 @@ - return TRUE; +--- binutils-2.23.51.0.5/bfd/elflink.c.orig 2012-11-12 17:45:23.000000000 +0100 ++++ binutils-2.23.51.0.5/bfd/elflink.c 2012-11-13 16:17:51.815999934 +0100 +@@ -5780,18 +5780,32 @@ + && ! (*bed->elf_backend_always_size_sections) (output_bfd, info)) + return FALSE; - bed = get_elf_backend_data (output_bfd); + elf_tdata (output_bfd)->pax_flags = PF_NORANDEXEC; + + if (info->execheap) @@ -94,18 +94,18 @@ + else if (info->noexecheap) + elf_tdata (output_bfd)->pax_flags |= PF_MPROTECT; + + /* Determine any GNU_STACK segment requirements, after the backend + has had a chance to set a default segment size. */ if (info->execstack) -- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X; -+ { -+ elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X; -+ elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP; -+ } ++ { + elf_tdata (output_bfd)->stack_flags = PF_R | PF_W | PF_X; ++ elf_tdata (output_bfd)->pax_flags |= PF_EMUTRAMP; ++ } else if (info->noexecstack) -- elf_tdata (output_bfd)->stack_flags = PF_R | PF_W; -+ { -+ elf_tdata (output_bfd)->stack_flags = PF_R | PF_W; -+ elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP; -+ } ++ { + elf_tdata (output_bfd)->stack_flags = PF_R | PF_W; ++ elf_tdata (output_bfd)->pax_flags |= PF_NOEMUTRAMP; ++ } else { bfd *inputobj; @@ -116,7 +116,7 @@ for (inputobj = info->input_bfds; inputobj; inputobj = inputobj->link_next) -@@ -5318,7 +5332,11 @@ +@@ -5805,7 +5819,11 @@ if (s) { if (s->flags & SEC_CODE) diff --git a/binutils.spec b/binutils.spec index 3c8e3ba..d96c196 100644 --- a/binutils.spec +++ b/binutils.spec @@ -22,15 +22,13 @@ Summary(ru.UTF-8): Набор инструментов GNU для построе Summary(tr.UTF-8): GNU geliştirme araçları Summary(uk.UTF-8): Набір інструментів GNU для побудови виконуваних програм Name: binutils -Version: 2.23.51.0.3 -Release: 2 +Version: 2.23.51.0.5 +Release: 1 Epoch: 3 License: GPL v3+ Group: Development/Tools -# http://git.kernel.org/?p=linux/kernel/git/hjl/binutils.git;a=summary -# git archive --prefix=binutils-2.22.51.0.1/ -o binutils-2.22.51.0.1.tar remotes/origin/linux/release/2.22.51.0.1 -Source0: http://www.kernel.org/pub/linux/devel/binutils/%{name}-%{version}.tar.bz2 -# Source0-md5: 0f81033f89158111aeaf60e528a8dfd6 +Source0: http://www.kernel.org/pub/linux/devel/binutils/%{name}-%{version}.tar.xz +# Source0-md5: 25ab1cdd20e9080c873428320a294fa4 Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2 # Source1-md5: a717d9707ec77d82acb6ec9078c472d6 Patch0: %{name}-gasp.patch @@ -55,7 +53,9 @@ BuildRequires: perl-tools-pod %ifarch sparc sparc32 BuildRequires: sparc32 %endif +BuildRequires: tar >= 1:1.22 BuildRequires: texinfo >= 4.2 +BuildRequires: xz BuildRequires: zlib-devel %{?with_tests:BuildRequires: zlib-static} Conflicts: gcc-c++ < 5:3.3 @@ -165,7 +165,7 @@ niektórych pakietów. %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch8 -p0 +%patch8 -p1 %patch9 -p1 %patch10 -p1 @@ -309,6 +309,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/ld.bfd %if %{with gold} %attr(755,root,root) %{_bindir}/ld.gold +%attr(755,root,root) %{_bindir}/dwp %endif %attr(755,root,root) %{_bindir}/nm %attr(755,root,root) %{_bindir}/objcopy -- 2.44.0