Updated test, added comments and removed symbols unneeded.

Author: fzou1

lld/ELF/Arch/X86_64.cpp

@@ -584,7 +584,7 @@ void X86_64::relaxTlsIeToLe(uint8_t *loc, const Relocation &rel,
       memcpy(inst, "\x48\xc7", 2);
       *regSlot = 0xc0 | reg;
     } else {
-      ErrAlways(ctx)
+      Err(ctx)
           << getErrorLoc(ctx, loc - 3)
           << "R_X86_64_GOTTPOFF must be used in MOVQ or ADDQ instructions only";
     }
@@ -596,10 +596,18 @@ void X86_64::relaxTlsIeToLe(uint8_t *loc, const Relocation &rel,
     const uint8_t rex = loc[-3];
     loc[-3] = (rex & ~0x44) | (rex & 0x44) >> 2;
     *regSlot = 0xc0 | reg;
+
+    // "movq foo@gottpoff(%rip),%r[16-31]" -> "movq $foo,%r[16-31]"
     if (loc[-2] == 0x8b)
       loc[-2] = 0xc7;
-    else
+    else {
+      // "addq foo@gottpoff(%rip),%r[16-31]" -> "addq $foo,%r[16-31]"
+      if (loc[-2] != 0x03)
+        Err(ctx) << getErrorLoc(ctx, loc - 3)
+                 << "R_X86_64_CODE_4_GOTTPOFF must be used in MOVQ or ADDQ "
+                    "instructions only";
       loc[-2] = 0x81;
+    }
   }
 
   // The original code used a PC relative relocation.

lld/test/ELF/x86-64-tls-ie-local.s

@@ -5,38 +5,32 @@
 # RUN: llvm-readobj -r %t.so | FileCheck --check-prefix=REL %s
 # RUN: llvm-objdump --no-print-imm-hex -d --no-show-raw-insn %t.so | FileCheck %s
 
-# SEC: .got PROGBITS 0000000000002378 000378 000020 00 WA 0 0 8
+# SEC: .got PROGBITS 0000000000002348 000348 000010 00 WA 0 0 8
 
 ## Dynamic relocations for non-preemptable symbols in a shared object have section index 0.
 # REL:      .rela.dyn {
-# REL-NEXT:   0x2378 R_X86_64_TPOFF64 - 0x0
-# REL-NEXT:   0x2380 R_X86_64_TPOFF64 - 0x8
-# REL-NEXT:   0x2388 R_X86_64_TPOFF64 - 0x4
-# REL-NEXT:   0x2390 R_X86_64_TPOFF64 - 0xC
+# REL-NEXT:   0x2348 R_X86_64_TPOFF64 - 0x0
+# REL-NEXT:   0x2350 R_X86_64_TPOFF64 - 0x4
 # REL-NEXT: }
 
-## &.got[0] - 0x12af = 0x2378 - 0x12af = 4297
-## &.got[1] - 0x12b6 = 0x2380 - 0x12b6 = 4298
-## &.got[2] - 0x12be = 0x2388 - 0x12be = 4298
-## &.got[3] - 0x12c6 = 0x2390 - 0x12c6 = 4298
+## &.got[0] - 0x127f = 0x2348 - 0x127f = 4297
+## &.got[1] - 0x1286 = 0x2350 - 0x1286 = 4298
+## &.got[2] - 0x128e = 0x2348 - 0x128e = 4282
+## &.got[3] - 0x1296 = 0x2350 - 0x1296 = 4282
 
-# CHECK:      12a8:       addq 4297(%rip), %rax
-# CHECK-NEXT: 12af:       addq 4298(%rip), %rax
-# CHECK-NEXT: 12b6:       addq 4298(%rip), %r16
-# CHECK-NEXT: 12be:       addq 4298(%rip), %r16
+# CHECK:      1278:       addq 4297(%rip), %rax
+# CHECK-NEXT: 127f:       addq 4298(%rip), %rax
+# CHECK-NEXT: 1286:       addq 4282(%rip), %r16
+# CHECK-NEXT: 128e:       addq 4282(%rip), %r16
 
 addq foo@GOTTPOFF(%rip), %rax
 addq bar@GOTTPOFF(%rip), %rax
-addq foo2@GOTTPOFF(%rip), %r16
-addq bar2@GOTTPOFF(%rip), %r16
+addq foo@GOTTPOFF(%rip), %r16
+addq bar@GOTTPOFF(%rip), %r16
 
 
 .section .tbss,"awT",@nobits
 foo:
   .long 0
-foo2:
-  .long 0
 bar:
   .long 0
-bar2:
-  .long 0