From: Nico Weber <nicolasweber@gmx.de>
Date: Fri, 22 Apr 2016 15:23:02 +0000 (+0000)
Subject: Try to fix Windows lld build.
X-Git-Tag: llvmorg-3.9.0-rc1~8301
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=104871f433fdfc695a0e0e87936953a97fcccf7b;p=platform%2Fupstream%2Fllvm.git

Try to fix Windows lld build.

llvm\tools\lld\ELF\MarkLive.cpp(49): error C2872: 'ObjectFile': ambiguous symbol
llvm\tools\lld\elf\InputFiles.h(100): note: could be 'lld::elf::ObjectFile'
llvm\include\llvm/Object/IRObjectFile.h(26): note: or       'llvm::object::ObjectFile'
llvm\tools\lld\ELF\MarkLive.cpp(133): note: see reference to function template instantiation
    'void forEachSuccessor<ELFT>(lld::elf::InputSection<ELFT> *,
                                 std::function<void (lld::elf::InputSectionBase<ELFT> *)>)'
    being compiled with
                [ ELFT=llvm::object::ELF32LE ]
llvm\tools\lld\ELF\MarkLive.cpp(136): note: see reference to function template instantiation
    'void lld::elf::markLive<llvm::object::ELF32LE>(lld::elf::SymbolTable<llvm::object::ELF32LE> *)
    being compiled

llvm-svn: 267161
---

diff --git a/lld/ELF/MarkLive.cpp b/lld/ELF/MarkLive.cpp
index 4c8e359..3bf0548 100644
--- a/lld/ELF/MarkLive.cpp
+++ b/lld/ELF/MarkLive.cpp
@@ -46,7 +46,7 @@ static void forEachSuccessor(InputSection<ELFT> *Sec,
   typedef typename ELFT::Rela Elf_Rela;
   typedef typename ELFT::Shdr Elf_Shdr;
 
-  ObjectFile<ELFT> *File = Sec->getFile();
+  lld::elf::ObjectFile<ELFT> *File = Sec->getFile();
   ELFFile<ELFT> &Obj = File->getObj();
   for (const Elf_Shdr *RelSec : Sec->RelocSections) {
     if (RelSec->sh_type == SHT_RELA) {