[lld] r267161 - Try to fix Windows lld build.

[Rafael Espíndola via llvm-commits]

Thanks. So sorry I missed this.

On 22 April 2016 at 11:23, Nico Weber via llvm-commits
<llvm-commits at lists.llvm.org> wrote:
> Author: nico
> Date: Fri Apr 22 10:23:02 2016
> New Revision: 267161
>
> URL: http://llvm.org/viewvc/llvm-project?rev=267161&view=rev
> Log:
> 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
>
> Modified:
>     lld/trunk/ELF/MarkLive.cpp
>
> Modified: lld/trunk/ELF/MarkLive.cpp
> URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/MarkLive.cpp?rev=267161&r1=267160&r2=267161&view=diff
> ==============================================================================
> --- lld/trunk/ELF/MarkLive.cpp (original)
> +++ lld/trunk/ELF/MarkLive.cpp Fri Apr 22 10:23:02 2016
> @@ -46,7 +46,7 @@ static void forEachSuccessor(InputSectio
>    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) {
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits