aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2017-06-13 01:25:19 +0000
committerEd Maste <emaste@FreeBSD.org>2017-06-13 01:25:19 +0000
commita443511817713e5c8e027194c2dc806e59966f29 (patch)
tree2807272aef111d08776510fc8adce95115736c81 /contrib
parent993114dd2a6094cc985f3c567e188a7f0f3be522 (diff)
downloadsrc-a443511817713e5c8e027194c2dc806e59966f29.tar.gz
src-a443511817713e5c8e027194c2dc806e59966f29.zip
Notes
Diffstat (limited to 'contrib')
-rw-r--r--contrib/llvm/tools/lld/ELF/InputSection.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/contrib/llvm/tools/lld/ELF/InputSection.cpp b/contrib/llvm/tools/lld/ELF/InputSection.cpp
index 36936099011a..6b1e92891b98 100644
--- a/contrib/llvm/tools/lld/ELF/InputSection.cpp
+++ b/contrib/llvm/tools/lld/ELF/InputSection.cpp
@@ -255,7 +255,7 @@ static uint32_t getARMUndefinedRelativeWeakVA(uint32_t Type, uint32_t A,
uint32_t P) {
switch (Type) {
case R_ARM_THM_JUMP11:
- return P + 2 + A;
+ return P + 2;
case R_ARM_CALL:
case R_ARM_JUMP24:
case R_ARM_PC24:
@@ -263,12 +263,12 @@ static uint32_t getARMUndefinedRelativeWeakVA(uint32_t Type, uint32_t A,
case R_ARM_PREL31:
case R_ARM_THM_JUMP19:
case R_ARM_THM_JUMP24:
- return P + 4 + A;
+ return P + 4;
case R_ARM_THM_CALL:
// We don't want an interworking BLX to ARM
- return P + 5 + A;
+ return P + 5;
default:
- return P + A;
+ return A;
}
}
@@ -279,9 +279,9 @@ static uint64_t getAArch64UndefinedRelativeWeakVA(uint64_t Type, uint64_t A,
case R_AARCH64_CONDBR19:
case R_AARCH64_JUMP26:
case R_AARCH64_TSTBR14:
- return P + 4 + A;
+ return P + 4;
default:
- return P + A;
+ return A;
}
}