aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/elfxx-x86.c6
2 files changed, 9 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 86fec90..11a2c33 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
2021-01-08 H.J. Lu <hongjiu.lu@intel.com>
+ * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Also set
+ LAM_U57 when setting LAM_U48.
+
+2021-01-08 H.J. Lu <hongjiu.lu@intel.com>
+
PR ld/26256
PR ld/27160
* elflink.c (elf_fixup_link_order): Verify that fixing up
diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index 6cfe2bd..c47f482 100644
--- a/bfd/elfxx-x86.c
+++ b/bfd/elfxx-x86.c
@@ -2556,10 +2556,12 @@ _bfd_x86_elf_link_setup_gnu_properties
htab->params->cet_report = prop_report_none;
if (htab->params->lam_u48)
{
- features |= GNU_PROPERTY_X86_FEATURE_1_LAM_U48;
+ features |= (GNU_PROPERTY_X86_FEATURE_1_LAM_U48
+ | GNU_PROPERTY_X86_FEATURE_1_LAM_U57);
htab->params->lam_u48_report = prop_report_none;
+ htab->params->lam_u57_report = prop_report_none;
}
- if (htab->params->lam_u57)
+ else if (htab->params->lam_u57)
{
features |= GNU_PROPERTY_X86_FEATURE_1_LAM_U57;
htab->params->lam_u57_report = prop_report_none;