[llvm] r212576 - Changed the lvm-nm alias "-s" for -print-armap to "-M".
Kevin Enderby
enderby at apple.com
Tue Jul 8 16:47:31 PDT 2014
Author: enderby
Date: Tue Jul 8 18:47:31 2014
New Revision: 212576
URL: http://llvm.org/viewvc/llvm-project?rev=212576&view=rev
Log:
Changed the lvm-nm alias "-s" for -print-armap to "-M".
This will allow the "-s" flag to implemented in the future as it
is in darwin’s nm(1) to list symbols only in the specified section.
Given a LGTM by Shankar Easwaran who originally implemented
the support for lvm-nm’s -print-armap and archive map symbols.
Modified:
llvm/trunk/test/Object/X86/archive-ir-asm.ll
llvm/trunk/test/Object/archive-long-index.test
llvm/trunk/test/Object/archive-symtab.test
llvm/trunk/test/Object/coff-archive-short.test
llvm/trunk/test/Object/coff-archive.test
llvm/trunk/test/Object/nm-archive.test
llvm/trunk/test/Object/simple-archive.test
llvm/trunk/tools/llvm-nm/llvm-nm.cpp
Modified: llvm/trunk/test/Object/X86/archive-ir-asm.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/X86/archive-ir-asm.ll?rev=212576&r1=212575&r2=212576&view=diff
==============================================================================
--- llvm/trunk/test/Object/X86/archive-ir-asm.ll (original)
+++ llvm/trunk/test/Object/X86/archive-ir-asm.ll Tue Jul 8 18:47:31 2014
@@ -1,7 +1,7 @@
; RUN: llvm-as %s -o=%t1
; RUN: rm -f %t2
; RUN: llvm-ar rcs %t2 %t1
-; RUN: llvm-nm -s %t2 | FileCheck %s
+; RUN: llvm-nm -M %t2 | FileCheck %s
target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
target triple = "x86_64-unknown-linux-gnu"
Modified: llvm/trunk/test/Object/archive-long-index.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/archive-long-index.test?rev=212576&r1=212575&r2=212576&view=diff
==============================================================================
--- llvm/trunk/test/Object/archive-long-index.test (original)
+++ llvm/trunk/test/Object/archive-long-index.test Tue Jul 8 18:47:31 2014
@@ -1,7 +1,7 @@
#
# Check if the index is appearing properly in the output file
#
-RUN: llvm-nm -s %p/Inputs/liblong_filenames.a | FileCheck -check-prefix=CHECKIDX %s
+RUN: llvm-nm -M %p/Inputs/liblong_filenames.a | FileCheck -check-prefix=CHECKIDX %s
CHECKIDX: Archive map
CHECKIDX: abcdefghijklmnopqrstuvwxyz12345678 in 1.o
Modified: llvm/trunk/test/Object/archive-symtab.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/archive-symtab.test?rev=212576&r1=212575&r2=212576&view=diff
==============================================================================
--- llvm/trunk/test/Object/archive-symtab.test (original)
+++ llvm/trunk/test/Object/archive-symtab.test Tue Jul 8 18:47:31 2014
@@ -1,6 +1,6 @@
RUN: rm -f %t.a
RUN: llvm-ar rcs %t.a %p/Inputs/trivial-object-test.elf-x86-64 %p/Inputs/trivial-object-test2.elf-x86-64
-RUN: llvm-nm -s %t.a | FileCheck %s
+RUN: llvm-nm -M %t.a | FileCheck %s
CHECK: Archive map
CHECK-NEXT: main in trivial-object-test.elf-x86-64
@@ -20,17 +20,17 @@ CHECK-NEXT: 0000000000000016 T main
RUN: rm -f %t.a
RUN: llvm-ar rcS %t.a %p/Inputs/trivial-object-test.elf-x86-64 %p/Inputs/trivial-object-test2.elf-x86-64
-RUN: llvm-nm -s %t.a | FileCheck %s --check-prefix=NOMAP
+RUN: llvm-nm -M %t.a | FileCheck %s --check-prefix=NOMAP
NOMAP-NOT: Archive map
RUN: llvm-ar s %t.a
-RUN: llvm-nm -s %t.a | FileCheck %s
+RUN: llvm-nm -M %t.a | FileCheck %s
check that the archive does have a corrupt symbol table.
RUN: rm -f %t.a
RUN: cp %p/Inputs/archive-test.a-corrupt-symbol-table %t.a
-RUN: llvm-nm -s %t.a | FileCheck %s --check-prefix=CORRUPT
+RUN: llvm-nm -M %t.a | FileCheck %s --check-prefix=CORRUPT
CORRUPT: Archive map
CORRUPT-NEXT: mbin in trivial-object-test.elf-x86-64
@@ -49,18 +49,18 @@ CORRUPT-NEXT: 0000000000000016 T main
check that the we *don't* update the symbol table.
RUN: llvm-ar s %t.a
-RUN: llvm-nm -s %t.a | FileCheck %s --check-prefix=CORRUPT
+RUN: llvm-nm -M %t.a | FileCheck %s --check-prefix=CORRUPT
repeate the test with llvm-ranlib
RUN: rm -f %t.a
RUN: llvm-ar rcS %t.a %p/Inputs/trivial-object-test.elf-x86-64 %p/Inputs/trivial-object-test2.elf-x86-64
-RUN: llvm-nm -s %t.a | FileCheck %s --check-prefix=NOMAP
+RUN: llvm-nm -M %t.a | FileCheck %s --check-prefix=NOMAP
RUN: llvm-ranlib %t.a
-RUN: llvm-nm -s %t.a | FileCheck %s
+RUN: llvm-nm -M %t.a | FileCheck %s
-RUN: llvm-nm -s %p/Inputs/macho-archive-x86_64.a | FileCheck %s --check-prefix=BSD-MachO
+RUN: llvm-nm -M %p/Inputs/macho-archive-x86_64.a | FileCheck %s --check-prefix=BSD-MachO
BSD-MachO: Archive map
BSD-MachO: _bar in bar.o
Modified: llvm/trunk/test/Object/coff-archive-short.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/coff-archive-short.test?rev=212576&r1=212575&r2=212576&view=diff
==============================================================================
--- llvm/trunk/test/Object/coff-archive-short.test (original)
+++ llvm/trunk/test/Object/coff-archive-short.test Tue Jul 8 18:47:31 2014
@@ -5,7 +5,7 @@
# than 15 characters, thus, unlike coff_archive.lib, it has no string
# table as the third member.
#
-RUN: llvm-nm --numeric-sort -s %p/Inputs/coff_archive_short.lib | FileCheck -check-prefix=CHECKIDX %s
+RUN: llvm-nm --numeric-sort -M %p/Inputs/coff_archive_short.lib | FileCheck -check-prefix=CHECKIDX %s
CHECKIDX: Archive map
CHECKIDX: _shortfn1 in short1.obj
Modified: llvm/trunk/test/Object/coff-archive.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/coff-archive.test?rev=212576&r1=212575&r2=212576&view=diff
==============================================================================
--- llvm/trunk/test/Object/coff-archive.test (original)
+++ llvm/trunk/test/Object/coff-archive.test Tue Jul 8 18:47:31 2014
@@ -1,7 +1,7 @@
#
# Check if the index is appearing properly in the output file
#
-RUN: llvm-nm --numeric-sort -s %p/Inputs/coff_archive.lib | FileCheck -check-prefix=CHECKIDX %s
+RUN: llvm-nm --numeric-sort -M %p/Inputs/coff_archive.lib | FileCheck -check-prefix=CHECKIDX %s
CHECKIDX: Archive map
CHECKIDX: ??0invalid_argument at std@@QAE at PBD@Z in Debug\mymath.obj
Modified: llvm/trunk/test/Object/nm-archive.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/nm-archive.test?rev=212576&r1=212575&r2=212576&view=diff
==============================================================================
--- llvm/trunk/test/Object/nm-archive.test (original)
+++ llvm/trunk/test/Object/nm-archive.test Tue Jul 8 18:47:31 2014
@@ -30,7 +30,7 @@ RUN: llvm-nm %p/Inputs/archive-test.a-gn
And don't crash when asked to print a non-existing symtab.
-RUN: llvm-nm -s %p/Inputs/archive-test.a-gnu-minimal
+RUN: llvm-nm -M %p/Inputs/archive-test.a-gnu-minimal
Don't reject an empty archive.
RUN: llvm-nm %p/Inputs/archive-test.a-empty
Modified: llvm/trunk/test/Object/simple-archive.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/simple-archive.test?rev=212576&r1=212575&r2=212576&view=diff
==============================================================================
--- llvm/trunk/test/Object/simple-archive.test (original)
+++ llvm/trunk/test/Object/simple-archive.test Tue Jul 8 18:47:31 2014
@@ -1,7 +1,7 @@
#
# Check if the index is appearing properly in the output file
#
-RUN: llvm-nm -s %p/Inputs/libsimple_archive.a | FileCheck -check-prefix=CHECKIDX %s
+RUN: llvm-nm -M %p/Inputs/libsimple_archive.a | FileCheck -check-prefix=CHECKIDX %s
CHECKIDX: Archive map
CHECKIDX: abcdefghijklmnopqrstuvwxyz12345678 in 1.o
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=212576&r1=212575&r2=212576&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-nm/llvm-nm.cpp (original)
+++ llvm/trunk/tools/llvm-nm/llvm-nm.cpp Tue Jul 8 18:47:31 2014
@@ -129,7 +129,7 @@ cl::opt<bool> WithoutAliases("without-al
cl::desc("Exclude aliases from output"));
cl::opt<bool> ArchiveMap("print-armap", cl::desc("Print the archive map"));
-cl::alias ArchiveMaps("s", cl::desc("Alias for --print-armap"),
+cl::alias ArchiveMaps("M", cl::desc("Alias for --print-armap"),
cl::aliasopt(ArchiveMap));
cl::opt<bool> JustSymbolName("just-symbol-name",
More information about the llvm-commits
mailing list