diff options
| author | David Meyer <pdox@google.com> | 2012-02-29 02:11:55 +0000 |
|---|---|---|
| committer | David Meyer <pdox@google.com> | 2012-02-29 02:11:55 +0000 |
| commit | 2c67727046234ad9702ab5acb72700b5ac99a676 (patch) | |
| tree | 8dccb4673583b529cf8ca2a898407105b5c01f91 /lib/Object | |
| parent | 37c02bce277078902924af897736d87bb0b106a0 (diff) | |
| download | llvm-2c67727046234ad9702ab5acb72700b5ac99a676.tar.gz llvm-2c67727046234ad9702ab5acb72700b5ac99a676.tar.bz2 llvm-2c67727046234ad9702ab5acb72700b5ac99a676.tar.xz | |
[Object] Add symbol attribute flags: ST_ThreadLocal, ST_Common, and ST_Undefined. Implement these completely for ELF.
Rename ST_External to ST_Unknown, and slightly change its semantics. It now only indicates that the symbol's type
is unknown, not that the symbol is undefined. (For that, use ST_Undefined).
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@151696 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Object')
| -rw-r--r-- | lib/Object/COFFObjectFile.cpp | 8 | ||||
| -rw-r--r-- | lib/Object/MachOObjectFile.cpp | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/lib/Object/COFFObjectFile.cpp b/lib/Object/COFFObjectFile.cpp index bf278785e6..d55aba5ce9 100644 --- a/lib/Object/COFFObjectFile.cpp +++ b/lib/Object/COFFObjectFile.cpp @@ -143,7 +143,7 @@ error_code COFFObjectFile::getSymbolType(DataRefImpl Symb, Result = SymbolRef::ST_Other; if (symb->StorageClass == COFF::IMAGE_SYM_CLASS_EXTERNAL && symb->SectionNumber == COFF::IMAGE_SYM_UNDEFINED) { - Result = SymbolRef::ST_External; + Result = SymbolRef::ST_Unknown; } else { if (symb->getComplexType() == COFF::IMAGE_SYM_DTYPE_FUNCTION) { Result = SymbolRef::ST_Function; @@ -164,7 +164,11 @@ error_code COFFObjectFile::getSymbolFlags(DataRefImpl Symb, const coff_symbol *symb = toSymb(Symb); Result = SymbolRef::SF_None; - // TODO: Set SF_FormatSpecific. + // TODO: Correctly set SF_FormatSpecific, SF_ThreadLocal, SF_Common + + if (symb->StorageClass == COFF::IMAGE_SYM_CLASS_EXTERNAL && + symb->SectionNumber == COFF::IMAGE_SYM_UNDEFINED) + Result |= SymbolRef::SF_Undefined; // TODO: This are certainly too restrictive. if (symb->StorageClass == COFF::IMAGE_SYM_CLASS_EXTERNAL) diff --git a/lib/Object/MachOObjectFile.cpp b/lib/Object/MachOObjectFile.cpp index cbf6d0b2d8..76a01f94e9 100644 --- a/lib/Object/MachOObjectFile.cpp +++ b/lib/Object/MachOObjectFile.cpp @@ -278,7 +278,12 @@ error_code MachOObjectFile::getSymbolFlags(DataRefImpl DRI, MachOType = Entry->Type; } + // TODO: Correctly set SF_ThreadLocal and SF_Common. Result = SymbolRef::SF_None; + + if ((MachOType & MachO::NlistMaskType) == MachO::NListTypeUndefined) + Result |= SymbolRef::SF_Undefined; + if (MachOFlags & macho::STF_StabsEntryMask) Result |= SymbolRef::SF_FormatSpecific; @@ -337,7 +342,7 @@ error_code MachOObjectFile::getSymbolType(DataRefImpl Symb, switch (n_type & MachO::NlistMaskType) { case MachO::NListTypeUndefined : - Res = SymbolRef::ST_External; + Res = SymbolRef::ST_Unknown; break; case MachO::NListTypeSection : Res = SymbolRef::ST_Function; @@ -554,7 +559,7 @@ error_code MachOObjectFile::sectionContainsSymbol(DataRefImpl Sec, bool &Result) const { SymbolRef::Type ST; getSymbolType(Symb, ST); - if (ST == SymbolRef::ST_External) { + if (ST == SymbolRef::ST_Unknown) { Result = false; return object_error::success; } |