svn commit: r282471 - head/contrib/binutils/bfd
Andrew Turner
andrew at FreeBSD.org
Tue May 5 10:35:30 UTC 2015
Author: andrew
Date: Tue May 5 10:35:29 2015
New Revision: 282471
URL: https://svnweb.freebsd.org/changeset/base/282471
Log:
Copy new attribute types when linking. bfd will copy attributes as needed,
however it will fail to output them if the type is not set correctly. This
can happen when it finds an attribute it hasn't seen before, for example
when building shared objects it will use the attributes from crti.o, hwever
this file has no attributes set.
Differential Revision: https://reviews.freebsd.org/D2413
Reviewed by: imp
Modified:
head/contrib/binutils/bfd/elf32-arm.c
Modified: head/contrib/binutils/bfd/elf32-arm.c
==============================================================================
--- head/contrib/binutils/bfd/elf32-arm.c Tue May 5 10:32:59 2015 (r282470)
+++ head/contrib/binutils/bfd/elf32-arm.c Tue May 5 10:35:29 2015 (r282471)
@@ -6816,6 +6816,9 @@ elf32_arm_merge_eabi_attributes (bfd *ib
for (i = 4; i < NUM_KNOWN_OBJ_ATTRIBUTES; i++)
{
+ if (out_attr[i].type == 0)
+ out_attr[i].type = in_attr[i].type;
+
/* Merge this attribute with existing attributes. */
switch (i)
{
More information about the svn-src-head
mailing list