diff options
| author | Rui Ueyama <ruiu@google.com> | 2016-01-07 20:53:30 +0000 |
|---|---|---|
| committer | Rui Ueyama <ruiu@google.com> | 2016-01-07 20:53:30 +0000 |
| commit | 6ffb42ad0f8b2efd218f9426494879baedf3be45 (patch) | |
| tree | 2a7056f8e27f7991c592136dcd99dc3bcd08e1ae | |
| parent | 1300e6b15a2e203253d9c6b224bfe8551d302509 (diff) | |
| download | bcm5719-llvm-6ffb42ad0f8b2efd218f9426494879baedf3be45.tar.gz bcm5719-llvm-6ffb42ad0f8b2efd218f9426494879baedf3be45.zip | |
Revert "Remove unnecessary type casts."
This reverts commit r257080 because it caused GCC to emit "enumeral
and non-enumeral type in conditional expression" warning.
llvm-svn: 257096
| -rw-r--r-- | lld/ELF/OutputSections.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lld/ELF/OutputSections.cpp b/lld/ELF/OutputSections.cpp index bccde83c4da..29f12970e48 100644 --- a/lld/ELF/OutputSections.cpp +++ b/lld/ELF/OutputSections.cpp @@ -1161,7 +1161,8 @@ template <class ELFT> void MergeOutputSection<ELFT>::finalize() { template <class ELFT> StringTableSection<ELFT>::StringTableSection(StringRef Name, bool Dynamic) - : OutputSectionBase<ELFT>(Name, SHT_STRTAB, Dynamic ? SHF_ALLOC : 0), + : OutputSectionBase<ELFT>(Name, SHT_STRTAB, + Dynamic ? (uintX_t)SHF_ALLOC : 0), Dynamic(Dynamic) { this->Header.sh_addralign = 1; } @@ -1234,7 +1235,7 @@ SymbolTableSection<ELFT>::SymbolTableSection( SymbolTable<ELFT> &Table, StringTableSection<ELFT> &StrTabSec) : OutputSectionBase<ELFT>(StrTabSec.isDynamic() ? ".dynsym" : ".symtab", StrTabSec.isDynamic() ? SHT_DYNSYM : SHT_SYMTAB, - StrTabSec.isDynamic() ? SHF_ALLOC : 0), + StrTabSec.isDynamic() ? (uintX_t)SHF_ALLOC : 0), Table(Table), StrTabSec(StrTabSec) { this->Header.sh_entsize = sizeof(Elf_Sym); this->Header.sh_addralign = ELFT::Is64Bits ? 8 : 4; |
