Commit 0160a281 authored by Rafael Espindola's avatar Rafael Espindola
Browse files

Record the alignment of the output sections. 

llvm-svn: 244941
parent afbb1a95

lld/ELF/Writer.cpp

+5 −1
Original line number Diff line number Diff line
@@ -120,8 +120,12 @@ template <class ELFT> void Writer<ELFT>::run() { 


template <bool Is64Bits> void OutputSection<Is64Bits>::addChunk(Chunk *C) {

  Chunks.push_back(C);

  uint32_t Align = C->getAlign();

  if (Align > Header.sh_addralign)

    Header.sh_addralign = Align;



  uintX_t Off = Header.sh_size;

  Off = RoundUpToAlignment(Off, C->getAlign());

  Off = RoundUpToAlignment(Off, Align);

  C->setOutputSectionOff(Off);

  Off += C->getSize();

  Header.sh_size = Off;

lld/test/elf2/basic.s

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ _start: 
# CHECK-NEXT:     Size: 16

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 4

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {
@@ -79,7 +79,7 @@ _start: 
# CHECK-NEXT:     Size: 0

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 4

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {
@@ -95,7 +95,7 @@ _start: 
# CHECK-NEXT:     Size: 0

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 4

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {

lld/test/elf2/basic32.s

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ _start: 
# CHECK-NEXT:     Size: 12

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 4

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {
@@ -79,7 +79,7 @@ _start: 
# CHECK-NEXT:     Size: 0

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 4

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {
@@ -95,7 +95,7 @@ _start: 
# CHECK-NEXT:     Size: 0

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 4

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {

lld/test/elf2/basic32be.s

+3 −3
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ _start: 
# CHECK-NEXT:     Size: 12

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 4

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {
@@ -79,7 +79,7 @@ _start: 
# CHECK-NEXT:     Size: 0

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 4

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {
@@ -95,7 +95,7 @@ _start: 
# CHECK-NEXT:     Size: 0

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 4

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {

lld/test/elf2/basic64be.s

+4 −4
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ _start: 
# CHECK-NEXT:     Size: 12

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 4

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {
@@ -84,7 +84,7 @@ _start: 
# CHECK-NEXT:     Size: 0

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 4

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {
@@ -100,7 +100,7 @@ _start: 
# CHECK-NEXT:     Size: 0

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 4

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {
@@ -116,7 +116,7 @@ _start: 
# CHECK-NEXT:     Size: 24

# CHECK-NEXT:     Link: 0

# CHECK-NEXT:     Info: 0

# CHECK-NEXT:     AddressAlignment: 0

# CHECK-NEXT:     AddressAlignment: 1

# CHECK-NEXT:     EntrySize: 0

# CHECK-NEXT:   }

# CHECK-NEXT:   Section {