<div dir="ltr"><div class="gmail_extra"><div class="gmail_quote">On Sun, Dec 1, 2013 at 3:58 PM, Alp Toker <span dir="ltr"><<a href="mailto:alp@nuanti.com" target="_blank">alp@nuanti.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
Author: alp<br>
Date: Sun Dec 1 17:58:45 2013<br>
New Revision: 196054<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=196054&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=196054&view=rev</a><br>
Log:<br>
Fix "don't" typos missed in previous commit<br>
<br>
Modified:<br>
lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h<br>
lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h<br>
lld/trunk/lib/ReaderWriter/ELF/ExecutableWriter.h<br>
lld/trunk/lib/ReaderWriter/ELF/OutputELFWriter.h<br>
lld/trunk/lib/ReaderWriter/ELF/SectionChunks.h<br>
lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h<br>
lld/trunk/test/elf/X86_64/largebss.test<br>
<br>
Modified: lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h?rev=196054&r1=196053&r2=196054&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h?rev=196054&r1=196053&r2=196054&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h (original)<br>
+++ lld/trunk/include/lld/ReaderWriter/ELFLinkingContext.h Sun Dec 1 17:58:45 2013<br>
@@ -45,9 +45,9 @@ public:<br>
/// creates.<br>
enum class OutputMagic : uint8_t {<br>
DEFAULT, // The default mode, no specific magic set<br>
- NMAGIC, // Disallow shared libraries and dont align sections<br>
+ NMAGIC, // Disallow shared libraries and don't align sections<br>
// PageAlign Data, Mark Text Segment/Data segment RW<br>
- OMAGIC // Disallow shared libraries and dont align sections,<br>
+ OMAGIC // Disallow shared libraries and don't align sections,<br>
// Mark Text Segment/Data segment RW<br>
};<br>
<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h?rev=196054&r1=196053&r2=196054&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h?rev=196054&r1=196053&r2=196054&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h Sun Dec 1 17:58:45 2013<br>
@@ -639,7 +639,7 @@ template <class ELFT> void DefaultLayout<br>
lookupSectionFlag &= ~(llvm::ELF::SHF_TLS);<br>
<br>
Segment<ELFT> *segment;<br>
- // We need a separate segment for sections that dont have<br>
+ // We need a separate segment for sections that don't have<br>
// the segment type to be PT_LOAD<br>
if (segmentType != llvm::ELF::PT_LOAD) {<br>
const AdditionalSegmentKey key(segmentType, lookupSectionFlag);<br>
@@ -706,7 +706,7 @@ template <class ELFT> void DefaultLayout<br>
uint64_t offset = 0;<br>
for (auto si : _segments) {<br>
si->setOrdinal(++ordinal);<br>
- // Dont assign offsets for segments that are not loadable<br>
+ // Don't assign offsets for segments that are not loadable<br>
if (si->segmentType() != llvm::ELF::PT_LOAD)<br>
continue;<br>
si->assignOffsets(offset);<br>
@@ -742,7 +742,7 @@ DefaultLayout<ELFT>::assignVirtualAddres<br>
while (true) {<br>
for (auto si : _segments) {<br>
si->finalize();<br>
- // Dont add PT_NULL segments into the program header<br>
+ // Don't add PT_NULL segments into the program header<br>
if (si->segmentType() != llvm::ELF::PT_NULL)<br>
newSegmentHeaderAdded = _programHeader->addSegment(si);<br>
}<br>
@@ -778,7 +778,7 @@ DefaultLayout<ELFT>::assignVirtualAddres<br>
} else {<br>
si->setVAddr(virtualAddress);<br>
// The first segment has the virtualAddress set to the base address as<br>
- // we have added the file header and the program header dont align the<br>
+ // we have added the file header and the program header don't align the<br>
// first segment to the pagesize<br>
si->assignVirtualAddress(address);<br>
si->setMemSize(address - virtualAddress);<br>
@@ -841,7 +841,7 @@ DefaultLayout<ELFT>::assignOffsetsForMis<br>
uint64_t fileoffset = 0;<br>
uint64_t size = 0;<br>
for (auto si : _segments) {<br>
- // Dont calculate offsets from non loadable segments<br>
+ // Don't calculate offsets from non loadable segments<br>
if ((si->segmentType() != llvm::ELF::PT_LOAD) &&<br>
(si->segmentType() != llvm::ELF::PT_NULL))<br>
continue;<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/ExecutableWriter.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ExecutableWriter.h?rev=196054&r1=196053&r2=196054&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/ExecutableWriter.h?rev=196054&r1=196053&r2=196054&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/ExecutableWriter.h (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/ExecutableWriter.h Sun Dec 1 17:58:45 2013<br>
@@ -122,7 +122,7 @@ template <class ELFT> void ExecutableWri<br>
<br>
auto bssSection = this->_layout->findOutputSection(".bss");<br>
<br>
- // If we dont find a bss section, then dont set these values<br>
+ // If we don't find a bss section, then don't set these values<br>
if (bssSection) {<br>
(*bssStartAtomIter)->_virtualAddr = bssSection->virtualAddr();<br>
(*bssEndAtomIter)->_virtualAddr =<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/OutputELFWriter.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/OutputELFWriter.h?rev=196054&r1=196053&r2=196054&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/OutputELFWriter.h?rev=196054&r1=196053&r2=196054&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/OutputELFWriter.h (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/OutputELFWriter.h Sun Dec 1 17:58:45 2013<br>
@@ -188,7 +188,7 @@ void OutputELFWriter<ELFT>::buildDynamic<br>
// The dynamic symbol table need to be sorted earlier because the hash<br>
// table needs to be built using the dynamic symbol table. It would be<br>
// late to sort the symbols due to that in finalize. In the dynamic symbol<br>
- // table finalize, we call the symbol table finalize and we dont want to<br>
+ // table finalize, we call the symbol table finalize and we don't want to<br>
// sort again<br>
_dynamicSymbolTable->sortSymbols();<br>
<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/SectionChunks.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/SectionChunks.h?rev=196054&r1=196053&r2=196054&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/SectionChunks.h?rev=196054&r1=196053&r2=196054&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/SectionChunks.h (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/SectionChunks.h Sun Dec 1 17:58:45 2013<br>
@@ -790,7 +790,7 @@ void SymbolTable<ELFT>::addUndefinedAtom<br>
}<br>
<br>
/// Add a symbol to the symbol Table, definedAtoms which get added to the symbol<br>
-/// section dont have their virtual addresses set at the time of adding the<br>
+/// section don't have their virtual addresses set at the time of adding the<br>
/// symbol to the symbol table(Example: dynamic symbols), the addresses needs<br>
/// to be updated in the table before writing the dynamic symbol table<br>
/// information<br>
@@ -885,7 +885,7 @@ public:<br>
<br>
virtual void finalize() {<br>
// Defined symbols which have been added into the dynamic symbol table<br>
- // dont have their addresses known until addresses have been assigned<br>
+ // don't have their addresses known until addresses have been assigned<br>
// so lets update the symbol values after they have got assigned<br>
for (auto &ste: this->_symbolTable) {<br>
const lld::AtomLayout *atomLayout = ste._atomLayout;<br>
@@ -894,7 +894,7 @@ public:<br>
ste._symbol.st_value = atomLayout->_virtualAddr;<br>
}<br>
<br>
- // Dont sort the symbols<br>
+ // Don't sort the symbols<br>
SymbolTable<ELFT>::finalize(false);<br>
}<br>
<br>
<br>
Modified: lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h?rev=196054&r1=196053&r2=196054&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h?rev=196054&r1=196053&r2=196054&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h (original)<br>
+++ lld/trunk/lib/ReaderWriter/ELF/SegmentChunks.h Sun Dec 1 17:58:45 2013<br>
@@ -570,7 +570,7 @@ template <class ELFT> void Segment<ELFT><br>
tlsStartAddr += section->memSize();<br>
section->setMemSize(addr + section->memSize() - section->virtualAddr());<br>
// TBSS section is special that it doesnot contribute to memory of any<br></blockquote><div><br></div><div>We should probably s/doesnot/doesn't/ as well?</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
- // segment, If we see a tbss section, dont add memory size to addr<br>
+ // segment, If we see a tbss section, don't add memory size to addr<br>
// The fileOffset is automatically taken care of since TBSS section does<br>
// not endup using file size<br>
if (section->order() != DefaultLayout<ELFT>::ORDER_TBSS)<br>
<br>
Modified: lld/trunk/test/elf/X86_64/largebss.test<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/X86_64/largebss.test?rev=196054&r1=196053&r2=196054&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/elf/X86_64/largebss.test?rev=196054&r1=196053&r2=196054&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/elf/X86_64/largebss.test (original)<br>
+++ lld/trunk/test/elf/X86_64/largebss.test Sun Dec 1 17:58:45 2013<br>
@@ -1,5 +1,5 @@<br>
# This tests the functionality of handling BSS symbols<br>
-# BSS symbols dont occupy file content and are associated with typeZeroFill<br>
+# BSS symbols don't occupy file content and are associated with typeZeroFill<br>
# Any typeZeroFill content wouldnot have space reserved in the file to store<br>
# its content<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>