6 files changed, 35 insertions, 7 deletions
diff --git a/llvm/test/tools/llvm-strings/Inputs/abcd b/llvm/test/tools/llvm-strings/Inputs/abcd
new file mode 100644
index 00000000000..85df50785d6
--- /dev/null
+++ b/llvm/test/tools/llvm-strings/Inputs/abcd
@@ -0,0 +1 @@
+abcd
+\ No newline at end of file
diff --git a/llvm/test/tools/llvm-strings/archive-filename.test b/llvm/test/tools/llvm-strings/archive-filename.test
new file mode 100644
index 00000000000..1c7b46802d5
--- /dev/null
+++ b/llvm/test/tools/llvm-strings/archive-filename.test
@@ -0,0 +1,9 @@
+RUN: rm -f %T/archive.a
+RUN: llvm-ar -format gnu crs %T/archive.a %S/Inputs/abcd
+RUN: llvm-strings -f %T/archive.a | FileCheck %s
+RUN: llvm-strings --print-file-name %T/archive.a | FileCheck %s
+
+CHECK: archive.a: !<arch>
+CHECK: archive.a: abcd/           0           0     0     644     4         `
+CHECK: archive.a: abcd
+
diff --git a/llvm/test/tools/llvm-strings/file-filename.test b/llvm/test/tools/llvm-strings/file-filename.test
new file mode 100644
index 00000000000..de0ce9744e6
--- /dev/null
+++ b/llvm/test/tools/llvm-strings/file-filename.test
@@ -0,0 +1,3 @@
+RUN: llvm-strings -f %S/Inputs/abcd | FileCheck %s
+RUN: llvm-strings --print-file-name %S/Inputs/abcd | FileCheck %s
+CHECK: {{[\\/]}}abcd: abcd
diff --git a/llvm/test/tools/llvm-strings/nested-archives.test b/llvm/test/tools/llvm-strings/nested-archives.test
index c3a95f2fd60..09ad0043c6b 100644
--- a/llvm/test/tools/llvm-strings/nested-archives.test
+++ b/llvm/test/tools/llvm-strings/nested-archives.test
@@ -1,8 +1,7 @@
-RUN: echo -n abcd > %T/abcd
 RUN: rm -f %T/inner.ar
-RUN: llvm-ar crs %T/inner.a %T/abcd
+RUN: llvm-ar -format gnu crs %T/inner.a %S/Inputs/abcd
 RUN: rm -f %T/outer.ar
-RUN: llvm-ar crs %T/outer.a %T/inner.a
+RUN: llvm-ar -format gnu crs %T/outer.a %T/inner.a
 RUN: llvm-strings %T/outer.a | FileCheck %s
 
 CHECK: !<arch>
diff --git a/llvm/test/tools/llvm-strings/stdin-filename.test b/llvm/test/tools/llvm-strings/stdin-filename.test
new file mode 100644
index 00000000000..9c87e5c45d8
--- /dev/null
+++ b/llvm/test/tools/llvm-strings/stdin-filename.test
@@ -0,0 +1,3 @@
+RUN: echo abcd | llvm-strings -f - | FileCheck %s
+RUN: echo abcd | llvm-strings --print-file-name - | FileCheck %s
+CHECK: {standard input}: abcd
diff --git a/llvm/tools/llvm-strings/llvm-strings.cpp b/llvm/tools/llvm-strings/llvm-strings.cpp
index 6e5e2f298c3..cb0fb9651d9 100644
--- a/llvm/tools/llvm-strings/llvm-strings.cpp
+++ b/llvm/tools/llvm-strings/llvm-strings.cpp
@@ -29,7 +29,19 @@ static cl::list<std::string> InputFileNames(cl::Positional,
                                             cl::desc("<input object files>"),
                                             cl::ZeroOrMore);
 
-static void strings(raw_ostream &OS, StringRef Contents) {
+static cl::opt<bool>
+    PrintFileName("print-file-name",
+                  cl::desc("Print the name of the file before each string"));
+static cl::alias PrintFileNameShort("f", cl::desc(""),
+                                    cl::aliasopt(PrintFileName));
+
+static void strings(raw_ostream &OS, StringRef FileName, StringRef Contents) {
+  auto print = [&OS, FileName](StringRef L) {
+    if (PrintFileName)
+      OS << FileName << ": ";
+    OS << L << '\n';
+  };
+
   const char *P = nullptr, *E = nullptr, *S = nullptr;
   for (P = Contents.begin(), E = Contents.end(); P < E; ++P) {
     if (std::isgraph(*P) || std::isblank(*P)) {
@@ -37,12 +49,12 @@ static void strings(raw_ostream &OS, StringRef Contents) {
         S = P;
     } else if (S) {
       if (P - S > 3)
-        OS << StringRef(S, P - S) << '\n';
+        print(StringRef(S, P - S));
       S = nullptr;
     }
   }
   if (S && E - S > 3)
-    OS << StringRef(S, E - S) << '\n';
+    print(StringRef(S, E - S));
 }
 
 int main(int argc, char **argv) {
@@ -60,7 +72,8 @@ int main(int argc, char **argv) {
     if (std::error_code EC = Buffer.getError())
       errs() << File << ": " << EC.message() << '\n';
     else
-      strings(llvm::outs(), Buffer.get()->getMemBufferRef().getBuffer());
+      strings(llvm::outs(), File == "-" ? "{standard input}" : File,
+              Buffer.get()->getMemBufferRef().getBuffer());
   }
 
   return EXIT_SUCCESS;