maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Remove duplicate "error:" from an error message. 

This patch also simplifies the code a bit which wasn't committed in
https://reviews.llvm.org/r330600.

llvm-svn: 330644
This commit is contained in:
Rui Ueyama 2018-04-23 20:34:35 +00:00
parent 88b7be0d13
commit d134d2e509
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lld/ELF/InputSection.cpp
View File

@ -740,13 +740,13 @@ void InputSectionBase::relocateAlloc(uint8_t *Buf, uint8_t *BufEnd) {
break;
case R_PPC_PLT_OPD:
// Patch a nop (0x60000000) to a ld.
if (BufLoc + 8 <= BufEnd && read32(BufLoc + 4) == 0x60000000) {
write32(BufLoc + 4, 0xe8410018); // ld %r2, 24(%r1)
} else {
error(getErrorLocation(BufLoc) + "error: call lacks nop, can't restore toc.");
return;
if (BufLoc + 8 > BufEnd || read32(BufLoc + 4) != 0x60000000) {
error(getErrorLocation(BufLoc) + "call lacks nop, can't restore toc");
break;
}
LLVM_FALLTHROUGH;
write32(BufLoc + 4, 0xe8410018); // ld %r2, 24(%r1)
Target->relocateOne(BufLoc, Type, TargetVA);
break;
default:
Target->relocateOne(BufLoc, Type, TargetVA);
break;

2
lld/test/ELF/ppc64-error-toc-restore.s
View File

@ -5,7 +5,7 @@
// REQUIRES: ppc
# Calling external function bar needs a nop
// CHECK: error: call lacks nop, can't restore toc
// CHECK: call lacks nop, can't restore toc
.text
.abiversion 2

2
lld/test/ELF/ppc64-error-toc-tail-call.s
View File

@ -5,7 +5,7 @@
// REQUIRES: ppc
# A tail call to an external function without a nop should issue an error.
// CHECK: error: call lacks nop, can't restore toc
// CHECK: call lacks nop, can't restore toc
.text
.abiversion 2