intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-26 21:53:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Combine code branch into single line. NFC.

Browse Source 
llvm-svn: 266298
This commit is contained in:
George Rimar
2016-04-14 13:00:03 +00:00
parent c8dda336bb
commit 4e8cf85b74
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lld/ELF/Writer.cpp
View File

@@ -1051,11 +1051,8 @@ OutputSectionFactory<ELFT>::createKey(InputSectionBase<ELFT> *C,
// This makes each output section simple and keeps a single level mapping from
// input to output.
uintX_t Alignment = 0;
if (isa<MergeInputSection<ELFT>>(C)) {
Alignment = H->sh_addralign;
if (H->sh_entsize > Alignment)
Alignment = H->sh_entsize;
}
if (isa<MergeInputSection<ELFT>>(C))
Alignment = std::max(H->sh_addralign, H->sh_entsize);
// GNU as can give .eh_frame secion type SHT_PROGBITS or SHT_X86_64_UNWIND
// depending on the construct. We want to canonicalize it so that