diff --git a/libcxx/utils/google-benchmark/CONTRIBUTORS b/libcxx/utils/google-benchmark/CONTRIBUTORS --- a/libcxx/utils/google-benchmark/CONTRIBUTORS +++ b/libcxx/utils/google-benchmark/CONTRIBUTORS @@ -61,6 +61,7 @@ Robert Guo Roman Lebedev Shuo Chen +Steven Wan Tobias Ulvgård Tom Madams Yixuan Qiu diff --git a/libcxx/utils/google-benchmark/README.LLVM b/libcxx/utils/google-benchmark/README.LLVM --- a/libcxx/utils/google-benchmark/README.LLVM +++ b/libcxx/utils/google-benchmark/README.LLVM @@ -24,3 +24,5 @@ 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/libcxx/utils/google-benchmark/src/cycleclock.h b/libcxx/utils/google-benchmark/src/cycleclock.h --- a/libcxx/utils/google-benchmark/src/cycleclock.h +++ b/libcxx/utils/google-benchmark/src/cycleclock.h @@ -92,7 +92,7 @@ uint32_t tbl, tbu0, tbu1; asm volatile( "mftbu %0\n" - "mftbl %1\n" + "mftb %1\n" "mftbu %2" : "=r"(tbu0), "=r"(tbl), "=r"(tbu1)); tbl &= -static_cast(tbu0 == tbu1); diff --git a/llvm/utils/benchmark/CONTRIBUTORS b/llvm/utils/benchmark/CONTRIBUTORS --- a/llvm/utils/benchmark/CONTRIBUTORS +++ b/llvm/utils/benchmark/CONTRIBUTORS @@ -58,6 +58,7 @@ Robert Guo Roman Lebedev Shuo Chen +Steven Wan Tobias Ulvgård Tom Madams Yixuan Qiu diff --git a/llvm/utils/benchmark/README.LLVM b/llvm/utils/benchmark/README.LLVM --- a/llvm/utils/benchmark/README.LLVM +++ b/llvm/utils/benchmark/README.LLVM @@ -35,3 +35,5 @@ 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'. diff --git a/llvm/utils/benchmark/src/cycleclock.h b/llvm/utils/benchmark/src/cycleclock.h --- a/llvm/utils/benchmark/src/cycleclock.h +++ b/llvm/utils/benchmark/src/cycleclock.h @@ -92,7 +92,7 @@ uint32_t tbl, tbu0, tbu1; asm volatile( "mftbu %0\n" - "mftbl %1\n" + "mftb %1\n" "mftbu %2" : "=r"(tbu0), "=r"(tbl), "=r"(tbu1)); tbl &= -static_cast(tbu0 == tbu1);