From 90c745dc545408a6a3115ff97485672826649ade Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 27 Aug 2018 15:41:09 -0700 Subject: 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 "" 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 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. --- binutils/ChangeLog | 11 +++++++ binutils/readelf.c | 36 ++++++++++++++++++----- binutils/testsuite/binutils-all/i386/pr21231b.d | 2 +- binutils/testsuite/binutils-all/x86-64/pr21231b.d | 2 +- 4 files changed, 41 insertions(+), 10 deletions(-) (limited to 'binutils') diff --git a/binutils/ChangeLog b/binutils/ChangeLog index 82d59fb..0f63148 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,5 +1,16 @@ 2018-08-27 H.J. Lu + * readelf.c (decode_x86_isa): Print 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. + +2018-08-27 H.J. Lu + * readelf.c (decode_x86_compat_isa): Break multi-statement line. (decode_x86_isa): Likewise. (decode_x86_feature_2): Likewise. 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 (_("")); + 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 (_("")); + 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 (_("")); + 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; diff --git a/binutils/testsuite/binutils-all/i386/pr21231b.d b/binutils/testsuite/binutils-all/i386/pr21231b.d index 55d878f..3fad846 100644 --- a/binutils/testsuite/binutils-all/i386/pr21231b.d +++ b/binutils/testsuite/binutils-all/i386/pr21231b.d @@ -8,5 +8,5 @@ Displaying notes found in: .note.gnu.property GNU 0x0000002c NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 no copy on protected - x86 ISA used: CMOV, SSE, SSE2, SSE3, SSSE3, SSE4_1, SSE4_2, AVX, AVX2, FMA, AVX512F, AVX512CD, AVX512ER, AVX512PF, AVX512VL, AVX512DQ, AVX512BW, AVX512_4FMAPS, AVX512_4VNNIW, AVX512_BITALG, AVX512_IFMA, AVX512_VBMI, AVX512_VBMI2, AVX512_VNNI, , , , , , , , + x86 ISA used: CMOV, SSE, SSE2, SSE3, SSSE3, SSE4_1, SSE4_2, AVX, AVX2, FMA, AVX512F, AVX512CD, AVX512ER, AVX512PF, AVX512VL, AVX512DQ, AVX512BW, AVX512_4FMAPS, AVX512_4VNNIW, AVX512_BITALG, AVX512_IFMA, AVX512_VBMI, AVX512_VBMI2, AVX512_VNNI, , , , , , , x86 ISA needed: CMOV, SSE, SSE2, SSE3, SSSE3, SSE4_1, SSE4_2, AVX, AVX2, FMA, AVX512F, AVX512CD, AVX512ER, AVX512PF, AVX512VL, AVX512DQ diff --git a/binutils/testsuite/binutils-all/x86-64/pr21231b.d b/binutils/testsuite/binutils-all/x86-64/pr21231b.d index f433685..150a8ca 100644 --- a/binutils/testsuite/binutils-all/x86-64/pr21231b.d +++ b/binutils/testsuite/binutils-all/x86-64/pr21231b.d @@ -8,5 +8,5 @@ Displaying notes found in: .note.gnu.property GNU 0x00000038 NT_GNU_PROPERTY_TYPE_0 Properties: stack size: 0x800000 no copy on protected - x86 ISA used: CMOV, SSE, SSE2, SSE3, SSSE3, SSE4_1, SSE4_2, AVX, AVX2, FMA, AVX512F, AVX512CD, AVX512ER, AVX512PF, AVX512VL, AVX512DQ, AVX512BW, AVX512_4FMAPS, AVX512_4VNNIW, AVX512_BITALG, AVX512_IFMA, AVX512_VBMI, AVX512_VBMI2, AVX512_VNNI, , , , , , , , + x86 ISA used: CMOV, SSE, SSE2, SSE3, SSSE3, SSE4_1, SSE4_2, AVX, AVX2, FMA, AVX512F, AVX512CD, AVX512ER, AVX512PF, AVX512VL, AVX512DQ, AVX512BW, AVX512_4FMAPS, AVX512_4VNNIW, AVX512_BITALG, AVX512_IFMA, AVX512_VBMI, AVX512_VBMI2, AVX512_VNNI, , , , , , , x86 ISA needed: CMOV, SSE, SSE2, SSE3, SSSE3, SSE4_1, SSE4_2, AVX, AVX2, FMA, AVX512F, AVX512CD, AVX512ER, AVX512PF, AVX512VL, AVX512DQ -- cgit v1.1