From 6a4a0799a526542b446139e1be7215477aea2a01 Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Wed, 23 Apr 2014 14:42:32 +0000 Subject: Centralize handling of ELF_Other_ThumbFunc. No functionality change. llvm-svn: 206988 --- llvm/lib/MC/ELFObjectWriter.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'llvm/lib/MC/ELFObjectWriter.cpp') diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index 636d449e207..f11ec79210a 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/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(); -- cgit v1.2.3