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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 86fec902024584916ae5bfa25ffa1e834a7ac7b4..11a2c33b223cba2de0f4b9b43b4ad9a4262f6f9a 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/bfd/elfxx-x86.c b/bfd/elfxx-x86.c
index 6cfe2bdab151d784d8f671d5680abc5749d225e1..c47f48257eabe7cd225eb0acb3bc679a98a9f0b1 100644 (file)
--- 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;

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 1514fd3464a32746a30c2183eb453c9e5cb3c4a8..edbf88628dd51662e5415dee86634e40ef373763 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2021-01-08  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * ld-x86-64/property-x86-lam-u48-4.d: Updated.
+       * ld-x86-64/property-x86-lam-u48-5.d: Likewise.
+
 2021-01-09  Alan Modra  <amodra@gmail.com>
 
        * configure: Regenerate.

diff --git a/ld/testsuite/ld-x86-64/property-x86-lam-u48-4.d b/ld/testsuite/ld-x86-64/property-x86-lam-u48-4.d
index 82cd7e2be44b63364346e75c908b4762eb0c9dda..637674ca19009171e404fc959708835e06cdc882 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-x86-lam-u48-4.d
+++ b/ld/testsuite/ld-x86-64/property-x86-lam-u48-4.d
@@ -6,6 +6,6 @@
 Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
-      Properties: x86 feature: LAM_U48
+      Properties: x86 feature: LAM_U48, LAM_U57
        x86 feature used: x86
        x86 ISA used: 

diff --git a/ld/testsuite/ld-x86-64/property-x86-lam-u48-5.d b/ld/testsuite/ld-x86-64/property-x86-lam-u48-5.d
index 755d0d56e575795528252e2e9392737e64196744..623dfbd979ccd45d2d8d3c4339ee2a7583515db7 100644 (file)
--- a/ld/testsuite/ld-x86-64/property-x86-lam-u48-5.d
+++ b/ld/testsuite/ld-x86-64/property-x86-lam-u48-5.d
@@ -6,6 +6,6 @@
 Displaying notes found in: .note.gnu.property
 [      ]+Owner[        ]+Data size[    ]+Description
   GNU                  0x00000030      NT_GNU_PROPERTY_TYPE_0
-      Properties: x86 feature: LAM_U48
+      Properties: x86 feature: LAM_U48, LAM_U57
        x86 feature used: x86
        x86 ISA used: