Index: llvm/test/tools/llvm-ar/display-empty.test
===================================================================
--- /dev/null
+++ llvm/test/tools/llvm-ar/display-empty.test
@@ -0,0 +1,13 @@
+## Test Display of empty archives
+
+# RUN: rm -rf %t && mkdir -p %t
+
+## Display empty archive:
+# RUN: llvm-ar cr %t/empty.a
+# RUN: llvm-ar t %t/empty.a 2>&1 | count 0
+# RUN: llvm-ar tv %t/empty.a 2>&1 | count 0
+
+## Display empty thin archive:
+# RUN: llvm-ar Trc %t/thin-archive-empty.a
+# RUN: llvm-ar t %t/thin-archive-empty.a 2>&1 | tee %t1.log | count 0
+# RUN: llvm-ar tv %t/thin-archive-empty.a 2>&1 | tee %t2.log  | count 0
Index: llvm/test/tools/llvm-ar/extract.test
===================================================================
--- llvm/test/tools/llvm-ar/extract.test
+++ llvm/test/tools/llvm-ar/extract.test
@@ -29,6 +29,10 @@
 # RUN: not llvm-ar x %t/thin-archive.a 2>&1 | FileCheck %s --check-prefix=THIN
 # THIN: extracting from a thin archive is not supported
 
+## Extracting from an empty thin archive should not warn or error:
+# RUN: llvm-ar Tcr %t/empty-thin.a
+# RUN: llvm-ar xv %t/empty-thin.a 2>&1 | count 0
+
 ## No output if 'v' is not specified.
 # RUN: rm a.txt b.txt
 # RUN: llvm-ar x %t/archive.a 2>&1 | count 0
Index: llvm/test/tools/llvm-ar/print.test
===================================================================
--- llvm/test/tools/llvm-ar/print.test
+++ llvm/test/tools/llvm-ar/print.test
@@ -8,6 +8,11 @@
 
 # RUN: llvm-ar -rc %t/archive.a %t/1.txt %t/2.txt %t/3.txt
 
+## Print empty archive:
+# RUN: llvm-ar cr %t/empty.a
+# RUN: llvm-ar p %t/empty.a 2>&1 | count 0
+# RUN: llvm-ar pv %t/empty.a 2>&1 | count 0
+
 ## Print without member:
 # RUN: llvm-ar p %t/archive.a \
 # RUN:   | FileCheck %s --check-prefix=WITHOUT --match-full-lines --implicit-check-not {{.}}
@@ -83,6 +88,11 @@
 
 # MISSING-FILE: error: '[[FILE]]' was not found
 
+## Print empty thin archive:
+# RUN: llvm-ar Trc %t/thin-archive-empty.a
+# RUN: llvm-ar p %t/thin-archive-empty.a 2>&1 | tee %t1.log | count 0
+# RUN: llvm-ar pv %t/thin-archive-empty.a 2>&1 | tee %t2.log  | count 1
+
 ## Print thin archive:
 # RUN: llvm-ar Trc %t/thin-archive.a %t/1.txt %t/2.txt %t/3.txt
 # RUN: llvm-ar p %t/archive.a %t/2.txt \