From bfcdfb32af5dcc25b3cf7cec26c8dd9c4e974aef Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Mon, 14 Sep 2015 19:00:35 +0000
Subject: Correctly align sections.

We have to align the start, not the end.

This should fix crashes on systems where memcpy enforces the expected
alignment.

llvm-svn: 247599
---
 lld/ELF/Writer.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'lld/ELF/Writer.cpp')

diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp
index 6d1c94ea8f4..f33257ea8ce 100644
--- a/lld/ELF/Writer.cpp
+++ b/lld/ELF/Writer.cpp
@@ -704,12 +704,14 @@ template <class ELFT> void Writer<ELFT>::assignAddresses() {
     uintX_t Align = Sec->getAlign();
     uintX_t Size = Sec->getSize();
     if (Sec->getFlags() & SHF_ALLOC) {
+      VA = RoundUpToAlignment(VA, Align);
       Sec->setVA(VA);
-      VA += RoundUpToAlignment(Size, Align);
+      VA += Size;
     }
+    FileOff = RoundUpToAlignment(FileOff, Align);
     Sec->setFileOffset(FileOff);
     if (Sec->getType() != SHT_NOBITS)
-      FileOff += RoundUpToAlignment(Size, Align);
+      FileOff += Size;
   }
 
   // Add a PHDR for the dynamic table.
-- 
cgit v1.2.3