maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[mach-o] fix use of resolver functions to not cause duplicate sections. 

The previous commit uncovered a bug in the mach-o writer whereby two __text
sections were created.  But the test case did not catch that.  So I updated
the test case to run the linker a second time, reading the output of the
first pass.  

llvm-svn: 210624
This commit is contained in:
Nick Kledzik 2014-06-11 01:30:55 +00:00
parent 933c9509da
commit 936d5205bb
2 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lld/lib/ReaderWriter/MachO/MachONormalizedFileFromAtoms.cpp
View File

@ -113,8 +113,8 @@ private:
typedef llvm::StringMap<DylibInfo> DylibPathToInfo;
SectionInfo *sectionForAtom(const DefinedAtom*);
SectionInfo *makeRelocatableSection(DefinedAtom::ContentType type);
SectionInfo *makeFinalSection(DefinedAtom::ContentType type);
SectionInfo *getRelocatableSection(DefinedAtom::ContentType type);
SectionInfo *getFinalSection(DefinedAtom::ContentType type);
void appendAtom(SectionInfo *sect, const DefinedAtom *atom);
SegmentInfo *segmentForName(StringRef segName);
void layoutSectionsInSegment(SegmentInfo *seg, uint64_t &addr);
@ -160,7 +160,7 @@ private:
};
SectionInfo *Util::makeRelocatableSection(DefinedAtom::ContentType type) {
SectionInfo *Util::getRelocatableSection(DefinedAtom::ContentType type) {
StringRef segmentName;
StringRef sectionName;
SectionType sectionType;
@ -178,8 +178,11 @@ SectionInfo *Util::makeRelocatableSection(DefinedAtom::ContentType type) {
}
}
// Otherwise allocate new SectionInfo object.
return new (_allocator) SectionInfo(segmentName, sectionName, sectionType,
sectionAttrs);
SectionInfo *sect = new (_allocator) SectionInfo(segmentName, sectionName,
sectionType, sectionAttrs);
_sectionInfos.push_back(sect);
_sectionMap[type] = sect;
return sect;
}
#define ENTRY(seg, sect, type, atomType) \
@ -220,7 +223,7 @@ const MachOFinalSectionFromAtomType sectsToAtomType[] = {
#undef ENTRY
SectionInfo *Util::makeFinalSection(DefinedAtom::ContentType atomType) {
SectionInfo *Util::getFinalSection(DefinedAtom::ContentType atomType) {
for (const MachOFinalSectionFromAtomType *p = sectsToAtomType ;
p->atomType != DefinedAtom::typeUnknown; ++p) {
if (p->atomType != atomType)
@ -243,8 +246,13 @@ SectionInfo *Util::makeFinalSection(DefinedAtom::ContentType atomType) {
}
}
// Otherwise allocate new SectionInfo object.
return new (_allocator) SectionInfo(p->segmentName, p->sectionName,
p->sectionType, sectionAttrs);
SectionInfo *sect = new (_allocator) SectionInfo(p->segmentName,
p->sectionName,
p->sectionType,
sectionAttrs);
_sectionInfos.push_back(sect);
_sectionMap[atomType] = sect;
return sect;
}
llvm_unreachable("content type not yet supported");
}
@ -259,11 +267,7 @@ SectionInfo *Util::sectionForAtom(const DefinedAtom *atom) {
if ( pos != _sectionMap.end() )
return pos->second;
bool rMode = (_context.outputFileType() == llvm::MachO::MH_OBJECT);
SectionInfo *si = rMode ? makeRelocatableSection(type)
: makeFinalSection(type);
_sectionInfos.push_back(si);
_sectionMap[type] = si;
return si;
return rMode ? getRelocatableSection(type) : getFinalSection(type);
} else {
// This atom needs to be in a custom section.
StringRef customName = atom->customSectionName();
@ -619,7 +623,12 @@ bool Util::AtomSorter::operator()(const AtomAndIndex &left,
bool Util::belongsInGlobalSymbolsSection(const DefinedAtom* atom) {
return (atom->scope() == Atom::scopeGlobal);
// ScopeLinkageUnit symbols are in globals area of symbol table
// in object files, but in locals area for final linked images.
if (_context.outputFileType() == llvm::MachO::MH_OBJECT)
return (atom->scope() != Atom::scopeTranslationUnit);
else
return (atom->scope() == Atom::scopeGlobal);
}
void Util::addSymbols(const lld::File &atomFile, NormalizedFile &file) {

3
lld/test/mach-o/parse-function.yaml
View File

@ -1,4 +1,5 @@
# RUN: lld -flavor darwin -arch x86_64 -r -print_atoms %s -o %t | FileCheck %s
# RUN: lld -flavor darwin -arch x86_64 -r %s -o %t
# RUN: lld -flavor darwin -arch x86_64 -r %t -print_atoms -o %t2 | FileCheck %s
#
# Test parsing of mach-o functions.
#