diff options
| author | George Rimar <grimar@accesssoftek.com> | 2016-04-14 13:00:03 +0000 |
|---|---|---|
| committer | George Rimar <grimar@accesssoftek.com> | 2016-04-14 13:00:03 +0000 |
| commit | 4e8cf85b74176e8c2e2c6ebbf4fa952d0d9791da (patch) | |
| tree | c661d180327a238594bf671978d29df04c1c0b2f | |
| parent | c8dda336bbb7edd22df9dfd257d64b7e68514c1f (diff) | |
| download | bcm5719-llvm-4e8cf85b74176e8c2e2c6ebbf4fa952d0d9791da.tar.gz bcm5719-llvm-4e8cf85b74176e8c2e2c6ebbf4fa952d0d9791da.zip | |
Combine code branch into single line. NFC.
llvm-svn: 266298
| -rw-r--r-- | lld/ELF/Writer.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lld/ELF/Writer.cpp b/lld/ELF/Writer.cpp index 45add5b39be..cc1d015e60e 100644 --- a/lld/ELF/Writer.cpp +++ b/lld/ELF/Writer.cpp @@ -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 |
