diff options
| author | Vlad Tsyrklevich <vlad@tsyrklevich.net> | 2019-08-28 13:15:08 +0000 |
|---|---|---|
| committer | Vlad Tsyrklevich <vlad@tsyrklevich.net> | 2019-08-28 13:15:08 +0000 |
| commit | aba62e9c00e5ada889438aa19dfb4b13e9870044 (patch) | |
| tree | a1d426c3f536088a9e2fe56f4f677d333d90099c /llvm/lib/ObjectYAML/ELFEmitter.cpp | |
| parent | 14e07d7f4bf21c04f6177c6022257317c8c6f7e4 (diff) | |
| download | bcm5719-llvm-aba62e9c00e5ada889438aa19dfb4b13e9870044.tar.gz bcm5719-llvm-aba62e9c00e5ada889438aa19dfb4b13e9870044.zip | |
Revert "[yaml2obj] - Don't allow setting StOther and Other/Visibility at the same time."
This reverts commit r370032, it was causing check-llvm failures on
sanitizer-x86_64-linux-bootstrap-msan
llvm-svn: 370198
Diffstat (limited to 'llvm/lib/ObjectYAML/ELFEmitter.cpp')
| -rw-r--r-- | llvm/lib/ObjectYAML/ELFEmitter.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/llvm/lib/ObjectYAML/ELFEmitter.cpp b/llvm/lib/ObjectYAML/ELFEmitter.cpp index 96b13e4e530..6a2d28e16e2 100644 --- a/llvm/lib/ObjectYAML/ELFEmitter.cpp +++ b/llvm/lib/ObjectYAML/ELFEmitter.cpp @@ -464,12 +464,7 @@ toELFSymbols(NameToIdxMap &SN2I, ArrayRef<ELFYAML::Symbol> Symbols, } // else Symbol.st_shndex == SHN_UNDEF (== 0), since it was zero'd earlier. Symbol.st_value = Sym.Value; - - if (Sym.Other) - Symbol.st_other = *Sym.Other; - else if (Sym.StOther) - Symbol.st_other = *Sym.StOther; - + Symbol.st_other = Sym.Other; Symbol.st_size = Sym.Size; } |
