[lld] r275385 - [ELF] r275383 reverted due to buildbot failure

[Eugene Leviant via llvm-commits]

Author: evgeny777
Date: Thu Jul 14 04:21:24 2016
New Revision: 275385

URL: http://llvm.org/viewvc/llvm-project?rev=275385&view=rev
Log:
[ELF] r275383 reverted due to buildbot failure

Removed:
    lld/trunk/test/ELF/linkerscript-symbol-conflict.s
Modified:
    lld/trunk/ELF/LinkerScript.cpp

Modified: lld/trunk/ELF/LinkerScript.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/LinkerScript.cpp?rev=275385&r1=275384&r2=275385&view=diff
==============================================================================
--- lld/trunk/ELF/LinkerScript.cpp (original)
+++ lld/trunk/ELF/LinkerScript.cpp Thu Jul 14 04:21:24 2016
@@ -309,10 +309,10 @@ int LinkerScript<ELFT>::compareSections(
   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);
 }
 

Removed: lld/trunk/test/ELF/linkerscript-symbol-conflict.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/linkerscript-symbol-conflict.s?rev=275384&view=auto
==============================================================================
--- lld/trunk/test/ELF/linkerscript-symbol-conflict.s (original)
+++ lld/trunk/test/ELF/linkerscript-symbol-conflict.s (removed)
@@ -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