Index: lld/trunk/ELF/InputFiles.cpp
===================================================================
--- lld/trunk/ELF/InputFiles.cpp
+++ lld/trunk/ELF/InputFiles.cpp
@@ -807,6 +807,12 @@
       continue;
     }
 
+    if (Sym.getBinding() == STB_LOCAL) {
+      warn("Found local symbol '" + Name +
+           "' in global part of symbol table in file " + toString(this));
+      continue;
+    }
+
     // Ignore local symbols.
     if (Versym && VersymIndex == VER_NDX_LOCAL)
       continue;
Index: lld/trunk/ELF/SymbolTable.cpp
===================================================================
--- lld/trunk/ELF/SymbolTable.cpp
+++ lld/trunk/ELF/SymbolTable.cpp
@@ -495,11 +495,7 @@
   if (WasInserted || ((S->isUndefined() || S->isLazy()) &&
                       S->getVisibility() == STV_DEFAULT)) {
     uint8_t Binding = S->Binding;
-    uint8_t OrigBinding = Sym.getBinding();
-    if (OrigBinding == STB_LOCAL)
-      error("Found local symbol '" + Name +
-            "' in global part of symbol table in file " + toString(File));
-    replaceSymbol<SharedSymbol>(S, File, Name, OrigBinding, Sym.st_other,
+    replaceSymbol<SharedSymbol>(S, File, Name, Sym.getBinding(), Sym.st_other,
                                 Sym.getType(), Sym.st_value, Sym.st_size,
                                 Alignment, VerdefIndex);
     if (!WasInserted) {
Index: lld/trunk/test/ELF/invalid-local-symbol-in-dso.s
===================================================================
--- lld/trunk/test/ELF/invalid-local-symbol-in-dso.s
+++ lld/trunk/test/ELF/invalid-local-symbol-in-dso.s
@@ -1,5 +1,14 @@
-# RUN: llvm-mc %s -o %t.o -filetype=obj -triple x86_64-pc-linux
+# REQUIRES: x86
 
 # We used to crash on this
-# RUN: not ld.lld %t.o %p/Inputs/local-symbol-in-dso.so -o %t 2>&1 | FileCheck %s
-# CHECK: Found local symbol 'foo' in global part of symbol table in file {{.*}}local-symbol-in-dso.so
+# RUN: echo | llvm-mc - -o %t1.o -filetype=obj -triple x86_64-pc-linux
+# RUN: ld.lld %t1.o %p/Inputs/local-symbol-in-dso.so -o %t 2>&1 | \
+# RUN:   FileCheck -check-prefix=WARN %s
+# WARN: Found local symbol 'foo' in global part of symbol table in file {{.*}}local-symbol-in-dso.so
+
+# RUN: llvm-mc %s -o %t2.o -filetype=obj -triple x86_64-pc-linux
+# RUN: not ld.lld %t2.o %p/Inputs/local-symbol-in-dso.so -o %t
+
+.globl main
+main:
+  movq foo@GOTTPOFF(%rip), %rax