MatCat.OpenSource/8sa1-binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ld/x86-64: Also set LAM_U57 when setting LAM_U48

Browse Source 
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.
This commit is contained in:
H.J. Lu 2021-01-08 21:51:38 -08:00
parent b1b29aa51a
commit ba9e922fa0
5 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bfd/ChangeLog
View File

@ -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> 2021-01-08 H.J. Lu <hongjiu.lu@intel.com>
PR ld/26256 PR ld/26256

6
bfd/elfxx-x86.c
View File

@ -2556,10 +2556,12 @@ _bfd_x86_elf_link_setup_gnu_properties
htab->params->cet_report = prop_report_none; htab->params->cet_report = prop_report_none;
if (htab->params->lam_u48) 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_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; features |= GNU_PROPERTY_X86_FEATURE_1_LAM_U57;
htab->params->lam_u57_report = prop_report_none; htab->params->lam_u57_report = prop_report_none;

5
ld/ChangeLog
View File

@ -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> 2021-01-09 Alan Modra <amodra@gmail.com>
* configure: Regenerate. * configure: Regenerate.

2
ld/testsuite/ld-x86-64/property-x86-lam-u48-4.d
View File

@ -6,6 +6,6 @@
Displaying notes found in: .note.gnu.property Displaying notes found in: .note.gnu.property
[ ]+Owner[ ]+Data size[ ]+Description [ ]+Owner[ ]+Data size[ ]+Description
GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0
Properties: x86 feature: LAM_U48 Properties: x86 feature: LAM_U48, LAM_U57
x86 feature used: x86 x86 feature used: x86
x86 ISA used: x86 ISA used:

2
ld/testsuite/ld-x86-64/property-x86-lam-u48-5.d
View File

@ -6,6 +6,6 @@
Displaying notes found in: .note.gnu.property Displaying notes found in: .note.gnu.property
[ ]+Owner[ ]+Data size[ ]+Description [ ]+Owner[ ]+Data size[ ]+Description
GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0 GNU 0x00000030 NT_GNU_PROPERTY_TYPE_0
Properties: x86 feature: LAM_U48 Properties: x86 feature: LAM_U48, LAM_U57
x86 feature used: x86 x86 feature used: x86
x86 ISA used: x86 ISA used: