[lld] r287123 - [ELF] - Change error message according to review comment. NFC.

[George Rimar via llvm-commits]

Author: grimar
Date: Wed Nov 16 11:45:45 2016
New Revision: 287123

URL: http://llvm.org/viewvc/llvm-project?rev=287123&view=rev
Log:
[ELF] - Change error message according to review comment. NFC.

Forgot about that, I am sorry.

Modified:
    lld/trunk/ELF/Relocations.cpp
    lld/trunk/test/ELF/copy-errors.s

Modified: lld/trunk/ELF/Relocations.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Relocations.cpp?rev=287123&r1=287122&r2=287123&view=diff
==============================================================================
--- lld/trunk/ELF/Relocations.cpp (original)
+++ lld/trunk/ELF/Relocations.cpp Wed Nov 16 11:45:45 2016
@@ -454,7 +454,7 @@ static RelExpr adjustExpr(const elf::Obj
   }
   if (Body.getVisibility() != STV_DEFAULT) {
     error(getLocation(S, RelOff) + ": cannot preempt symbol '" +
-          Body.getName() + "' previously defined in " + getFilename(Body.File));
+          Body.getName() + "' defined in " + getFilename(Body.File));
     return Expr;
   }
   if (Body.isObject()) {

Modified: lld/trunk/test/ELF/copy-errors.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/copy-errors.s?rev=287123&r1=287122&r2=287123&view=diff
==============================================================================
--- lld/trunk/test/ELF/copy-errors.s (original)
+++ lld/trunk/test/ELF/copy-errors.s Wed Nov 16 11:45:45 2016
@@ -9,7 +9,7 @@ _start:
 
 
 call bar
-// CHECK: {{.*}}.o (.text+0x1): cannot preempt symbol 'bar' previously defined in {{.*}}.so
+// CHECK: {{.*}}.o (.text+0x1): cannot preempt symbol 'bar' defined in {{.*}}.so
 
 call zed
 // CHECK: symbol 'zed' defined in {{.*}}.so is missing type