Skip to content

Commit

Permalink
[AMDGPU] Handle R_AMDGPU_ABS64 relocation
Browse files Browse the repository at this point in the history
This is needed for the following case (OpenCL example):
  __global int Var = 0; 
  __global int* Ptr[] = {&Var}; 
  ...

Differential Revision: https://reviews.llvm.org/D25815

llvm-svn: 284764
  • Loading branch information
kzhuravl committed Oct 20, 2016
1 parent 6e2c89b commit b625d17
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 3 deletions.
4 changes: 4 additions & 0 deletions lld/ELF/Target.cpp
Expand Up @@ -1487,6 +1487,9 @@ void AMDGPUTargetInfo::relocateOne(uint8_t *Loc, uint32_t Type,
case R_AMDGPU_REL32_LO:
write32le(Loc, Val);
break;
case R_AMDGPU_ABS64:
write64le(Loc, Val);
break;
case R_AMDGPU_GOTPCREL32_HI:
case R_AMDGPU_REL32_HI:
write32le(Loc, Val >> 32);
Expand All @@ -1499,6 +1502,7 @@ void AMDGPUTargetInfo::relocateOne(uint8_t *Loc, uint32_t Type,
RelExpr AMDGPUTargetInfo::getRelExpr(uint32_t Type, const SymbolBody &S) const {
switch (Type) {
case R_AMDGPU_ABS32:
case R_AMDGPU_ABS64:
return R_ABS;
case R_AMDGPU_REL32:
case R_AMDGPU_REL32_LO:
Expand Down
17 changes: 14 additions & 3 deletions lld/test/ELF/amdgpu-relocs.s
Expand Up @@ -5,7 +5,7 @@

# REQUIRES: amdgpu

.text
.text

kernel0:
s_mov_b32 s0, common_var0@GOTPCREL+4
Expand Down Expand Up @@ -50,11 +50,21 @@ kernel0:
.local local_var1
.local local_var2

# R_AMDGPU_ABS32:
.section nonalloc, "w", @progbits
.long var0, common_var2+4
.long var1, common_var1+8
.long var2, common_var0+12

# R_AMDGPU_ABS64:
.type ptr, @object
.data
.globl ptr
.p2align 3
ptr:
.quad temp
.size ptr, 8

# The relocation for local_var{0, 1, 2} and var should be resolved by the
# linker.
# CHECK: Relocations [
Expand All @@ -68,6 +78,7 @@ kernel0:
# CHECK-NEXT: R_AMDGPU_ABS64 global_var0 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 global_var1 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 global_var2 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 temp 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 weak_var0 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 weak_var1 0x0
# CHECK-NEXT: R_AMDGPU_ABS64 weak_var2 0x0
Expand All @@ -78,5 +89,5 @@ kernel0:
# CHECK-NEXT: ]

# OBJDUMP: Contents of section nonalloc:
# OBJDUMP-NEXT: 0000 00000000 04380000 00000000 08340000
# OBJDUMP-NEXT: 00000000 0c300000
# OBJDUMP-NEXT: 0000 00000000 14380000 00000000 18340000
# OBJDUMP-NEXT: 00000000 1c300000

0 comments on commit b625d17

Please sign in to comment.