summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Rimar <grimar@accesssoftek.com>2016-12-22 11:05:05 +0000
committerGeorge Rimar <grimar@accesssoftek.com>2016-12-22 11:05:05 +0000
commitf39cdea879a8a8ca369b610030b66a55a3c743f3 (patch)
treeea80d9574278f0a580a91889885f602fbda9eb8d
parent4c134ea3b8c7cc5b85dc2d9e8584f7694a7e6387 (diff)
downloadbcm5719-llvm-f39cdea879a8a8ca369b610030b66a55a3c743f3.tar.gz
bcm5719-llvm-f39cdea879a8a8ca369b610030b66a55a3c743f3.zip
[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 llvm-svn: 290335
-rw-r--r--lld/ELF/Target.cpp2
-rw-r--r--lld/test/ELF/invalid/Inputs/broken-relaxation-x64.elfbin0 -> 688 bytes
-rw-r--r--lld/test/ELF/invalid/broken-relaxation-x64.s46
3 files changed, 47 insertions, 1 deletions
diff --git a/lld/ELF/Target.cpp b/lld/ELF/Target.cpp
index c0fcd95878d..edae7c65c1b 100644
--- a/lld/ELF/Target.cpp
+++ b/lld/ELF/Target.cpp
@@ -799,7 +799,7 @@ void X86_64TargetInfo<ELFT>::relaxTlsIeToLe(uint8_t *Loc, uint32_t Type,
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");
}
diff --git a/lld/test/ELF/invalid/Inputs/broken-relaxation-x64.elf b/lld/test/ELF/invalid/Inputs/broken-relaxation-x64.elf
new file mode 100644
index 00000000000..01a6af9a7fb
--- /dev/null
+++ b/lld/test/ELF/invalid/Inputs/broken-relaxation-x64.elf
Binary files differ
diff --git a/lld/test/ELF/invalid/broken-relaxation-x64.s b/lld/test/ELF/invalid/broken-relaxation-x64.s
new file mode 100644
index 00000000000..10d4655847d
--- /dev/null
+++ b/lld/test/ELF/invalid/broken-relaxation-x64.s
@@ -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
OpenPOWER on IntegriCloud