[ELF] r275383 reverted due to buildbot failure

llvm-svn: 275385

lld/ELF/LinkerScript.cpp

@@ -309,10 +309,10 @@ int LinkerScript<ELFT>::compareSections(StringRef A, StringRef B) {
   return I < J ? -1 : 1;
 }
 
-template <class ELFT> void LinkerScript<ELFT>::addScriptedSymbols() {
+template <class ELFT>
+void LinkerScript<ELFT>::addScriptedSymbols() {
   for (SectionsCommand &Cmd : Opt.Commands)
-    if (Cmd.Kind == SymbolAssignmentKind &&
-        Symtab<ELFT>::X->find(Cmd.Name) == nullptr)
+    if (Cmd.Kind == SymbolAssignmentKind)
       Symtab<ELFT>::X->addAbsolute(Cmd.Name, STV_DEFAULT);
 }
 

lld/test/ELF/linkerscript-symbol-conflict.s

@@ -1,11 +0,0 @@
-# REQUIRES: x86
-# RUN: llvm-mc -filetype=obj -triple=x86_64-unknown-linux %s -o %t
-
-# RUN: echo "SECTIONS {.text : {*(.text.*)} end = .;}" > %t.script
-# RUN: ld.lld -o %t1 --script %t.script %t
-# RUN: llvm-objdump -t %t1 | FileCheck %s
-# CHECK: 0000000000000121         *ABS*    00000000 end
-
-.global _start
-_start:
- nop