diff options
| author |  skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com> | 2018-04-23 16:15:32 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-23 16:37:10 +0000 |
| commit | 381c953b82fdf58362182db67c6bea1b411392d3 (patch) | |
| tree | 349fc9f1479f9451882ae4256d011a55b888aed4 /third_party | |
| parent | 37bbe7d585fffe3516137513bf859310d532fe50 (diff) | |
Roll skia/third_party/skcms 17d4b82..f1a2ba9 (1 commits)
https://skia.googlesource.com/skcms.git/+log/17d4b82..f1a2ba9
2018-04-23 mtklein@chromium.org add SKCMS_PROFILE support for ARMv8
The AutoRoll server is located here: https://skcms-skia-roll.skia.org
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
TBR=stani@google.com
Change-Id: Ie331159bbfaf98c86467a8877120ed2c8f8bf8d8
Reviewed-on: https://skia-review.googlesource.com/122991
Commit-Queue: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Reviewed-by: skcms-skia-autoroll <skcms-skia-autoroll@skia-buildbots.google.com.iam.gserviceaccount.com>
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/skcms/src/Transform.c | 5 | ||||
| -rwxr-xr-x | third_party/skcms/version.sha1 | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/third_party/skcms/src/Transform.c b/third_party/skcms/src/Transform.c index 4edff05d43..ef256b5eb7 100644 --- a/third_party/skcms/src/Transform.c +++ b/third_party/skcms/src/Transform.c @@ -22,7 +22,7 @@ #include <stdio.h> #include <stdlib.h> - #if defined(__arm__) + #if defined(__arm__) || defined(__aarch64__) #include <time.h> static const char* now_units = "ticks"; static uint64_t now() { return (uint64_t)clock(); } @@ -41,7 +41,8 @@ #undef M for (int i = 0; i < ARRAY_COUNT(counts); i++) { if (counts[i]) { - fprintf(stderr, "%16s: %12llu %s\n", names[i], counts[i], now_units); + fprintf(stderr, "%16s: %12llu %s\n", + names[i], (unsigned long long)counts[i], now_units); } } } diff --git a/third_party/skcms/version.sha1 b/third_party/skcms/version.sha1 index 350e5edb85..163409fa38 100755 --- a/third_party/skcms/version.sha1 +++ b/third_party/skcms/version.sha1 @@ -1 +1 @@ -17d4b822a04a12b896fdbdbd6a9ae29ac0d8ccdc
\ No newline at end of file +f1a2ba9622af9012fff682e7dbfdd5a78c09f35e
\ No newline at end of file |