[lld] r290335 - [ELF] - Use error() instead of fatal() during relaxation of R_X86_64_GOTTPOFF

[George Rimar via llvm-commits]

Author: grimar
Date: Thu Dec 22 05:05:05 2016
New Revision: 290335

URL: http://llvm.org/viewvc/llvm-project?rev=290335&view=rev
Log:
[ELF] - Use error() instead of fatal() during relaxation of R_X86_64_GOTTPOFF

This is last known noticable fatal() in target.cpp.
We also have other ones for unknown relocations or
creating unknown targets, but that one can be just error I think.

Used yaml2obj to generate test.

Differential revision: https://reviews.llvm.org/D28049

Added:
    lld/trunk/test/ELF/invalid/Inputs/broken-relaxation-x64.elf   (with props)
    lld/trunk/test/ELF/invalid/broken-relaxation-x64.s
Modified:
    lld/trunk/ELF/Target.cpp

Modified: lld/trunk/ELF/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Target.cpp?rev=290335&r1=290334&r2=290335&view=diff
==============================================================================
--- lld/trunk/ELF/Target.cpp (original)
+++ lld/trunk/ELF/Target.cpp Thu Dec 22 05:05:05 2016
@@ -799,7 +799,7 @@ void X86_64TargetInfo<ELFT>::relaxTlsIeT
     memcpy(Inst, "\x48\xc7", 2);
     *RegSlot = 0xc0 | Reg;
   } else {
-    fatal(getErrorLocation(Loc - 3) +
+    error(getErrorLocation(Loc - 3) +
           "R_X86_64_GOTTPOFF must be used in MOVQ or ADDQ instructions only");
   }
 

Added: lld/trunk/test/ELF/invalid/Inputs/broken-relaxation-x64.elf
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid/Inputs/broken-relaxation-x64.elf?rev=290335&view=auto
==============================================================================
Binary file - no diff available.

Propchange: lld/trunk/test/ELF/invalid/Inputs/broken-relaxation-x64.elf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: lld/trunk/test/ELF/invalid/broken-relaxation-x64.s
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/ELF/invalid/broken-relaxation-x64.s?rev=290335&view=auto
==============================================================================
--- lld/trunk/test/ELF/invalid/broken-relaxation-x64.s (added)
+++ lld/trunk/test/ELF/invalid/broken-relaxation-x64.s Thu Dec 22 05:05:05 2016
@@ -0,0 +1,46 @@
+# REQUIRES: x86
+
+# RUN: yaml2obj %s -o %t.o
+# RUN: not ld.lld %t.o -o %t.exe 2>&1 | FileCheck --check-prefix=ERR %s
+# ERR: R_X86_64_GOTTPOFF must be used in MOVQ or ADDQ instructions only
+# ERR: R_X86_64_GOTTPOFF must be used in MOVQ or ADDQ instructions only
+
+## YAML below contains 2 relocations of type R_X86_64_GOTTPOFF, and a .text
+## with fake content filled by 0xFF. That means instructions for relaxation are
+## "broken", so they does not match any known valid relaxations. We also generate
+## .tls section because we need it for correct proccessing of STT_TLS symbol.
+!ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  OSABI:           ELFOSABI_FREEBSD
+  Type:            ET_REL
+  Machine:         EM_X86_64
+Sections:
+  - Type:            SHT_PROGBITS
+    Name:            .text
+    Flags:           [ SHF_ALLOC, SHF_EXECINSTR ]
+    AddressAlign:    0x04
+    Content:         "FFFFFFFFFFFFFFFF"
+  - Type:            SHT_PROGBITS
+    Name:            .tls
+    Flags:           [ SHF_ALLOC, SHF_TLS ]
+  - Type:            SHT_REL
+    Name:            .rel.text
+    Link:            .symtab
+    Info:            .text
+    AddressAlign:    0x04
+    Relocations:
+      - Offset:          4
+        Symbol:          foo
+        Type:            R_X86_64_GOTTPOFF
+      - Offset:          4
+        Symbol:          foo
+        Type:            R_X86_64_GOTTPOFF
+Symbols:
+  Global:
+    - Name:     foo
+      Type:     STT_TLS
+      Section:  .text
+      Value:    0x12345
+      Size:     4