[llvm] r206988 - Centralize handling of ELF_Other_ThumbFunc.

[Rafael Espindola]

Author: rafael
Date: Wed Apr 23 09:42:32 2014
New Revision: 206988

URL: http://llvm.org/viewvc/llvm-project?rev=206988&view=rev
Log:
Centralize handling of ELF_Other_ThumbFunc.
No functionality change.

Modified:
    llvm/trunk/lib/MC/ELFObjectWriter.cpp

Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=206988&r1=206987&r2=206988&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Wed Apr 23 09:42:32 2014
@@ -513,7 +513,8 @@ uint64_t ELFObjectWriter::SymbolValue(MC
     }
   }
 
-  if (Data && Data->getFlags() & ELF_Other_ThumbFunc)
+  if ((Data && Data->getFlags() & ELF_Other_ThumbFunc) ||
+      OrigData.getFlags() & ELF_Other_ThumbFunc)
     Res |= 1;
 
   if (!Symbol || !Symbol->isInSection())
@@ -644,8 +645,6 @@ void ELFObjectWriter::WriteSymbol(Symbol
   Other |= Visibility;
 
   uint64_t Value = SymbolValue(OrigData, Layout);
-  if (OrigData.getFlags() & ELF_Other_ThumbFunc)
-    Value |= 1;
   uint64_t Size = 0;
 
   const MCExpr *ESize = OrigData.getSize();