aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael Espindola <rafael.espindola@gmail.com>2016-06-09 20:42:04 +0000
committerRafael Espindola <rafael.espindola@gmail.com>2016-06-09 20:42:04 +0000
commit912845d110b2817cbb09b2e4e89c146615fbc669 (patch)
tree39f48a1f41aef8272fa07fbac784cdf4b790a6bd
parent3cb14de85396053c57114faba161469ce9e4715f (diff)
Use errorDynRel like every other target.
git-svn-id: https://llvm.org/svn/llvm-project/lld/trunk@272305 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--ELF/Target.cpp2
-rw-r--r--test/ELF/x86-64-dyn-rel-error.s2
-rw-r--r--test/ELF/x86-64-dyn-rel-error2.s2
3 files changed, 3 insertions, 3 deletions
diff --git a/ELF/Target.cpp b/ELF/Target.cpp
index 199e87364..a064e4851 100644
--- a/ELF/Target.cpp
+++ b/ELF/Target.cpp
@@ -618,7 +618,7 @@ void X86_64TargetInfo::writePlt(uint8_t *Buf, uint64_t GotEntryAddr,
uint32_t X86_64TargetInfo::getDynRel(uint32_t Type) const {
if (Type == R_X86_64_PC32 || Type == R_X86_64_32)
- error(getRelName(Type) + " cannot be a dynamic relocation");
+ errorDynRel(Type);
return Type;
}
diff --git a/test/ELF/x86-64-dyn-rel-error.s b/test/ELF/x86-64-dyn-rel-error.s
index 093156365..1f94f4f06 100644
--- a/test/ELF/x86-64-dyn-rel-error.s
+++ b/test/ELF/x86-64-dyn-rel-error.s
@@ -9,4 +9,4 @@ _start:
.data
.long bar
-// CHECK: R_X86_64_32 cannot be a dynamic relocation
+// CHECK: R_X86_64_32 cannot be used when making a shared object; recompile with -fPIC.
diff --git a/test/ELF/x86-64-dyn-rel-error2.s b/test/ELF/x86-64-dyn-rel-error2.s
index 382b2b2e8..d1d6986d2 100644
--- a/test/ELF/x86-64-dyn-rel-error2.s
+++ b/test/ELF/x86-64-dyn-rel-error2.s
@@ -9,4 +9,4 @@ _start:
.data
.long bar - .
-// CHECK: R_X86_64_PC32 cannot be a dynamic relocation
+// CHECK: R_X86_64_PC32 cannot be used when making a shared object; recompile with -fPIC.