diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2018-08-27 15:41:09 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2018-08-27 15:42:14 -0700 |
| commit | 90c745dc545408a6a3115ff97485672826649ade (patch) | |
| tree | 852cc043ddd5910306b2530acdc72bfb718fb926 /binutils/readelf.c | |
| parent | 3bf9c013e4a7b72aaa7e242e163a776ad7347c26 (diff) | |
| download | gdb-90c745dc545408a6a3115ff97485672826649ade.zip gdb-90c745dc545408a6a3115ff97485672826649ade.tar.gz gdb-90c745dc545408a6a3115ff97485672826649ade.tar.bz2 | |
x86: Don't mask out the GNU_PROPERTY_X86_UINT32_VALID bit
Since only the GNU_PROPERTY_X86_UINT32_VALID bit may be set in data-only
relocatable objects which don't contain any instructions, linker
shouldn't mask out the GNU_PROPERTY_X86_UINT32_VALID bit when merging
GNU_PROPERTY_X86_XXX bits. Otherwise, linker output doesn't contain
GNU_PROPERTY_X86_XXX property with any data-only relocatable inputs.
This patch keeps the GNU_PROPERTY_X86_UINT32_VALID bit and updates
readelf to print "<None>" if GNU_PROPERTY_X86_XXX property only has
the GNU_PROPERTY_X86_UINT32_VALID bit.
bfd/
* elfxx-x86.c (_bfd_x86_elf_parse_gnu_properties): Don't mask
out the GNU_PROPERTY_X86_UINT32_VALID bit.
binutils/
* readelf.c (decode_x86_isa): Print <None> if bitmask only
contains the GNU_PROPERTY_X86_UINT32_VALID bit.
(decode_x86_feature_1): Likewise.
(decode_x86_feature_2): Likewise.
(print_gnu_property_note): Don't mask out the
GNU_PROPERTY_X86_UINT32_VALID bit.
* testsuite/binutils-all/i386/pr21231b.d: Updated.
* testsuite/binutils-all/x86-64/pr21231b.d: Likewise.
gas/
* testsuite/gas/i386/i386.exp: Run property-1 and
x86-64-property-1.
* testsuite/gas/i386/property-1.d: New file.
* testsuite/gas/i386/property-1.s: Likewise.
* testsuite/gas/i386/x86-64-property-1.d: Likewise.
ld/
* testsuite/ld-i386/i386.exp: Run property-x86-5.
* testsuite/ld-i386/property-x86-5.d: New file.
* testsuite/ld-x86-64/property-x86-5-x32.d: Likewise.
* testsuite/ld-x86-64/property-x86-5.d: Likewise.
* testsuite/ld-x86-64/property-x86-5a.s: Likewise.
* testsuite/ld-x86-64/property-x86-5b.s: Likewise.
* testsuite/ld-x86-64/x86-64.exp: Run property-x86-5 and
property-x86-5-x32.
Diffstat (limited to 'binutils/readelf.c')
| -rw-r--r-- | binutils/readelf.c | 36 |
1 files changed, 28 insertions, 8 deletions
diff --git a/binutils/readelf.c b/binutils/readelf.c index d5fef92..d2ee7a3 100644 --- a/binutils/readelf.c +++ b/binutils/readelf.c @@ -17031,6 +17031,14 @@ decode_x86_compat_isa (unsigned int bitmask) static void decode_x86_isa (unsigned int bitmask) { + if (bitmask == GNU_PROPERTY_X86_UINT32_VALID) + { + printf (_("<None>")); + return; + } + else + bitmask &= ~GNU_PROPERTY_X86_UINT32_VALID; + while (bitmask) { unsigned int bit = bitmask & (- bitmask); @@ -17122,6 +17130,14 @@ decode_x86_isa (unsigned int bitmask) static void decode_x86_feature_1 (unsigned int bitmask) { + if (bitmask == GNU_PROPERTY_X86_UINT32_VALID) + { + printf (_("<None>")); + return; + } + else + bitmask &= ~GNU_PROPERTY_X86_UINT32_VALID; + while (bitmask) { unsigned int bit = bitmask & (- bitmask); @@ -17147,6 +17163,14 @@ decode_x86_feature_1 (unsigned int bitmask) static void decode_x86_feature_2 (unsigned int bitmask) { + if (bitmask == GNU_PROPERTY_X86_UINT32_VALID) + { + printf (_("<None>")); + return; + } + else + bitmask &= ~GNU_PROPERTY_X86_UINT32_VALID; + while (bitmask) { unsigned int bit = bitmask & (- bitmask); @@ -17243,14 +17267,10 @@ print_gnu_property_note (Filedata * filedata, Elf_Internal_Note * pnote) if (datasz == 4) { bitmask = byte_get (ptr, 4); - if (filedata->file_header.e_type == ET_EXEC - || filedata->file_header.e_type == ET_DYN) - { - if ((bitmask & GNU_PROPERTY_X86_UINT32_VALID)) - bitmask &= ~GNU_PROPERTY_X86_UINT32_VALID; - else - printf ("Invalid "); - } + if ((filedata->file_header.e_type == ET_EXEC + || filedata->file_header.e_type == ET_DYN) + && !(bitmask & GNU_PROPERTY_X86_UINT32_VALID)) + printf ("Invalid "); } else bitmask = 0; |