aboutsummaryrefslogtreecommitdiff
path: root/bfd/elfxx-x86.c
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2021-01-08 21:51:38 -0800
committerH.J. Lu <hjl.tools@gmail.com>2021-01-08 21:51:48 -0800
commitba9e922fa0dfbd7957ef939da3a6b0dbbbaa03cd (patch)
tree8f377efe40ea43acd2e96180dd276ab7724f8e1b /bfd/elfxx-x86.c
parentb1b29aa51a6a67d5e35391ad31a80765839d6eb4 (diff)
downloadgdb-ba9e922fa0dfbd7957ef939da3a6b0dbbbaa03cd.zip
gdb-ba9e922fa0dfbd7957ef939da3a6b0dbbbaa03cd.tar.gz
gdb-ba9e922fa0dfbd7957ef939da3a6b0dbbbaa03cd.tar.bz2
ld/x86-64: Also set LAM_U57 when setting LAM_U48
Since LAM_U48 implies LAM_U57, also set LAM_U57 when setting LAM_U48. bfd/ * elfxx-x86.c (_bfd_x86_elf_link_setup_gnu_properties): Also set LAM_U57 when setting LAM_U48. ld/ * ld-x86-64/property-x86-lam-u48-4.d: Updated. * ld-x86-64/property-x86-lam-u48-5.d: Likewise.
Diffstat (limited to 'bfd/elfxx-x86.c')
-rw-r--r--bfd/elfxx-x86.c6
1 files changed, 4 insertions, 2 deletions
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;