Completely rewrite ELFObjectWriter::RecordRelocation.

I started trying to fix a small issue, but this code has seen a small fix too
many.

The old code was fairly convoluted. Some of the issues it had:

* It failed to check if a symbol difference was in the some section when
  converting a relocation to pcrel.
* It failed to check if the relocation was already pcrel.
* The pcrel value computation was wrong in some cases (relocation-pc.s)
* It was missing quiet a few cases where it should not convert symbol
  relocations to section relocations, leaving the backends to patch it up.
* It would not propagate the fact that it had changed a relocation to pcrel,
  requiring a quiet nasty work around in ARM.
* It was missing comments.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@205076 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 12 insertions, 21 deletions

diff --git a/test/MC/ARM/arm-elf-symver.s b/test/MC/ARM/arm-elf-symver.s
index f7c0288a88..5fb1f6a0f3 100644
--- a/test/MC/ARM/arm-elf-symver.s
+++ b/test/MC/ARM/arm-elf-symver.s
@@ -24,16 +24,16 @@ global1:
 
 @ CHECK: Relocations [
 @ CHECK-NEXT:   Section (2) .rel.text {
-@ CHECK-NEXT:     0x0 R_ARM_ABS32 defined1 0x0
+@ CHECK-NEXT:     0x0 R_ARM_ABS32 .text 0x0
 @ CHECK-NEXT:     0x4 R_ARM_ABS32 bar2@zed 0x0
-@ CHECK-NEXT:     0x8 R_ARM_ABS32 defined2 0x0
-@ CHECK-NEXT:     0xC R_ARM_ABS32 defined3 0x0
+@ CHECK-NEXT:     0x8 R_ARM_ABS32 .text 0x0
+@ CHECK-NEXT:     0xC R_ARM_ABS32 .text 0x0
 @ CHECK-NEXT:     0x10 R_ARM_ABS32 bar6@zed 0x0
 @ CHECK-NEXT:   }
 @ CHECK-NEXT: ]
 
 @ CHECK:  Symbol {
-@ CHECK:    Name: bar1@zed (28)
+@ CHECK:    Name: bar1@zed
 @ CHECK-NEXT:     Value: 0x0
 @ CHECK-NEXT:     Size: 0
 @ CHECK-NEXT:     Binding: Local (0x0)
@@ -42,7 +42,7 @@ global1:
 @ CHECK-NEXT:     Section: .text (0x1)
 @ CHECK-NEXT:   }
 @ CHECK-NEXT:   Symbol {
-@ CHECK-NEXT:     Name: bar3@@zed (46)
+@ CHECK-NEXT:     Name: bar3@@zed
 @ CHECK-NEXT:     Value: 0x0
 @ CHECK-NEXT:     Size: 0
 @ CHECK-NEXT:     Binding: Local (0x0)
@@ -51,7 +51,7 @@ global1:
 @ CHECK-NEXT:     Section: .text (0x1)
 @ CHECK-NEXT:   }
 @ CHECK-NEXT:   Symbol {
-@ CHECK-NEXT:     Name: bar5@@zed (56)
+@ CHECK-NEXT:     Name: bar5@@zed
 @ CHECK-NEXT:     Value: 0x0
 @ CHECK-NEXT:     Size: 0
 @ CHECK-NEXT:     Binding: Local (0x0)
@@ -60,7 +60,7 @@ global1:
 @ CHECK-NEXT:     Section: .text (0x1)
 @ CHECK-NEXT:   }
 @ CHECK-NEXT:   Symbol {
-@ CHECK-NEXT:     Name: defined1 (1)
+@ CHECK-NEXT:     Name: defined1
 @ CHECK-NEXT:     Value: 0x0
 @ CHECK-NEXT:     Size: 0
 @ CHECK-NEXT:     Binding: Local (0x0)
@@ -69,16 +69,7 @@ global1:
 @ CHECK-NEXT:     Section: .text (0x1)
 @ CHECK-NEXT:   }
 @ CHECK-NEXT:   Symbol {
-@ CHECK-NEXT:     Name: defined2 (10)
-@ CHECK-NEXT:     Value: 0x0
-@ CHECK-NEXT:     Size: 0
-@ CHECK-NEXT:     Binding: Local (0x0)
-@ CHECK-NEXT:     Type: None (0x0)
-@ CHECK-NEXT:     Other: 0
-@ CHECK-NEXT:     Section: .text (0x1)
-@ CHECK-NEXT:   }
-@ CHECK-NEXT:   Symbol {
-@ CHECK-NEXT:     Name: defined3 (19)
+@ CHECK-NEXT:     Name: defined2
 @ CHECK-NEXT:     Value: 0x0
 @ CHECK-NEXT:     Size: 0
 @ CHECK-NEXT:     Binding: Local (0x0)
@@ -114,7 +105,7 @@ global1:
 @ CHECK-NEXT:     Section: .bss (0x4)
 @ CHECK-NEXT:   }
 @ CHECK-NEXT:   Symbol {
-@ CHECK-NEXT:     Name: g1@@zed (88)
+@ CHECK-NEXT:     Name: g1@@zed
 @ CHECK-NEXT:     Value: 0x14
 @ CHECK-NEXT:     Size: 0
 @ CHECK-NEXT:     Binding: Global (0x1)
@@ -123,7 +114,7 @@ global1:
 @ CHECK-NEXT:     Section: .text (0x1)
 @ CHECK-NEXT:   }
 @ CHECK-NEXT:   Symbol {
-@ CHECK-NEXT:     Name: global1 (80)
+@ CHECK-NEXT:     Name: global1
 @ CHECK-NEXT:     Value: 0x14
 @ CHECK-NEXT:     Size: 0
 @ CHECK-NEXT:     Binding: Global (0x1)
@@ -132,7 +123,7 @@ global1:
 @ CHECK-NEXT:     Section: .text (0x1)
 @ CHECK-NEXT:   }
 @ CHECK-NEXT:   Symbol {
-@ CHECK-NEXT:     Name: bar2@zed (37)
+@ CHECK-NEXT:     Name: bar2@zed
 @ CHECK-NEXT:     Value: 0x0
 @ CHECK-NEXT:     Size: 0
 @ CHECK-NEXT:     Binding: Global (0x1)
@@ -141,7 +132,7 @@ global1:
 @ CHECK-NEXT:     Section: Undefined (0x0)
 @ CHECK-NEXT:   }
 @ CHECK-NEXT:   Symbol {
-@ CHECK-NEXT:     Name: bar6@zed (66)
+@ CHECK-NEXT:     Name: bar6@zed
 @ CHECK-NEXT:     Value: 0x0
 @ CHECK-NEXT:     Size: 0
 @ CHECK-NEXT:     Binding: Global (0x1)