reverted: --- binutils-2.25/bfd/ChangeLog.rej +++ binutils-2.25.orig/bfd/ChangeLog.rej @@ -1,27 +0,0 @@ ---- bfd/ChangeLog -+++ bfd/ChangeLog -@@ -1,24 +1,3 @@ --2015-03-06 H.J. Lu -- -- Backport from master -- 2015-03-05 H.J. Lu -- -- PR ld/pr15228 -- PR ld/pr17709 -- * elf-bfd.h (elf_backend_data): Add extern_protected_data. -- * elf32-i386.c (elf_backend_extern_protected_data): New. -- Defined to 1. -- * elf64-x86-64.c (elf_backend_extern_protected_data): Likewise. -- * elflink.c (_bfd_elf_adjust_dynamic_copy): Don't error on -- copy relocs against protected symbols if extern_protected_data -- is true. -- (_bfd_elf_symbol_refs_local_p): Don't return true on protected -- non-function symbols if extern_protected_data is true. -- * elfxx-target.h (elf_backend_extern_protected_data): New. -- Default to 0. -- (elfNN_bed): Initialize extern_protected_data with -- elf_backend_extern_protected_data. -- - 2015-02-11 Alan Modra - - Apply from master. diff -u binutils-2.25/debian/changelog binutils-2.25/debian/changelog --- binutils-2.25/debian/changelog +++ binutils-2.25/debian/changelog @@ -1,3 +1,10 @@ +binutils (2.25-5ubuntu7) vivid; urgency=medium + + * Fix PR ld/18222, downgrade linker error on protected symbols in + .dynbss to a warning. Fixes libunwind build error. + + -- Matthias Klose Fri, 10 Apr 2015 17:42:44 +0200 + binutils (2.25-5ubuntu6) vivid; urgency=medium * Fix PR ld/18167, taken from the trunk. diff -u binutils-2.25/debian/patches/series binutils-2.25/debian/patches/series --- binutils-2.25/debian/patches/series +++ binutils-2.25/debian/patches/series @@ -35,0 +36 @@ +pr18222.diff reverted: --- binutils-2.25/ld/testsuite/ChangeLog.rej +++ binutils-2.25.orig/ld/testsuite/ChangeLog.rej @@ -1,28 +0,0 @@ ---- ld/testsuite/ChangeLog -+++ ld/testsuite/ChangeLog -@@ -1,25 +1,3 @@ --2015-03-06 H.J. Lu -- -- Backport from master -- 2015-03-05 H.J. Lu -- -- PR ld/pr15228 -- PR ld/pr17709 -- * ld-i386/i386.exp (i386tests): Add a test for PR ld/17709. -- * ld-i386/pr17709-nacl.rd: New file. -- * ld-i386/pr17709.rd: Likewise. -- * ld-i386/pr17709a.s: Likewise. -- * ld-i386/pr17709b.s: Likewise. -- * ld-i386/protected3.d: Updated. -- * ld-i386/protected3.s: Likewise. -- * ld-x86-64/pr17709-nacl.rd: New file. -- * ld-x86-64/pr17709.rd: Likewise. -- * ld-x86-64/pr17709a.s: Likewise. -- * ld-x86-64/pr17709b.s: Likewise. -- * ld-x86-64/protected3.d: Updated. -- * ld-x86-64/protected3.s: Likewise. -- * ld-x86-64/x86-64.exp (x86_64tests): Add a test for PR ld/17709. -- - 2015-02-11 Alan Modra - - Apply from master. only in patch2: unchanged: --- binutils-2.25.orig/debian/patches/pr18222.diff +++ binutils-2.25/debian/patches/pr18222.diff @@ -0,0 +1,29 @@ +# DP: Fix PR ld/18222, downgrade linker error on protected symbols in .dynbss to a warning. + +bfd/ + +2015-04-10 Alan Modra + + PR ld/18222 + * elflink.c (_bfd_elf_adjust_dynamic_copy): Don't report an error + on adding a protected visibility variable to .dynbss. + +--- a/bfd/elflink.c ++++ b/bfd/elflink.c +@@ -2675,13 +2675,9 @@ _bfd_elf_adjust_dynamic_copy (struct bfd_link_info *info, + dynbss->size += h->size; + + if (h->protected_def) +- { +- info->callbacks->einfo +- (_("%P: copy reloc against protected `%T' is invalid\n"), +- h->root.root.string); +- bfd_set_error (bfd_error_bad_value); +- return FALSE; +- } ++ info->callbacks->einfo ++ (_("%P: copy reloc against protected `%T' is dangerous\n"), ++ h->root.root.string); + + return TRUE; + }