[llvm] r312284 - [llvm-nm] Fix output formatting of -f sysv for 64bit targets
Sam Clegg via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 31 14:23:44 PDT 2017
Author: sbc
Date: Thu Aug 31 14:23:44 2017
New Revision: 312284
URL: http://llvm.org/viewvc/llvm-project?rev=312284&view=rev
Log:
[llvm-nm] Fix output formatting of -f sysv for 64bit targets
Differential Revision: https://reviews.llvm.org/D37347
Added:
llvm/trunk/test/tools/llvm-nm/X86/Inputs/hello.obj.elf-i386
llvm/trunk/test/tools/llvm-nm/X86/sysv-i386.test
llvm/trunk/test/tools/llvm-nm/X86/sysv-x86_64.test
Modified:
llvm/trunk/tools/llvm-nm/llvm-nm.cpp
Added: llvm/trunk/test/tools/llvm-nm/X86/Inputs/hello.obj.elf-i386
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-nm/X86/Inputs/hello.obj.elf-i386?rev=312284&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-nm/X86/Inputs/hello.obj.elf-i386 (added) and llvm/trunk/test/tools/llvm-nm/X86/Inputs/hello.obj.elf-i386 Thu Aug 31 14:23:44 2017 differ
Added: llvm/trunk/test/tools/llvm-nm/X86/sysv-i386.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-nm/X86/sysv-i386.test?rev=312284&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-nm/X86/sysv-i386.test (added)
+++ llvm/trunk/test/tools/llvm-nm/X86/sysv-i386.test Thu Aug 31 14:23:44 2017
@@ -0,0 +1,6 @@
+RUN: llvm-nm -f sysv %p/Inputs/hello.obj.elf-i386 | FileCheck %s --strict-whitespace
+
+CHECK: Name Value Class Type Size Line Section
+CHECK: .L.str |00000000| r | |0000000f| |
+CHECK: main |00000000| T | |00000015| |
+CHECK: puts | | U | | | |
Added: llvm/trunk/test/tools/llvm-nm/X86/sysv-x86_64.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-nm/X86/sysv-x86_64.test?rev=312284&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-nm/X86/sysv-x86_64.test (added)
+++ llvm/trunk/test/tools/llvm-nm/X86/sysv-x86_64.test Thu Aug 31 14:23:44 2017
@@ -0,0 +1,13 @@
+RUN: llvm-nm -f sysv %p/Inputs/hello.obj.elf-x86_64 | FileCheck %s --check-prefix=ELF --strict-whitespace
+RUN: llvm-nm -f sysv %p/Inputs/hello.obj.macho-x86_64 2>&1 | FileCheck %s --check-prefix=MACHO --strict-whitespace
+
+ELF: Name Value Class Type Size Line Section
+ELF: main |0000000000000000| T | |0000000000000015| |
+ELF: puts | | U | | | |
+
+MACHO: Name Value Class Type Size Line Section
+MACHO: EH_frame0 |0000000000000068| s | |0000000000000000| |
+MACHO: L_.str |000000000000003b| s | |0000000000000000| |
+MACHO: _main |0000000000000000| T | |0000000000000000| |
+MACHO: _main.eh |0000000000000080| S | |0000000000000000| |
+MACHO: _printf | | U | | | |
Modified: llvm/trunk/tools/llvm-nm/llvm-nm.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-nm/llvm-nm.cpp?rev=312284&r1=312283&r2=312284&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-nm/llvm-nm.cpp (original)
+++ llvm/trunk/tools/llvm-nm/llvm-nm.cpp Thu Aug 31 14:23:44 2017
@@ -709,9 +709,13 @@ static void sortAndPrintSymbolList(Symbo
} else if (OutputFormat == bsd && MultipleFiles && printName) {
outs() << "\n" << CurrentFilename << ":\n";
} else if (OutputFormat == sysv) {
- outs() << "\n\nSymbols from " << CurrentFilename << ":\n\n"
- << "Name Value Class Type"
- << " Size Line Section\n";
+ outs() << "\n\nSymbols from " << CurrentFilename << ":\n\n";
+ if (isSymbolList64Bit(Obj))
+ outs() << "Name Value Class Type"
+ << " Size Line Section\n";
+ else
+ outs() << "Name Value Class Type"
+ << " Size Line Section\n";
}
}
More information about the llvm-commits
mailing list