[llvm-commits] [llvm] r126157 - in /llvm/trunk: lib/MC/ELFObjectWriter.cpp test/MC/ELF/relocation-pc.s

[Joerg Sonnenberger]

Author: joerg
Date: Mon Feb 21 17:25:41 2011
New Revision: 126157

URL: http://llvm.org/viewvc/llvm-project?rev=126157&view=rev
Log:
Handle FK_PCRel_1 and add a test case for this and FK_PCRel_4.

Added:
    llvm/trunk/test/MC/ELF/relocation-pc.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=126157&r1=126156&r2=126157&view=diff
==============================================================================
--- llvm/trunk/lib/MC/ELFObjectWriter.cpp (original)
+++ llvm/trunk/lib/MC/ELFObjectWriter.cpp Mon Feb 21 17:25:41 2011
@@ -1732,6 +1732,10 @@
         assert(Modifier == MCSymbolRefExpr::VK_None);
         Type = ELF::R_X86_64_PC16;
         break;
+      case FK_PCRel_1:
+        assert(Modifier == MCSymbolRefExpr::VK_None);
+        Type = ELF::R_X86_64_PC8;
+        break;
       }
     } else {
       switch ((unsigned)Fixup.getKind()) {

Added: llvm/trunk/test/MC/ELF/relocation-pc.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ELF/relocation-pc.s?rev=126157&view=auto
==============================================================================
--- llvm/trunk/test/MC/ELF/relocation-pc.s (added)
+++ llvm/trunk/test/MC/ELF/relocation-pc.s Mon Feb 21 17:25:41 2011
@@ -0,0 +1,33 @@
+// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o - | elf-dump  --dump-section-data | FileCheck  %s
+
+// Test that we produce the correct relocation.
+
+	loope	0                 # R_X86_64_PC8
+	jmp	-256              # R_X86_64_PC32
+
+// CHECK:      # Section 0x00000007
+// CHECK-NEXT: (('sh_name', 0x0000002c) # '.rela.text'
+// CHECK-NEXT:  ('sh_type', 0x00000004)
+// CHECK-NEXT:  ('sh_flags', 0x00000000)
+// CHECK-NEXT:  ('sh_addr', 0x00000000)
+// CHECK-NEXT:  ('sh_offset', 0x000000e8)
+// CHECK-NEXT:  ('sh_size', 0x00000030)
+// CHECK-NEXT:  ('sh_link', 0x00000005)
+// CHECK-NEXT:  ('sh_info', 0x00000001)
+// CHECK-NEXT:  ('sh_addralign', 0x00000008)
+// CHECK-NEXT:  ('sh_entsize', 0x00000018)
+// CHECK-NEXT:  ('_relocations', [
+// CHECK-NEXT:   # Relocation 0x00000000
+// CHECK-NEXT:   (('r_offset', 0x00000001)
+// CHECK-NEXT:    ('r_sym', 0x00000000)
+// CHECK-NEXT:    ('r_type', 0x0000000f)
+// CHECK-NEXT:    ('r_addend', 0x00000000)
+// CHECK-NEXT:   ),
+// CHECK-NEXT:   # Relocation 0x00000001
+// CHECK-NEXT:   (('r_offset', 0x00000003)
+// CHECK-NEXT:    ('r_sym', 0x00000000)
+// CHECK-NEXT:    ('r_type', 0x00000002)
+// CHECK-NEXT:    ('r_addend', 0x00000000)
+// CHECK-NEXT:   ),
+// CHECK-NEXT:  ])
+// CHECK-NEXT: ),