diff --git a/lld/ELF/SymbolTable.cpp b/lld/ELF/SymbolTable.cpp
index b7803a2cab0f..c990543fbc47 100644
--- a/lld/ELF/SymbolTable.cpp
+++ b/lld/ELF/SymbolTable.cpp
@@ -32,51 +32,41 @@ template <class ELFT> void SymbolTable::init() {
                     Undefined<ELFT>("_start", Undefined<ELFT>::Synthetic));
 }
 
-void SymbolTable::addELFFile(ELFFileBase *File) {
+template <class ELFT> void SymbolTable::addELFFile(ELFFileBase *File) {
   if (const ELFFileBase *Old = getFirstELF()) {
     if (!Old->isCompatibleWith(*File))
       error(Twine(Old->getName() + " is incompatible with " + File->getName()));
   } else {
-    switch (File->getELFKind()) {
-    case ELF32LEKind:
-      init<ELF32LE>();
-      break;
-    case ELF32BEKind:
-      init<ELF32BE>();
-      break;
-    case ELF64LEKind:
-      init<ELF64LE>();
-      break;
-    case ELF64BEKind:
-      init<ELF64BE>();
-      break;
-    }
+    init<ELFT>();
   }
 
   if (auto *O = dyn_cast<ObjectFileBase>(File)) {
     ObjectFiles.emplace_back(O);
-    for (SymbolBody *Body : O->getSymbols()) {
-      switch (File->getELFKind()) {
-      case ELF32LEKind:
-        resolve<ELF32LE>(Body);
-        break;
-      case ELF32BEKind:
-        resolve<ELF32BE>(Body);
-        break;
-      case ELF64LEKind:
-        resolve<ELF64LE>(Body);
-        break;
-      case ELF64BEKind:
-        resolve<ELF64BE>(Body);
-        break;
-      }
-    }
+    for (SymbolBody *Body : O->getSymbols())
+      resolve<ELFT>(Body);
   }
 
   if (auto *S = dyn_cast<SharedFileBase>(File))
     SharedFiles.emplace_back(S);
 }
 
+void SymbolTable::addELFFile(ELFFileBase *File) {
+  switch (File->getELFKind()) {
+    case ELF32LEKind:
+      addELFFile<ELF32LE>(File);
+      break;
+    case ELF32BEKind:
+      addELFFile<ELF32BE>(File);
+      break;
+    case ELF64LEKind:
+      addELFFile<ELF64LE>(File);
+      break;
+    case ELF64BEKind:
+      addELFFile<ELF64BE>(File);
+      break;
+  }
+}
+
 void SymbolTable::reportRemainingUndefines() {
   for (auto &I : Symtab) {
     SymbolBody *Body = I.second->Body;
diff --git a/lld/ELF/SymbolTable.h b/lld/ELF/SymbolTable.h
index 80dc65ebc9e1..01a368f4d0b7 100644
--- a/lld/ELF/SymbolTable.h
+++ b/lld/ELF/SymbolTable.h
@@ -54,6 +54,7 @@ public:
   }
 
 private:
+  template <class ELFT> void addELFFile(ELFFileBase *File);
   void addELFFile(ELFFileBase *File);
 
   template <class ELFT> void init();