mirrors/llvm-project
0
0
Fork 0
mirror of https://github.com/llvm/llvm-project.git synced 2025-04-27 06:06:06 +00:00
Code Issues Projects Releases Wiki Activity

[ELF] Refactor several error messages

Browse Source 
Differential revision: https://reviews.llvm.org/D26970

llvm-svn: 287753
This commit is contained in:
Eugene Leviant 2016-11-23 10:07:46 +00:00
parent 48ac304c8e
commit c3a44b2fbe
6 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lld/ELF/InputFiles.cpp
View File

@ -773,12 +773,12 @@ static InputFile *createELFFile(MemoryBufferRef MB) {
unsigned char Endian;
std::tie(Size, Endian) = getElfArchType(MB.getBuffer());
if (Endian != ELFDATA2LSB && Endian != ELFDATA2MSB)
fatal("invalid data encoding: " + MB.getBufferIdentifier());
fatal(MB.getBufferIdentifier() + ": invalid data encoding");
size_t BufSize = MB.getBuffer().size();
if ((Size == ELFCLASS32 && BufSize < sizeof(Elf32_Ehdr)) ||
(Size == ELFCLASS64 && BufSize < sizeof(Elf64_Ehdr)))
fatal("file is too short");
fatal(MB.getBufferIdentifier() + ": file is too short");
InputFile *Obj;
if (Size == ELFCLASS32 && Endian == ELFDATA2LSB)
@ -790,7 +790,7 @@ static InputFile *createELFFile(MemoryBufferRef MB) {
else if (Size == ELFCLASS64 && Endian == ELFDATA2MSB)
Obj = make<T<ELF64BE>>(MB);
else
fatal("invalid file class: " + MB.getBufferIdentifier());
fatal(MB.getBufferIdentifier() + ": invalid file class");
if (!Config->FirstElf)
Config->FirstElf = Obj;

5
lld/ELF/InputSection.cpp
View File

@ -15,6 +15,7 @@
#include "LinkerScript.h"
#include "Memory.h"
#include "OutputSections.h"
#include "Relocations.h"
#include "SyntheticSections.h"
#include "Target.h"
#include "Thunks.h"
@ -97,7 +98,7 @@ template <class ELFT> size_t InputSectionBase<ELFT>::getSize() const {
// Returns a string for an error message.
template <class SectionT> static std::string getName(SectionT *Sec) {
return (Sec->getFile()->getName() + "(" + Sec->Name + ")").str();
return (Sec->getFile()->getName() + ":(" + Sec->Name + ")").str();
}
template <class ELFT>
@ -455,7 +456,7 @@ void InputSection<ELFT>::relocateNonAlloc(uint8_t *Buf, ArrayRef<RelTy> Rels) {
SymbolBody &Sym = this->File->getRelocTargetSym(Rel);
if (Target->getRelExpr(Type, Sym) != R_ABS) {
error(getName(this) + " has non-ABS reloc");
error(getLocation(*this, Offset) + ": has non-ABS reloc");
return;
}

4
lld/test/ELF/invalid/invalid-elf.test
View File

@ -2,11 +2,11 @@
# RUN: not ld.lld %t %p/Inputs/data-encoding.a -o %t2 2>&1 | \
# RUN: FileCheck --check-prefix=INVALID-DATA-ENC %s
# INVALID-DATA-ENC: invalid data encoding: test.o
# INVALID-DATA-ENC: test.o: invalid data encoding
# RUN: not ld.lld %t %p/Inputs/file-class.a -o %t2 2>&1 | \
# RUN: FileCheck --check-prefix=INVALID-FILE-CLASS %s
# INVALID-FILE-CLASS: invalid file class: test.o
# INVALID-FILE-CLASS: test.o: invalid file class
# RUN: not ld.lld %p/Inputs/symtab-sh_info.elf -o %t2 2>&1 | \
# RUN: FileCheck --check-prefix=INVALID-SYMTAB-SHINFO %s

2
lld/test/ELF/merge-string-error.s
View File

@ -8,4 +8,4 @@
.data
.long .rodata.str1.1 + 4
// CHECK: merge-string-error.s.tmp.o(.rodata.str1.1): entry is past the end of the section
// CHECK: merge-string-error.s.tmp.o:(.rodata.str1.1): entry is past the end of the section

11
lld/test/ELF/non-abs-reloc.s Normal file
View File

@ -0,0 +1,11 @@
// REQUIRES: x86
// RUN: llvm-mc -filetype=obj -triple=x86_64-pc-linux %s -o %t.o
// RUN: not ld.lld %t.o -o %t.so -shared 2>&1 | FileCheck %s
// CHECK: {{.*}}:(.dummy+0x0): has non-ABS reloc
.globl _start
_start:
nop
.section .dummy
.long foo@gotpcrel

2
lld/test/ELF/relocation-past-merge-end.s
View File

@ -1,7 +1,7 @@
// REQUIRES: x86
// RUN: llvm-mc %s -o %t.o -filetype=obj -triple=x86_64-pc-linux
// RUN: not ld.lld %t.o -o %t.so -shared 2>&1 | FileCheck %s
// CHECK: relocation-past-merge-end.s.tmp.o(.foo): entry is past the end of the section
// CHECK: relocation-past-merge-end.s.tmp.o:(.foo): entry is past the end of the section
.data
.long .foo + 10