commit 1b222b1451d8c39eea01b56f946f1ff8a9a22096
author Tamas Berghammer <tberghammer@google.com> Thu Apr 16 14:06:18 2015 +0000
committer Tamas Berghammer <tberghammer@google.com> Thu Apr 16 14:06:18 2015 +0000
tree db922b7c7abd8dd3fa954e8d4ff6b4bf396facc9
parent 1fab7b97908ded03922d180be9e64ad9f58026ca

Fix thumb symbol value fixup in ObjectFileELF

llvm-svn: 235098

lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp

diff --git a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
index 9c0ec8e..8974280 100644
--- a/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
+++ b/lldb/source/Plugins/ObjectFile/ELF/ObjectFileELF.cpp
@@ -1963,7 +1963,7 @@
 
         // symbol_value_offset may contain 0 for ARM symbols or -1 for
         // THUMB symbols. See above for more details.
-        uint64_t symbol_value = symbol.st_value | symbol_value_offset;
+        uint64_t symbol_value = symbol.st_value + symbol_value_offset;
         if (symbol_section_sp && CalculateType() != ObjectFile::Type::eTypeObjectFile)
             symbol_value -= symbol_section_sp->GetFileAddress();
         bool is_global = symbol.getBinding() == STB_GLOBAL;