[llvm] r211326 - Added the -m option as an alias for -format=darwin to llvm-nm and llvm-size

[Kevin Enderby]

Author: enderby
Date: Thu Jun 19 19:04:16 2014
New Revision: 211326

URL: http://llvm.org/viewvc/llvm-project?rev=211326&view=rev
Log:
Added the -m option as an alias for -format=darwin to llvm-nm and llvm-size
which is what the darwin tools use for the Mach-O format output.

Modified:
    llvm/trunk/test/Object/nm-darwin-m.test
    llvm/trunk/test/Object/size-trivial-macho.test
    llvm/trunk/tools/llvm-nm/llvm-nm.cpp
    llvm/trunk/tools/llvm-size/llvm-size.cpp

Modified: llvm/trunk/test/Object/nm-darwin-m.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/nm-darwin-m.test?rev=211326&r1=211325&r2=211326&view=diff
==============================================================================
--- llvm/trunk/test/Object/nm-darwin-m.test (original)
+++ llvm/trunk/test/Object/nm-darwin-m.test Thu Jun 19 19:04:16 2014
@@ -2,7 +2,7 @@ RUN: llvm-nm -format darwin %p/Inputs/da
 RUN:         | FileCheck %s -check-prefix test1
 RUN: llvm-nm -format darwin %p/Inputs/darwin-m-test2.macho-i386 \
 RUN:         | FileCheck %s -check-prefix test2
-RUN: llvm-nm -format darwin %p/Inputs/darwin-m-test3.macho-x86-64 \
+RUN: llvm-nm -m %p/Inputs/darwin-m-test3.macho-x86-64 \
 RUN:         | FileCheck %s -check-prefix test3
 
 # This is testing that the various bits in the n_desc feild are correct

Modified: llvm/trunk/test/Object/size-trivial-macho.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Object/size-trivial-macho.test?rev=211326&r1=211325&r2=211326&view=diff
==============================================================================
--- llvm/trunk/test/Object/size-trivial-macho.test (original)
+++ llvm/trunk/test/Object/size-trivial-macho.test Thu Jun 19 19:04:16 2014
@@ -8,7 +8,7 @@ RUN: llvm-size %p/Inputs/macho-archive-x
 RUN:         | FileCheck %s -check-prefix AR
 RUN: llvm-size -format darwin %p/Inputs/macho-archive-x86_64.a \
 RUN:         | FileCheck %s -check-prefix mAR
-RUN: llvm-size -format darwin -x -l %p/Inputs/hello-world.macho-x86_64 \
+RUN: llvm-size -m -x -l %p/Inputs/hello-world.macho-x86_64 \
 RUN:         | FileCheck %s -check-prefix mxl
 RUN: llvm-size %p/Inputs/macho-universal.x86_64.i386 \
 RUN:         | FileCheck %s -check-prefix 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=211326&r1=211325&r2=211326&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-nm/llvm-nm.cpp (original)
+++ llvm/trunk/tools/llvm-nm/llvm-nm.cpp Thu Jun 19 19:04:16 2014
@@ -81,6 +81,7 @@ cl::alias ExternalOnly2("g", cl::desc("A
 
 cl::opt<bool> BSDFormat("B", cl::desc("Alias for --format=bsd"));
 cl::opt<bool> POSIXFormat("P", cl::desc("Alias for --format=posix"));
+cl::opt<bool> DarwinFormat("m", cl::desc("Alias for --format=darwin"));
 
 cl::opt<bool> PrintFileName(
     "print-file-name",
@@ -828,6 +829,8 @@ int main(int argc, char **argv) {
     OutputFormat = bsd;
   if (POSIXFormat)
     OutputFormat = posix;
+  if (DarwinFormat)
+    OutputFormat = darwin;
 
   // The relative order of these is important. If you pass --size-sort it should
   // only print out the size. However, if you pass -S --size-sort, it should

Modified: llvm/trunk/tools/llvm-size/llvm-size.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-size/llvm-size.cpp?rev=211326&r1=211325&r2=211326&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-size/llvm-size.cpp (original)
+++ llvm/trunk/tools/llvm-size/llvm-size.cpp Thu Jun 19 19:04:16 2014
@@ -46,6 +46,7 @@ static cl::opt<OutputFormatTy>
        OutputFormatShort(cl::desc("Specify output format"),
          cl::values(clEnumValN(sysv, "A", "System V format"),
                     clEnumValN(berkeley, "B", "Berkeley format"),
+                    clEnumValN(darwin, "m", "Darwin -m format"),
                     clEnumValEnd),
          cl::init(berkeley));