[lld] 6c1c231 - [ELF] Simplify assignFileOffsets. NFC

Fangrui Song via llvm-commits llvm-commits at lists.llvm.org
Sun Nov 28 12:48:01 PST 2021


Author: Fangrui Song
Date: 2021-11-28T11:43:59-08:00
New Revision: 6c1c2313d1b7bea4e9d831fe061c37735b7d4802

URL: https://github.com/llvm/llvm-project/commit/6c1c2313d1b7bea4e9d831fe061c37735b7d4802
DIFF: https://github.com/llvm/llvm-project/commit/6c1c2313d1b7bea4e9d831fe061c37735b7d4802.diff

LOG: [ELF] Simplify assignFileOffsets. NFC

Added: 
    

Modified: 
    lld/ELF/Writer.cpp

Removed: 
    


################################################################################
diff  --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index a870a0333eca0..1906b2deccf71 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -2587,9 +2587,8 @@ static std::string rangeToString(uint64_t addr, uint64_t len) {
 
 // Assign file offsets to output sections.
 template <class ELFT> void Writer<ELFT>::assignFileOffsets() {
-  uint64_t off = 0;
-  off = setFileOffset(Out::elfHeader, off);
-  off = setFileOffset(Out::programHeaders, off);
+  Out::programHeaders->offset = Out::elfHeader->size;
+  uint64_t off = Out::elfHeader->size + Out::programHeaders->size;
 
   PhdrEntry *lastRX = nullptr;
   for (Partition &part : partitions)


        


More information about the llvm-commits mailing list