maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[llvm-readobj] Fix formatting of unknown note types 

llvm-svn: 357221
This commit is contained in:
Jordan Rupprecht 2019-03-28 23:08:06 +00:00
parent 73253bdefc
commit 1dc28b6d2b
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
llvm/test/tools/llvm-readobj/note-unknown.s Normal file
View File

@ -0,0 +1,28 @@
// REQUIRES: x86-registered-target
// RUN: llvm-mc -filetype=obj -triple x86_64-pc-linux-gnu %s -o %t.o
// RUN: llvm-readobj --notes %t.o | FileCheck %s --check-prefix=LLVM
// RUN: llvm-readelf --notes %t.o | FileCheck %s --check-prefix=GNU
// GNU: Displaying notes found at file offset 0x00000040 with length 0x00000010:
// GNU-NEXT: Owner Data size Description
// GNU-NEXT: XYZ 0x00000000 Unknown note type: (0x00000003)
// LLVM: Notes [
// LLVM-NEXT: NoteSection {
// LLVM-NEXT: Offset: 0x40
// LLVM-NEXT: Size: 0x10
// LLVM-NEXT: Note {
// LLVM-NEXT: Owner: XYZ
// LLVM-NEXT: Data size: 0x0
// LLVM-NEXT: Type: Unknown (0x00000003)
// LLVM-NEXT: }
// LLVM-NEXT: }
// LLVM-NEXT: ]
.section ".note.foo", "a"
.align 4
.long 4 /* namesz */
.long 0 /* descsz */
.long 3 /* type */
.asciz "XYZ"

3
llvm/tools/llvm-readobj/ELFDumper.cpp
View File

@ -4704,7 +4704,8 @@ void LLVMStyle<ELFT>::printNotes(const ELFFile<ELFT> *Obj) {
if (!N.Type.empty())
W.printString(N.Type, N.Value);
} else {
W.getOStream() << "Unknown note type: (" << format_hex(Type, 10) << ')';
W.printString("Type",
"Unknown (" + to_string(format_hex(Type, 10)) + ")");
}
};