[llvm-commits] [llvm] r115541 - in /llvm/trunk: lib/MC/ELFObjectWriter.cpp test/MC/ELF/plt.s

[Rafael Espindola]

Author: rafael
Date: Mon Oct  4 14:04:13 2010
New Revision: 115541

URL: http://llvm.org/viewvc/llvm-project?rev=115541&view=rev
Log:
Produce a R_X86_64_PLT32 when needed.

Added:
    llvm/trunk/test/MC/ELF/plt.s
Modified:
    llvm/trunk/lib/MC/ELFObjectWriter.cpp

Modified: llvm/trunk/lib/MC/ELFObjectWriter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/ELFObjectWriter.cpp?rev=115541&r1=115540&r2=115541&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Mon Oct  4 14:04:13 2010
@@ -581,7 +581,16 @@
   unsigned Type;
   if (Is64Bit) {
     if (IsPCRel) {
-      Type = ELF::R_X86_64_PC32;
+      switch (Modifier) {
+      case MCSymbolRefExpr::VK_None:
+        Type = ELF::R_X86_64_PC32;
+        break;
+      case MCSymbolRefExpr::VK_PLT:
+        Type = ELF::R_X86_64_PLT32;
+        break;
+      default:
+        llvm_unreachable("Unimplemented");
+      }
     } else {
       switch ((unsigned)Fixup.getKind()) {
       default: llvm_unreachable("invalid fixup kind!");

Added: llvm/trunk/test/MC/ELF/plt.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/plt.s?rev=115541&view=auto
==============================================================================
--- llvm/trunk/test/MC/ELF/plt.s (added)
+++ llvm/trunk/test/MC/ELF/plt.s Mon Oct  4 14:04:13 2010
@@ -0,0 +1,14 @@
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump  | FileCheck %s
+
+// Test that this produces a R_X86_64_PLT32.
+
+	jmp	foo at PLT
+
+// CHECK:      ('_relocations', [
+// CHECK-NEXT:   # Relocation 0
+// CHECK-NEXT:    (('r_offset',
+// CHECK-NEXT:     ('r_sym',
+// CHECK-NEXT:     ('r_type', 4)
+// CHECK-NEXT:     ('r_addend',
+// CHECK-NEXT:    ),
+// CHECK-NEXT:   ])