From 09f2c92e5b340d18cd2b505de7bd23ca31d61840 Mon Sep 17 00:00:00 2001
From: Steven Wan <wanyu9511@gmail.com>
Date: Wed, 4 Nov 2020 13:40:02 -0500
Subject: [PATCH] Add info about the cherry-picked commit and contributor

---
 libcxx/utils/google-benchmark/CONTRIBUTORS | 1 +
 libcxx/utils/google-benchmark/README.LLVM  | 2 ++
 llvm/utils/benchmark/CONTRIBUTORS          | 1 +
 llvm/utils/benchmark/README.LLVM           | 2 ++
 4 files changed, 6 insertions(+)

diff --git a/libcxx/utils/google-benchmark/CONTRIBUTORS b/libcxx/utils/google-benchmark/CONTRIBUTORS
index 9e7a39f25881..f684c7d4b2d4 100644
--- a/libcxx/utils/google-benchmark/CONTRIBUTORS
+++ b/libcxx/utils/google-benchmark/CONTRIBUTORS
@@ -61,6 +61,7 @@ Ray Glover <ray.glover@uk.ibm.com>
 Robert Guo <robert.guo@mongodb.com>
 Roman Lebedev <lebedev.ri@gmail.com>
 Shuo Chen <chenshuo@chenshuo.com>
+Steven Wan <wan.yu@ibm.com>
 Tobias Ulvgård <tobias.ulvgard@dirac.se>
 Tom Madams <tom.ej.madams@gmail.com> <tmadams@google.com>
 Yixuan Qiu <yixuanq@gmail.com>
diff --git a/libcxx/utils/google-benchmark/README.LLVM b/libcxx/utils/google-benchmark/README.LLVM
index 7a0c02c420d4..e86f92f6ce8c 100644
--- a/libcxx/utils/google-benchmark/README.LLVM
+++ b/libcxx/utils/google-benchmark/README.LLVM
@@ -24,3 +24,5 @@ Changes:
   preceding change.
 * https://github.com/google/benchmark/commit/ffe1342eb2faa7d2e7c35b4db2ccf99fab81ec20
   is applied to add the CycleTimer implementation for M680x0
+* https://github.com/google/benchmark/commit/d9abf017632be4a00b92cf4289539b353fcea5d2
+  is applied to rename 'mftbl' to 'mftb'.
diff --git a/llvm/utils/benchmark/CONTRIBUTORS b/llvm/utils/benchmark/CONTRIBUTORS
index 53e7b6f9f8b4..073d6767bc48 100644
--- a/llvm/utils/benchmark/CONTRIBUTORS
+++ b/llvm/utils/benchmark/CONTRIBUTORS
@@ -58,6 +58,7 @@ Ray Glover <ray.glover@uk.ibm.com>
 Robert Guo <robert.guo@mongodb.com>
 Roman Lebedev <lebedev.ri@gmail.com>
 Shuo Chen <chenshuo@chenshuo.com>
+Steven Wan <wan.yu@ibm.com>
 Tobias Ulvgård <tobias.ulvgard@dirac.se>
 Tom Madams <tom.ej.madams@gmail.com> <tmadams@google.com>
 Yixuan Qiu <yixuanq@gmail.com>
diff --git a/llvm/utils/benchmark/README.LLVM b/llvm/utils/benchmark/README.LLVM
index afd70a3dd914..5e0067b803b4 100644
--- a/llvm/utils/benchmark/README.LLVM
+++ b/llvm/utils/benchmark/README.LLVM
@@ -35,3 +35,5 @@ Changes:
   fixes formatting issues introduced by the preceding change.
 * https://github.com/google/benchmark/commit/ffe1342eb2faa7d2e7c35b4db2ccf99fab81ec20
   is applied to add the CycleTimer implementation for M680x0
+* https://github.com/google/benchmark/commit/d9abf017632be4a00b92cf4289539b353fcea5d2
+  is applied to rename 'mftbl' to 'mftb'.