[lld] r272303 - Also reject 32 bit dynamic relocs when producing executable.

[Rafael Espindola via llvm-commits]

Author: rafael
Date: Thu Jun  9 15:35:27 2016
New Revision: 272303

URL: http://llvm.org/viewvc/llvm-project?rev=272303&view=rev
Log:
Also reject 32 bit dynamic relocs when producing executable.

They point to a shared library, so they would still overflow at runtime.

Added:
    lld/trunk/test/ELF/x86-64-dyn-rel-error.s
    lld/trunk/test/ELF/x86-64-dyn-rel-error2.s
Modified:
    lld/trunk/ELF/Target.cpp
    lld/trunk/test/ELF/verneed-as-needed-weak.s

Modified: lld/trunk/ELF/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=272303&r1=272302&r2=272303&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Thu Jun  9 15:35:27 2016
@@ -617,7 +617,7 @@ void X86_64TargetInfo::writePlt(uint8_t
 }
 
 uint32_t X86_64TargetInfo::getDynRel(uint32_t Type) const {
-  if (Config->Shared && (Type == R_X86_64_PC32 || Type == R_X86_64_32))
+  if (Type == R_X86_64_PC32 || Type == R_X86_64_32)
     error(getRelName(Type) + " cannot be a dynamic relocation");
   return Type;
 }

Modified: lld/trunk/test/ELF/verneed-as-needed-weak.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/verneed-as-needed-weak.s?rev=272303&r1=272302&r2=272303&view=diff
==============================================================================
--- lld/trunk/test/ELF/verneed-as-needed-weak.s (original)
+++ lld/trunk/test/ELF/verneed-as-needed-weak.s Thu Jun  9 15:35:27 2016
@@ -11,4 +11,4 @@
 .globl _start
 _start:
 .data
-.long f1
+.quad f1

Added: lld/trunk/test/ELF/x86-64-dyn-rel-error.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/x86-64-dyn-rel-error.s?rev=272303&view=auto
==============================================================================
--- lld/trunk/test/ELF/x86-64-dyn-rel-error.s (added)
+++ lld/trunk/test/ELF/x86-64-dyn-rel-error.s Thu Jun  9 15:35:27 2016
@@ -0,0 +1,12 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/shared.s -o %t2.o
+// RUN: ld.lld %t2.o -shared -o %t2.so
+// RUN: not ld.lld %t.o %t2.so -o %t 2>&1 | FileCheck %s
+
+        .global _start
+_start:
+        .data
+        .long bar
+
+// CHECK: R_X86_64_32 cannot be a dynamic relocation

Added: lld/trunk/test/ELF/x86-64-dyn-rel-error2.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/x86-64-dyn-rel-error2.s?rev=272303&view=auto
==============================================================================
--- lld/trunk/test/ELF/x86-64-dyn-rel-error2.s (added)
+++ lld/trunk/test/ELF/x86-64-dyn-rel-error2.s Thu Jun  9 15:35:27 2016
@@ -0,0 +1,12 @@
+// REQUIRES: x86
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
+// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %p/Inputs/shared.s -o %t2.o
+// RUN: ld.lld %t2.o -shared -o %t2.so
+// RUN: not ld.lld %t.o %t2.so -o %t 2>&1 | FileCheck %s
+
+        .global _start
+_start:
+        .data
+        .long bar - .
+
+// CHECK: R_X86_64_PC32 cannot be a dynamic relocation