diff --git a/llvm/test/tools/llvm-lipo/info-invalid.test b/llvm/test/tools/llvm-lipo/info-invalid.test
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-lipo/info-invalid.test
@@ -0,0 +1,37 @@
+# RUN: yaml2obj %s > %t
+# RUN: not llvm-lipo %t -info 2>&1 | FileCheck %s
+# CHECK: has unsupported binary format
+
+--- !ELF
+FileHeader:
+  Class:           ELFCLASS64
+  Data:            ELFDATA2LSB
+  Type:            ET_DYN
+  Machine:         EM_X86_64
+  Entry:           0x0000000000001000
+Sections:
+  - Name:            .gnu.version_d
+    Type:            SHT_GNU_verdef
+    Flags:           [ SHF_ALLOC ]
+    Address:         0x0000000000000230
+    Link:            .dynstr
+    AddressAlign:    0x0000000000000004
+    Info:            0x0000000000000003
+    Entries:
+      - Version:         1
+        Flags:           1
+        VersionNdx:      1
+        Hash:            123456789
+        Names:
+          - foo
+      - Version:         1
+        Flags:           2
+        VersionNdx:      2
+        Hash:            987654321
+        Names:
+          - VERSION_1
+          - VERSION_2
+DynamicSymbols:
+  - Name:    bar
+    Binding: STB_GLOBAL
+...
diff --git a/llvm/test/tools/llvm-lipo/info.test b/llvm/test/tools/llvm-lipo/info.test
new file mode 100644
--- /dev/null
+++ b/llvm/test/tools/llvm-lipo/info.test
@@ -0,0 +1,13 @@
+# RUN: yaml2obj %p/Inputs/i386-slice.yaml > %t-i386.o
+# RUN: yaml2obj %p/Inputs/x86_64-slice.yaml > %t-x86_64.o
+# RUN: yaml2obj %p/Inputs/i386-x86_64-universal.yaml > %t-universal.o
+
+# RUN: llvm-lipo %t-universal.o %t-i386.o %t-universal.o %t-x86_64.o -info | FileCheck %s
+# CHECK: Architectures in the fat file:
+# CHECK: i386 x86_64
+# CHECK: Architectures in the fat file:
+# CHECK: i386 x86_64
+# CHECK: Non-fat file:
+# CHECK:  is architecture: i386
+# CHECK: Non-fat file:
+# CHECK:  is architecture: x86_64
diff --git a/llvm/tools/llvm-lipo/LipoOpts.td b/llvm/tools/llvm-lipo/LipoOpts.td
--- a/llvm/tools/llvm-lipo/LipoOpts.td
+++ b/llvm/tools/llvm-lipo/LipoOpts.td
@@ -18,6 +18,12 @@
             Group<action_group>,
             HelpText<"Display the arch_types present in the input file">;
 
+def info : Option<["-", "--"], "info", KIND_FLAG>,
+           Group<action_group>,
+           HelpText<"Display descriptions of each input file including "
+                    "filename and arch_types. Groups universal binaries "
+                    "together followed by thin files">;
+
 def thin : Option<["-", "--"], "thin", KIND_SEPARATE>,
            Group<action_group>,
            HelpText<"Create a thin output file of specified arch_type from the "
diff --git a/llvm/tools/llvm-lipo/llvm-lipo.cpp b/llvm/tools/llvm-lipo/llvm-lipo.cpp
--- a/llvm/tools/llvm-lipo/llvm-lipo.cpp
+++ b/llvm/tools/llvm-lipo/llvm-lipo.cpp
@@ -78,6 +78,7 @@
 
 enum class LipoAction {
   PrintArchs,
+  PrintInfo,
   VerifyArch,
   ThinArch,
   CreateUniversal,
@@ -177,6 +178,10 @@
     C.ActionToPerform = LipoAction::PrintArchs;
     return C;
 
+  case LIPO_info:
+    C.ActionToPerform = LipoAction::PrintInfo;
+    return C;
+
   case LIPO_thin:
     if (C.InputFiles.size() > 1)
       reportError("thin expects a single input file");
@@ -262,26 +267,48 @@
       .str();
 }
 
-LLVM_ATTRIBUTE_NORETURN
-static void printArchs(ArrayRef<OwningBinary<Binary>> InputBinaries) {
+static void printBinaryArchs(const Binary *Binary, raw_ostream &OS) {
   // Prints trailing space for compatibility with cctools lipo.
-  assert(InputBinaries.size() == 1 && "Incorrect number of input binaries");
-  const Binary *InputBinary = InputBinaries.front().getBinary();
-  if (auto UO = dyn_cast<MachOUniversalBinary>(InputBinary)) {
+  if (auto UO = dyn_cast<MachOUniversalBinary>(Binary)) {
     for (const auto &O : UO->objects()) {
       Expected<std::unique_ptr<MachOObjectFile>> BinaryOrError =
           O.getAsObjectFile();
       if (!BinaryOrError)
-        reportError(InputBinary->getFileName(), BinaryOrError.takeError());
-      outs() << getArchString(*BinaryOrError.get().get()) << " ";
+        reportError(Binary->getFileName(), BinaryOrError.takeError());
+      OS << getArchString(*BinaryOrError.get().get()) << " ";
     }
-  } else if (auto O = dyn_cast<MachOObjectFile>(InputBinary)) {
-    outs() << getArchString(*O) << " ";
-  } else {
-    llvm_unreachable("Unexpected binary format");
+    OS << "\n";
+    return;
   }
+  auto *O = dyn_cast<MachOObjectFile>(Binary);
+  OS << getArchString(*O) << " \n";
+}
 
-  outs() << "\n";
+LLVM_ATTRIBUTE_NORETURN
+static void printArchs(ArrayRef<OwningBinary<Binary>> InputBinaries) {
+  assert(InputBinaries.size() == 1 && "Incorrect number of input binaries");
+  printBinaryArchs(InputBinaries.front().getBinary(), outs());
+  exit(EXIT_SUCCESS);
+}
+
+LLVM_ATTRIBUTE_NORETURN
+static void printInfo(ArrayRef<OwningBinary<Binary>> InputBinaries) {
+  // Group universal and thin files together for compatibility with cctools lipo
+  std::string ThinOutputBuffer;
+  raw_string_ostream ThinOS(ThinOutputBuffer);
+  for (auto &IB : InputBinaries) {
+    const Binary *Binary = IB.getBinary();
+    if (Binary->isMachOUniversalBinary()) {
+      outs() << "Architectures in the fat file: " << Binary->getFileName()
+             << " are: ";
+      printBinaryArchs(Binary, outs());
+      continue;
+    }
+    assert(Binary->isMachO() && "Unexpected binary format");
+    ThinOS << "Non-fat file: " << Binary->getFileName() << " is architecture: ";
+    printBinaryArchs(Binary, ThinOS);
+  }
+  outs() << ThinOS.str();
   exit(EXIT_SUCCESS);
 }
 
@@ -503,6 +530,9 @@
   case LipoAction::PrintArchs:
     printArchs(InputBinaries);
     break;
+  case LipoAction::PrintInfo:
+    printInfo(InputBinaries);
+    break;
   case LipoAction::ThinArch:
     extractSlice(InputBinaries, C.ThinArchType, C.OutputFile);
     break;