Index: libcxx/utils/google-benchmark/AUTHORS =================================================================== --- libcxx/utils/google-benchmark/AUTHORS +++ libcxx/utils/google-benchmark/AUTHORS @@ -46,3 +46,4 @@ Yixuan Qiu Yusuke Suzuki Zbigniew Skowron +Min-Yih Hsu Index: libcxx/utils/google-benchmark/CONTRIBUTORS =================================================================== --- libcxx/utils/google-benchmark/CONTRIBUTORS +++ libcxx/utils/google-benchmark/CONTRIBUTORS @@ -66,3 +66,4 @@ Yixuan Qiu Yusuke Suzuki Zbigniew Skowron +Min-Yih Hsu Index: libcxx/utils/google-benchmark/README.LLVM =================================================================== --- libcxx/utils/google-benchmark/README.LLVM +++ libcxx/utils/google-benchmark/README.LLVM @@ -22,3 +22,5 @@ to fix timestamp-related inline asm issues and 32-bit RISC-V build failures. The second cherrypicked commit fixes formatting issues introduced by the preceding change. +* https://github.com/google/benchmark/commit/ffe1342eb2faa7d2e7c35b4db2ccf99fab81ec20 + is applied to add the CycleTimer implementation for M680x0 Index: libcxx/utils/google-benchmark/src/cycleclock.h =================================================================== --- libcxx/utils/google-benchmark/src/cycleclock.h +++ libcxx/utils/google-benchmark/src/cycleclock.h @@ -161,7 +161,7 @@ struct timeval tv; gettimeofday(&tv, nullptr); return static_cast(tv.tv_sec) * 1000000 + tv.tv_usec; -#elif defined(__mips__) +#elif defined(__mips__) || defined(__m68k__) // mips apparently only allows rdtsc for superusers, so we fall // back to gettimeofday. It's possible clock_gettime would be better. struct timeval tv; Index: llvm/utils/benchmark/AUTHORS =================================================================== --- llvm/utils/benchmark/AUTHORS +++ llvm/utils/benchmark/AUTHORS @@ -44,3 +44,4 @@ Yixuan Qiu Yusuke Suzuki Zbigniew Skowron +Min-Yih Hsu Index: llvm/utils/benchmark/CONTRIBUTORS =================================================================== --- llvm/utils/benchmark/CONTRIBUTORS +++ llvm/utils/benchmark/CONTRIBUTORS @@ -63,3 +63,4 @@ Yixuan Qiu Yusuke Suzuki Zbigniew Skowron +Min-Yih Hsu Index: llvm/utils/benchmark/README.LLVM =================================================================== --- llvm/utils/benchmark/README.LLVM +++ llvm/utils/benchmark/README.LLVM @@ -33,3 +33,5 @@ are applied on top of the previous cherrypick to fix timestamp-related inline asm issues and 32-bit RISC-V build failures. The second cherrypicked commit fixes formatting issues introduced by the preceding change. +* https://github.com/google/benchmark/commit/ffe1342eb2faa7d2e7c35b4db2ccf99fab81ec20 + is applied to add the CycleTimer implementation for M680x0 Index: llvm/utils/benchmark/src/cycleclock.h =================================================================== --- llvm/utils/benchmark/src/cycleclock.h +++ llvm/utils/benchmark/src/cycleclock.h @@ -161,7 +161,7 @@ struct timeval tv; gettimeofday(&tv, nullptr); return static_cast(tv.tv_sec) * 1000000 + tv.tv_usec; -#elif defined(__mips__) +#elif defined(__mips__) || defined(__m68k__) // mips apparently only allows rdtsc for superusers, so we fall // back to gettimeofday. It's possible clock_gettime would be better. struct timeval tv;