[lld] r268187 - Should fix all remaining MSVC problems.

Peter Collingbourne via llvm-commits llvm-commits at lists.llvm.org
Sat Apr 30 23:00:10 PDT 2016


Author: pcc
Date: Sun May  1 01:00:09 2016
New Revision: 268187

URL: http://llvm.org/viewvc/llvm-project?rev=268187&view=rev
Log:
Should fix all remaining MSVC problems.

Modified:
    lld/trunk/ELF/InputFiles.cpp

Modified: lld/trunk/ELF/InputFiles.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/InputFiles.cpp?rev=268187&r1=268186&r2=268187&view=diff
==============================================================================
--- lld/trunk/ELF/InputFiles.cpp (original)
+++ lld/trunk/ELF/InputFiles.cpp Sun May  1 01:00:09 2016
@@ -331,11 +331,11 @@ SymbolBody *elf::ObjectFile<ELFT>::creat
 
   switch (Sym->st_shndx) {
   case SHN_UNDEF:
-    return Symtab<ELFT>::X
+    return elf::Symtab<ELFT>::X
         ->addUndefined(Name, Binding, Sym->st_other, Sym->getType(), this)
         ->body();
   case SHN_COMMON:
-    return Symtab<ELFT>::X
+    return elf::Symtab<ELFT>::X
         ->addCommon(Name, Sym->st_size, Sym->st_value, Binding, Sym->st_other,
                     Sym->getType(), this)
         ->body();
@@ -348,10 +348,10 @@ SymbolBody *elf::ObjectFile<ELFT>::creat
   case STB_WEAK:
   case STB_GNU_UNIQUE:
     if (Sec == &InputSection<ELFT>::Discarded)
-      return Symtab<ELFT>::X
+      return elf::Symtab<ELFT>::X
           ->addUndefined(Name, Binding, Sym->st_other, Sym->getType(), this)
           ->body();
-    return Symtab<ELFT>::X->addRegular(Name, *Sym, Sec)->body();
+    return elf::Symtab<ELFT>::X->addRegular(Name, *Sym, Sec)->body();
   }
 }
 
@@ -506,7 +506,7 @@ template <class ELFT> void SharedFile<EL
       if (VersymIndex == 0 || (VersymIndex & VERSYM_HIDDEN))
         continue;
     }
-    Symtab<ELFT>::X->addShared(this, Name, Sym, Verdefs[VersymIndex]);
+    elf::Symtab<ELFT>::X->addShared(this, Name, Sym, Verdefs[VersymIndex]);
   }
 }
 




More information about the llvm-commits mailing list