qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-23 18:25:18 +02:00
Code

[toolchain] binutils/2.22: backport an upstream fix for an assertion in the ARM backend.

Browse Source 
See http://sourceware.org/bugzilla/show_bug.cgi?id=13990 for more details.

Signed-off-by: Florian Fainelli <florian@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34260 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2012-11-19 17:32:37 +00:00
parent 0da32f13db
commit 6b9b03540b
1 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
toolchain/binutils/patches/2.22/500-arm_ld_assert_fix.patch Normal file
View File

@ -0,0 +1,28 @@
See http://sourceware.org/bugzilla/show_bug.cgi?id=13990 for details.
---
diff -u -r1.287 -r1.288
--- a/bfd/elf32-arm.c 2012/04/24 05:12:31 1.287
+++ b/bfd/elf32-arm.c 2012/04/24 16:09:12 1.288
@@ -12256,8 +12256,19 @@
if (may_need_local_target_p
&& elf32_arm_get_plt_info (abfd, eh, r_symndx, &root_plt, &arm_plt))
{
- BFD_ASSERT (root_plt->refcount > 0);
- root_plt->refcount -= 1;
+ /* If PLT refcount book-keeping is wrong and too low, we'll
+ see a zero value (going to -1) for the root PLT reference
+ count. */
+ if (root_plt->refcount >= 0)
+ {
+ BFD_ASSERT (root_plt->refcount != 0);
+ root_plt->refcount -= 1;
+ }
+ else
+ /* A value of -1 means the symbol has become local, forced
+ or seeing a hidden definition. Any other negative value
+ is an error. */
+ BFD_ASSERT (root_plt->refcount == -1);
if (!call_reloc_p)
arm_plt->noncall_refcount--;