intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-02-04 20:00:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

[ELF] Allow reading of more than one FEATURE_1_AND in same object.

Browse Source 
Although many relocatable objects will have a single
GNU_PROPERTY_X86_FEATURE_1_AND in the .note.gnu.property section it is
permissible to have more than one, and there are tests in ld.bfd that use
it. The behavior that ld.bfd follows is to set the feature bit for a
relocatable object if any of the GNU_PROPERTY_X86_FEATURE_1_AND
have the feature bit set.

Differential Revision: https://reviews.llvm.org/D62862

llvm-svn: 362591
This commit is contained in:
Peter Smith
2019-06-05 09:31:45 +00:00
parent 6fc4c1cc54
commit e12334a0f2
3 changed files with 44 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lld/ELF/InputFiles.cpp
View File

@@ -772,6 +772,7 @@ static uint32_t readAndFeatures(ObjFile<ELFT> *Obj, ArrayRef<uint8_t> Data) {
using Elf_Nhdr = typename ELFT::Nhdr;
using Elf_Note = typename ELFT::Note;
uint32_t FeaturesSet = 0;
while (!Data.empty()) {
// Read one NOTE record.
if (Data.size() < sizeof(Elf_Nhdr))
@@ -797,8 +798,10 @@ static uint32_t readAndFeatures(ObjFile<ELFT> *Obj, ArrayRef<uint8_t> Data) {
uint32_t Size = read32le(Desc.data() + 4);
if (Type == GNU_PROPERTY_X86_FEATURE_1_AND) {
// We found the field.
return read32le(Desc.data() + 8);
// We found a FEATURE_1_AND field. There may be more than one of these
// in a .note.gnu.propery section, for a relocatable object we
// accumulate the bits set.
FeaturesSet |= read32le(Desc.data() + 8);
}
// On 64-bit, a payload may be followed by a 4-byte padding to make its
@@ -809,12 +812,11 @@ static uint32_t readAndFeatures(ObjFile<ELFT> *Obj, ArrayRef<uint8_t> Data) {
Desc = Desc.slice(Size + 8); // +8 for Type and Size
}
// Go to next NOTE record if a note section didn't contain
// X86_FEATURES_1_AND description.
// Go to next NOTE record to look for more FEATURE_1_AND descriptions.
Data = Data.slice(Nhdr->getSize());
}
return 0;
return FeaturesSet;
}
template <class ELFT>