projects
/
platform
/
upstream
/
llvm.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7e49e3d
)
Merge duplicated cases. NFC.
author
Rafael Espindola
<rafael.espindola@gmail.com>
Thu, 14 Apr 2016 15:56:14 +0000
(15:56 +0000)
committer
Rafael Espindola
<rafael.espindola@gmail.com>
Thu, 14 Apr 2016 15:56:14 +0000
(15:56 +0000)
llvm-svn: 266328
lld/ELF/Target.cpp
patch
|
blob
|
history
diff --git
a/lld/ELF/Target.cpp
b/lld/ELF/Target.cpp
index
a1b81cc
..
2f9e352
100644
(file)
--- a/
lld/ELF/Target.cpp
+++ b/
lld/ELF/Target.cpp
@@
-532,13
+532,6
@@
void X86TargetInfo::relocateOne(uint8_t *Loc, uint32_t Type,
case R_386_32:
write32le(Loc, Val);
break;
- case R_386_GOT32: {
- uint64_t V = Val - Out<ELF32LE>::Got->getVA() -
- Out<ELF32LE>::Got->getNumEntries() * 4;
- checkInt<32>(V, Type);
- write32le(Loc, V);
- break;
- }
case R_386_GOTOFF:
write32le(Loc, Val - Out<ELF32LE>::Got->getVA());
break;
@@
-549,6
+542,7
@@
void X86TargetInfo::relocateOne(uint8_t *Loc, uint32_t Type,
case R_386_PLT32:
write32le(Loc, Val);
break;
+ case R_386_GOT32:
case R_386_TLS_GD:
case R_386_TLS_LDM:
case R_386_TLS_TPOFF: {