diff options
author | H.J. Lu <hjl.tools@gmail.com> | 2024-06-11 20:55:05 -0700 |
---|---|---|
committer | H.J. Lu <hjl.tools@gmail.com> | 2024-06-14 13:38:19 -0700 |
commit | 93548ee191ff95cae0592363b579c6addb0b151d (patch) | |
tree | b8c1a0fdb54efbfe148ee1af30c78c1137adf416 /bfd | |
parent | 65e513dc95dcad1320c6bee4be1a10ed46f7d2cb (diff) | |
download | fsf-binutils-gdb-93548ee191ff95cae0592363b579c6addb0b151d.zip fsf-binutils-gdb-93548ee191ff95cae0592363b579c6addb0b151d.tar.gz fsf-binutils-gdb-93548ee191ff95cae0592363b579c6addb0b151d.tar.bz2 |
x86: Add -z isa-level-report=[none|all|needed|used]
Add -z isa-level-report=[none|all|needed|used] to the x86 ELF linker to
report needed and used x86-64 ISA levels.
bfd/
PR ld/31868
* elf-linker-x86.h (elf_x86_isa_level_report): New.
(elf_linker_x86_params): Add isa_level_report.
* elfxx-x86.c (report_isa_level): New.
(_bfd_x86_elf_link_setup_gnu_properties): Check
-z isa-level-report=[none|all|needed|used] to report needed and
used x86-64 ISA level.
ld/
PR ld/31868
* NEWS: Mention -z isa-level-report=[none|all|needed|used].
* ld.texi: Document -z isa-level-report=[none|all|needed|used].
* emulparams/elf32_x86_64.sh: Source x86-64-level-report.sh.
* emulparams/elf_i386.sh: Likewise.
* emulparams/elf_x86_64.sh: Likewise.
* emulparams/x86-64-level-report.sh: New file.
* testsuite/ld-i386/pr31868a.d: Likewise.
* testsuite/ld-i386/pr31868b.d: Likewise.
* testsuite/ld-i386/pr31868c.d: Likewise.
* testsuite/ld-x86-64/pr31868a-x32.d: Likewise.
* testsuite/ld-x86-64/pr31868a.d: Likewise.
* testsuite/ld-x86-64/pr31868a.l: Likewise.
* testsuite/ld-x86-64/pr31868a.s: Likewise.
* testsuite/ld-x86-64/pr31868b-x32.d: Likewise.
* testsuite/ld-x86-64/pr31868b.d: Likewise.
* testsuite/ld-x86-64/pr31868b.l: Likewise.
* testsuite/ld-x86-64/pr31868b.s: Likewise.
* testsuite/ld-x86-64/pr31868c-x32.d: Likewise.
* testsuite/ld-x86-64/pr31868c.d: Likewise.
* testsuite/ld-x86-64/pr31868c.l: Likewise.
* testsuite/ld-i386/i386.exp: Run PR ld/31868 tests.
* testsuite/ld-x86-64/x86-64.exp: Likewise.
Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Diffstat (limited to 'bfd')
-rw-r--r-- | bfd/elf-linker-x86.h | 11 | ||||
-rw-r--r-- | bfd/elfxx-x86.c | 119 |
2 files changed, 119 insertions, 11 deletions
diff --git a/bfd/elf-linker-x86.h b/bfd/elf-linker-x86.h index 03086fc..61bffa9 100644 --- a/bfd/elf-linker-x86.h +++ b/bfd/elf-linker-x86.h @@ -28,6 +28,14 @@ enum elf_x86_prop_report prop_report_shstk = 1 << 3 /* Report missing SHSTK property. */ }; +/* ISA level report control. */ +enum elf_x86_isa_level_report +{ + isa_level_report_none = 0, /* Do nothing. */ + isa_level_report_needed = 1 << 0, /* Needed x86-64 ISA level. */ + isa_level_report_used = 1 << 1 /* Used x86-64 ISA level. */ +}; + /* Used to pass x86-specific linker options from ld to bfd. */ struct elf_linker_x86_params { @@ -67,6 +75,9 @@ struct elf_linker_x86_params /* X86-64 ISA level needed. */ unsigned int isa_level; + /* Report needed and used x86-64 ISA levels. */ + enum elf_x86_isa_level_report isa_level_report; + /* Report missing IBT and SHSTK properties. */ enum elf_x86_prop_report cet_report; diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c index 8564391..00a5251 100644 --- a/bfd/elfxx-x86.c +++ b/bfd/elfxx-x86.c @@ -4017,6 +4017,50 @@ _bfd_x86_elf_merge_gnu_properties (struct bfd_link_info *info, return updated; } +/* Report x86-64 ISA level. */ + +static void +report_isa_level (struct bfd_link_info *info, bfd *abfd, + unsigned int bitmask, bool needed) +{ + if (!bitmask) + return; + + if (needed) + info->callbacks->einfo (_("%pB: x86 ISA needed: "), abfd); + else + info->callbacks->einfo (_("%pB: x86 ISA used: "), abfd); + + while (bitmask) + { + unsigned int bit = bitmask & (- bitmask); + + bitmask &= ~ bit; + switch (bit) + { + case GNU_PROPERTY_X86_ISA_1_BASELINE: + info->callbacks->einfo ("x86-64-baseline"); + break; + case GNU_PROPERTY_X86_ISA_1_V2: + info->callbacks->einfo ("x86-64-v2"); + break; + case GNU_PROPERTY_X86_ISA_1_V3: + info->callbacks->einfo ("x86-64-v3"); + break; + case GNU_PROPERTY_X86_ISA_1_V4: + info->callbacks->einfo ("x86-64-v4"); + break; + default: + info->callbacks->einfo (_("<unknown: %x>"), bit); + break; + } + if (bitmask) + info->callbacks->einfo (", "); + } + + info->callbacks->einfo ("\n"); +} + /* Set up x86 GNU properties. Return the first relocatable ELF input with GNU properties if found. Otherwise, return NULL. */ @@ -4155,11 +4199,12 @@ _bfd_x86_elf_link_setup_gnu_properties } } - if (htab->params->cet_report - || htab->params->lam_u48_report - || htab->params->lam_u57_report) + bool check_feature_1 = (htab->params->cet_report + || htab->params->lam_u48_report + || htab->params->lam_u57_report); + if (check_feature_1 || htab->params->isa_level_report) { - /* Report missing IBT, SHSTK and LAM properties. */ + /* Report missing IBT, SHSTK, ISA level and LAM properties. */ bfd *abfd; const char *warning_msg = _("%P: %pB: warning: missing %s\n"); const char *error_msg = _("%X%P: %pB: error: missing %s\n"); @@ -4176,6 +4221,10 @@ _bfd_x86_elf_link_setup_gnu_properties bool check_shstk = (htab->params->cet_report && (htab->params->cet_report & prop_report_shstk)); + bool report_needed_level + = (htab->params->isa_level_report & isa_level_report_needed) != 0; + bool report_used_level + = (htab->params->isa_level_report & isa_level_report_used) != 0; if (htab->params->cet_report) { @@ -4203,23 +4252,62 @@ _bfd_x86_elf_link_setup_gnu_properties if (!(abfd->flags & (DYNAMIC | BFD_PLUGIN | BFD_LINKER_CREATED)) && bfd_get_flavour (abfd) == bfd_target_elf_flavour) { + elf_property_list *p_feature_1 = NULL; + elf_property_list *p_isa_1_needed = NULL; + elf_property_list *p_isa_1_used = NULL; + bool find_feature_1 = check_feature_1; + bool find_needed_level = report_needed_level; + bool find_used_level = report_used_level; + for (p = elf_properties (abfd); p; p = p->next) - if (p->property.pr_type == GNU_PROPERTY_X86_FEATURE_1_AND) - break; + { + switch (p->property.pr_type) + { + case GNU_PROPERTY_X86_FEATURE_1_AND: + if (find_feature_1) + { + p_feature_1 = p; + find_feature_1 = false; + } + break; + case GNU_PROPERTY_X86_ISA_1_NEEDED: + if (find_needed_level) + { + p_isa_1_needed = p; + find_needed_level = false; + } + break; + case GNU_PROPERTY_X86_ISA_1_USED: + if (find_used_level) + { + p_isa_1_used = p; + find_used_level = false; + } + break; + default: + break; + } + + if (!find_feature_1 + && !find_needed_level + && !find_used_level) + break; + } + missing_ibt = check_ibt; missing_shstk = check_shstk; missing_lam_u48 = !!lam_u48_msg; missing_lam_u57 = !!lam_u57_msg; - if (p) + if (p_feature_1) { - missing_ibt &= !(p->property.u.number + missing_ibt &= !(p_feature_1->property.u.number & GNU_PROPERTY_X86_FEATURE_1_IBT); - missing_shstk &= !(p->property.u.number + missing_shstk &= !(p_feature_1->property.u.number & GNU_PROPERTY_X86_FEATURE_1_SHSTK); - missing_lam_u48 &= !(p->property.u.number + missing_lam_u48 &= !(p_feature_1->property.u.number & GNU_PROPERTY_X86_FEATURE_1_LAM_U48); - missing_lam_u57 &= !(p->property.u.number + missing_lam_u57 &= !(p_feature_1->property.u.number & GNU_PROPERTY_X86_FEATURE_1_LAM_U57); } if (missing_ibt || missing_shstk) @@ -4242,6 +4330,15 @@ _bfd_x86_elf_link_setup_gnu_properties missing = _("LAM_U57 property"); info->callbacks->einfo (lam_u57_msg, abfd, missing); } + + if (p_isa_1_needed) + report_isa_level (info, abfd, + p_isa_1_needed->property.u.number, + true); + if (p_isa_1_used) + report_isa_level (info, abfd, + p_isa_1_used->property.u.number, + false); } } |