[lld] r284764 - [AMDGPU] Handle R_AMDGPU_ABS64 relocation

[Konstantin Zhuravlyov via llvm-commits]

Author: kzhuravl
Date: Thu Oct 20 13:34:58 2016
New Revision: 284764

URL: http://llvm.org/viewvc/llvm-project?rev=284764&view=rev
Log:
[AMDGPU] Handle R_AMDGPU_ABS64 relocation

This is needed for the following case (OpenCL example):
  __global int Var = 0; 
  __global int* Ptr[] = {&Var}; 
  ...

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

Modified:
    lld/trunk/ELF/Target.cpp
    lld/trunk/test/ELF/amdgpu-relocs.s

Modified: lld/trunk/ELF/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=284764&r1=284763&r2=284764&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Thu Oct 20 13:34:58 2016
@@ -1487,6 +1487,9 @@ void AMDGPUTargetInfo::relocateOne(uint8
   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);
@@ -1499,6 +1502,7 @@ void AMDGPUTargetInfo::relocateOne(uint8
 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:

Modified: lld/trunk/test/ELF/amdgpu-relocs.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/amdgpu-relocs.s?rev=284764&r1=284763&r2=284764&view=diff
==============================================================================
--- lld/trunk/test/ELF/amdgpu-relocs.s (original)
+++ lld/trunk/test/ELF/amdgpu-relocs.s Thu Oct 20 13:34:58 2016
@@ -5,7 +5,7 @@
 
 # REQUIRES: amdgpu
 
-  .text
+.text
 
 kernel0:
   s_mov_b32 s0, common_var0 at GOTPCREL+4
@@ -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 [
@@ -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
@@ -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