diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-12-04 06:00:57 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-12-04 06:01:14 -0800 |
| commit | fde51dd189a1f8a63896bcb845ef36ea5e1917d5 (patch) | |
| tree | 04aefd91f07745df41d7d60ebeebde6ce2008fac /bfd/elfxx-x86.c | |
| parent | f4238194a211a6a27598a7fdf9ad63f9b5d6fbaa (diff) | |
| download | gdb-fde51dd189a1f8a63896bcb845ef36ea5e1917d5.zip gdb-fde51dd189a1f8a63896bcb845ef36ea5e1917d5.tar.gz gdb-fde51dd189a1f8a63896bcb845ef36ea5e1917d5.tar.bz2 | |
x86: Don't remove empty GNU_PROPERTY_X86_UINT32_OR_AND properties
For GNU_PROPERTY_X86_COMPAT_ISA_1_USED and GNU_PROPERTY_X86_UINT32_OR_AND
properties, a bit in the output pr_data field is set if it is set in any
relocatable input pr_data fields and this property is present in all
relocatable input files. A missing property implies that its bits have
unknown values. When all bits in the the output pr_data field are zero,
this property should not be removed from output to indicate it has zero
in all bits.
bfd/
PR ld/23372
* elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Don't remove
empty properties for GNU_PROPERTY_X86_COMPAT_ISA_1_USED and
GNU_PROPERTY_X86_UINT32_OR_AND.
(_bfd_x86_elf_link_fixup_gnu_properties): Likewise.
ld/
PR ld/23372
* testsuite/ld-i386/pr23372a.d: Updated.
* testsuite/ld-i386/pr23372c.d: Likewise.
* testsuite/ld-x86-64/pr23372a-x32.d: Likewise.
* testsuite/ld-x86-64/pr23372a.d: Likewise.
* testsuite/ld-x86-64/pr23372c-x32.d: Likewise.
* testsuite/ld-x86-64/pr23372c.d: Likewise.
Diffstat (limited to 'bfd/elfxx-x86.c')
| -rw-r--r-- | bfd/elfxx-x86.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index 40aac66..eaa1a82 100644 --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -2422,9 +2422,14 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, aprop->pr_kind = property_remove; updated = TRUE; } - return updated; } - goto or_property; + else + { + number = aprop->u.number; + aprop->u.number = number | bprop->u.number; + updated = number != (unsigned int) aprop->u.number; + } + return updated; } else if (pr_type == GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED || (pr_type >= GNU_PROPERTY_X86_UINT32_OR_LO @@ -2432,7 +2437,6 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, { if (aprop != NULL && bprop != NULL) { -or_property: number = aprop->u.number; aprop->u.number = number | bprop->u.number; /* Remove the property if all bits are empty. */ @@ -2957,7 +2961,12 @@ _bfd_x86_elf_link_fixup_gnu_properties (struct bfd_link_info *info, || (type >= GNU_PROPERTY_X86_UINT32_OR_AND_LO && type <= GNU_PROPERTY_X86_UINT32_OR_AND_HI)) { - if (p->property.u.number == 0) + if (p->property.u.number == 0 + && (type == GNU_PROPERTY_X86_COMPAT_ISA_1_NEEDED + || (type >= GNU_PROPERTY_X86_UINT32_AND_LO + && type <= GNU_PROPERTY_X86_UINT32_AND_HI) + || (type >= GNU_PROPERTY_X86_UINT32_OR_LO + && type <= GNU_PROPERTY_X86_UINT32_OR_HI))) { /* Remove empty property. */ *listp = p->next; |