From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Wed, 23 Apr 2014 14:42:32 +0000 (+0000)
Subject: Centralize handling of ELF_Other_ThumbFunc.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=5473dc7ce0d625a7822fa45209e73c8069825bcf;p=oota-llvm.git

Centralize handling of ELF_Other_ThumbFunc.
No functionality change.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@206988 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/MC/ELFObjectWriter.cpp b/lib/MC/ELFObjectWriter.cpp
index 636d449e207..f11ec79210a 100644
--- a/lib/MC/ELFObjectWriter.cpp
+++ b/lib/MC/ELFObjectWriter.cpp
@@ -513,7 +513,8 @@ uint64_t ELFObjectWriter::SymbolValue(MCSymbolData &OrigData,
     }
   }
 
-  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(SymbolTableWriter &Writer, ELFSymbolData &MSD,
   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();