diff options
| author | George Rimar <grimar@accesssoftek.com> | 2016-11-16 17:45:45 +0000 |
|---|---|---|
| committer | George Rimar <grimar@accesssoftek.com> | 2016-11-16 17:45:45 +0000 |
| commit | 7759e5b61b10241f7b5e33a732c72202383b177d (patch) | |
| tree | c45196520156d9d220c371e96b0375b9e7e3144b | |
| parent | 7f3d51f8403a2a6b7258b5423addb8bc148c11c1 (diff) | |
| download | llvm-7759e5b61b10241f7b5e33a732c72202383b177d.zip llvm-7759e5b61b10241f7b5e33a732c72202383b177d.tar.gz llvm-7759e5b61b10241f7b5e33a732c72202383b177d.tar.bz2 | |
[ELF] - Change error message according to review comment. NFC.
Forgot about that, I am sorry.
llvm-svn: 287123
| -rw-r--r-- | lld/ELF/Relocations.cpp | 2 | ||||
| -rw-r--r-- | lld/test/ELF/copy-errors.s | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lld/ELF/Relocations.cpp b/lld/ELF/Relocations.cpp index 6aa0444..f68c9cf 100644 --- a/lld/ELF/Relocations.cpp +++ b/lld/ELF/Relocations.cpp @@ -454,7 +454,7 @@ static RelExpr adjustExpr(const elf::ObjectFile<ELFT> &File, SymbolBody &Body, } 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()) { diff --git a/lld/test/ELF/copy-errors.s b/lld/test/ELF/copy-errors.s index 5be0aa6..c370c4b 100644 --- a/lld/test/ELF/copy-errors.s +++ b/lld/test/ELF/copy-errors.s @@ -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 |