OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

2006-11-29 Paul Brook <paul@codesourcery.com> 

Julian Brown  <julian@codesourcery.com>

	bfd/
	* elf32-arm.c (copy_eabi_attributes): Correct starting offset.
	(elf32_arm_merge_eabi_attributes): Mark output as initialized.
	Only set Tag_CPU_name and Tag_ABI_PCS_R9_use if input attribute
	is present.
This commit is contained in:
Paul Brook 2006-11-29 15:50:06 +00:00
parent a217f3f543
commit 004ae5266b
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bfd/ChangeLog
View File

@ -1,3 +1,11 @@
2006-11-29 Paul Brook <paul@codesourcery.com>
Julian Brown <julian@codesourcery.com>
* elf32-arm.c (copy_eabi_attributes): Correct starting offset.
(elf32_arm_merge_eabi_attributes): Mark output as initialized.
Only set Tag_CPU_name and Tag_ABI_PCS_R9_use if input attribute
is present.
2006-11-27 Bob Wilson <bob.wilson@acm.org>
* elf32-xtensa.c (elf_xtensa_special_sections): Add .xtensa.info.

25
bfd/elf32-arm.c
View File

@ -6040,8 +6040,8 @@ copy_eabi_attributes (bfd *ibfd, bfd *obfd)
aeabi_attribute_list *list;
int i;
in_attr = elf32_arm_tdata (ibfd)->known_eabi_attributes;
out_attr = elf32_arm_tdata (obfd)->known_eabi_attributes;
in_attr = &elf32_arm_tdata (ibfd)->known_eabi_attributes[4];
out_attr = &elf32_arm_tdata (obfd)->known_eabi_attributes[4];
for (i = 4; i < NUM_KNOWN_ATTRIBUTES; i++)
{
out_attr->i = in_attr->i;
@ -6172,17 +6172,18 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
static const int order_312[3] = {3, 1, 2};
int i;
if (!elf32_arm_tdata (ibfd)->known_eabi_attributes[0].i)
if (!elf32_arm_tdata (obfd)->known_eabi_attributes[0].i)
{
/* This is the first object. Copy the attributes. */
copy_eabi_attributes (ibfd, obfd);
/* Use the Tag_null value to indicate the attributes have been
initialized. */
elf32_arm_tdata (obfd)->known_eabi_attributes[0].i = 1;
return TRUE;
}
/* Use the Tag_null value to indicate the attributes have been
initialized. */
elf32_arm_tdata (ibfd)->known_eabi_attributes[0].i = 1;
in_attr = elf32_arm_tdata (ibfd)->known_eabi_attributes;
out_attr = elf32_arm_tdata (obfd)->known_eabi_attributes;
/* This needs to happen before Tag_ABI_FP_number_model is merged. */
@ -6207,8 +6208,11 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
{
case Tag_CPU_raw_name:
case Tag_CPU_name:
/* Use whichever has the greatest architecture requirements. */
if (in_attr[Tag_CPU_arch].i > out_attr[Tag_CPU_arch].i)
/* Use whichever has the greatest architecture requirements. We
won't necessarily have both the above tags, so make sure input
name is non-NULL. */
if (in_attr[Tag_CPU_arch].i > out_attr[Tag_CPU_arch].i
&& in_attr[i].s)
out_attr[i].s = attr_strdup(obfd, in_attr[i].s);
break;
@ -6260,7 +6264,8 @@ elf32_arm_merge_eabi_attributes (bfd *ibfd, bfd *obfd)
}
break;
case Tag_ABI_PCS_R9_use:
if (out_attr[i].i != AEABI_R9_unused
if (in_attr[i].i != out_attr[i].i
&& out_attr[i].i != AEABI_R9_unused
&& in_attr[i].i != AEABI_R9_unused)
{
_bfd_error_handler