From 52ddae132f8ccd646e93d42b69f1efd902ecb4f2 Mon Sep 17 00:00:00 2001
From: Ben Dunbobbin <Ben.Dunbobbin@sony.com>
Date: Tue, 17 May 2022 00:11:18 +0100
Subject: [PATCH] [llvm-ar][NFC] Address post-commit comments on D125439.

Remove errant whitespace.

AIX uses big archive format so check for both !<arch> and <bigaf>.

Only the "gnu" format has thin archives; specify --format=gnu for
thin archive test-cases.
---
 llvm/test/tools/llvm-ar/mri-create-overwrite.test | 20 ++++++++++----------
 llvm/tools/llvm-ar/llvm-ar.cpp                    |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/llvm/test/tools/llvm-ar/mri-create-overwrite.test b/llvm/test/tools/llvm-ar/mri-create-overwrite.test
index 3a43826..ce291d2 100644
--- a/llvm/test/tools/llvm-ar/mri-create-overwrite.test
+++ b/llvm/test/tools/llvm-ar/mri-create-overwrite.test
@@ -12,7 +12,7 @@
 ## Show that an existing file that is not an archive is overwritten by CREATETHIN.
 # RUN: rm -f test.a
 # RUN: touch test.a
-# RUN: llvm-ar -M < createthin.mri
+# RUN: llvm-ar --format=gnu -M < createthin.mri
 # RUN: FileCheck --input-file=test.a %s --check-prefixes=THIN,TWO
 
 ## Show that an existing regular archive is overwritten by CREATE.
@@ -24,29 +24,29 @@
 
 ## Show that an existing regular archive is overwritten by CREATETHIN.
 # RUN: rm -f test.a
-# RUN: llvm-ar cr test.a 1.txt
-# RUN: llvm-ar -M < createthin.mri
+# RUN: llvm-ar --format=gnu cr test.a 1.txt
+# RUN: llvm-ar --format=gnu -M < createthin.mri
 # RUN: FileCheck --input-file=test.a %s --check-prefixes=THIN,TWO --implicit-check-not=1.txt
 
 ## Show that an existing thin archive is overwritten by CREATE.
 # RUN: rm -f test.a
-# RUN: llvm-ar crT test.a 1.txt
-# RUN: llvm-ar -M < create.mri
+# RUN: llvm-ar --format=gnu crT test.a 1.txt
+# RUN: llvm-ar --format=gnu -M < create.mri
 # RUN: FileCheck --input-file=test.a %s --check-prefixes=ARCH,TWO --implicit-check-not=1.txt
 
 ## Show that an existing thin archive is overwritten by CREATETHIN.
 # RUN: rm -f test.a
-# RUN: llvm-ar crT test.a 1.txt
-# RUN: llvm-ar -M < createthin.mri
+# RUN: llvm-ar --format=gnu crT test.a 1.txt
+# RUN: llvm-ar --format=gnu -M < createthin.mri
 # RUN: FileCheck --input-file=test.a %s --check-prefixes=THIN,TWO --implicit-check-not=1.txt
 
 ## Show that the output is not overwritten without a SAVE.
 # RUN: rm -f test.a
-# RUN: llvm-ar crT test.a 1.txt
-# RUN: llvm-ar -M < nosave.mri
+# RUN: llvm-ar --format=gnu crT test.a 1.txt
+# RUN: llvm-ar --format=gnu -M < nosave.mri
 # RUN: FileCheck --input-file=test.a %s --check-prefixes=THIN,ONE --implicit-check-not=2.txt
 
-# ARCH: !<arch>
+# ARCH: {{!<arch>|<bigaf>}}
 # THIN: !<thin>
 # ONE:  1.txt
 # TWO:  2.txt
diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp
index 22f6b86..214b6e6 100644
--- a/llvm/tools/llvm-ar/llvm-ar.cpp
+++ b/llvm/tools/llvm-ar/llvm-ar.cpp
@@ -1139,7 +1139,7 @@ static void runMRIScript() {
   // Nothing to do if not saved.
   if (Saved)
     performOperation(ReplaceOrInsert, /*OldArchive=*/nullptr,
-                     /*OldArchiveBuf=*/ nullptr, &NewMembers);
+                     /*OldArchiveBuf=*/nullptr, &NewMembers);
   exit(0);
 }
 
-- 
2.7.4