From eafdc6f2a2a9a137926db4e1c83728b5fdd9a9a7 Mon Sep 17 00:00:00 2001
From: Kevin Enderby <enderby@apple.com>
Date: Thu, 1 Dec 2016 19:12:55 +0000
Subject: [PATCH] Fix a bug with llvm-size and the -m option with multiple
 files not printing the file names.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@288402 91177308-0d34-0410-b5e6-96231b3b80d8
---
 test/tools/llvm-size/Inputs/darwin-m1.o | Bin 0 -> 228 bytes
 test/tools/llvm-size/darwin-m.test      |   4 ++++
 tools/llvm-size/llvm-size.cpp           |   4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 test/tools/llvm-size/Inputs/darwin-m1.o

diff --git a/test/tools/llvm-size/Inputs/darwin-m1.o b/test/tools/llvm-size/Inputs/darwin-m1.o
new file mode 100644
index 0000000000000000000000000000000000000000..9672df524c7c3d885c3307cf24f3587fa1655850
GIT binary patch
literal 228
zcmX^2>+L@t1_lOBAZCQ(13(%CK>PzB1{S~p6uSe&AetSDnSeA1#K)JUR+K>45Ppbj
vL<oWpVzB@*NIx2AfbrwwQxZ!OVLXtTE{-9N2tG(Z2tPmwVX#2%2e}CVOdAnN

literal 0
HcmV?d00001

diff --git a/test/tools/llvm-size/darwin-m.test b/test/tools/llvm-size/darwin-m.test
index 23d636ba32b..ade1b724c69 100644
--- a/test/tools/llvm-size/darwin-m.test
+++ b/test/tools/llvm-size/darwin-m.test
@@ -1,7 +1,11 @@
 RUN: llvm-size -m %p/Inputs/darwin-m.o | FileCheck --check-prefix="DARWIN" %s
+RUN: llvm-size -m %p/Inputs/darwin-m.o %p/Inputs/darwin-m1.o | FileCheck --check-prefix="DARWIN2" %s
 
 DARWIN: Segment : 8
 DARWIN-NEXT:	Section (__TEXT, __text): 4
 DARWIN-NEXT:	Section (__DATA, __data): 4
 DARWIN-NEXT:	total 8
 DARWIN-NEXT: total 8
+
+DARWIN2: Inputs/darwin-m.o:
+DARWIN2: Inputs/darwin-m1.o:
diff --git a/tools/llvm-size/llvm-size.cpp b/tools/llvm-size/llvm-size.cpp
index a11532a7c98..903e950bc73 100644
--- a/tools/llvm-size/llvm-size.cpp
+++ b/tools/llvm-size/llvm-size.cpp
@@ -817,11 +817,13 @@ static void printFileSectionSizes(StringRef file) {
   } else if (ObjectFile *o = dyn_cast<ObjectFile>(&Bin)) {
     if (!checkMachOAndArchFlags(o, file))
       return;
+    MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(o);
     if (OutputFormat == sysv)
       outs() << o->getFileName() << "  :\n";
+    else if (MachO && OutputFormat == darwin && MoreThanOneFile)
+      outs() << o->getFileName() << ":\n";
     printObjectSectionSizes(o);
     if (OutputFormat == berkeley) {
-      MachOObjectFile *MachO = dyn_cast<MachOObjectFile>(o);
       if (!MachO || MoreThanOneFile)
         outs() << o->getFileName();
       outs() << "\n";
-- 
2.50.1