Andrew Geissler | 595f630 | 2022-01-24 19:11:47 +0000 | [diff] [blame] | 1 | From e2e2fe86dd61b6fae682a1fec31bd0755ced5cd5 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Tue, 7 Dec 2021 11:13:27 -0800 |
| 4 | Subject: [PATCH] v3dv: account for 64bit time_t on 32bit arches |
| 5 | |
| 6 | This makes is a bit more portable, especially on 32bit architectures |
| 7 | with 64bit time_t defaults. Especially on musl its a must. |
| 8 | |
| 9 | Fixes |
| 10 | ../mesa-21.3.0/src/broadcom/vulkan/v3dv_bo.c:71:15: error: format specifies type 'long' but the argument has type 'time_t' (aka 'long long') [-Werror,-Wformat] |
| 11 | time.tv_sec); |
| 12 | ^~~~~~~~~~~ |
| 13 | |
| 14 | Also reported here [1] |
| 15 | |
| 16 | [1] https://github.com/agherzan/meta-raspberrypi/issues/969 |
| 17 | |
| 18 | Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14118] |
| 19 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 20 | --- |
| 21 | src/broadcom/vulkan/v3dv_bo.c | 4 ++-- |
| 22 | 1 file changed, 2 insertions(+), 2 deletions(-) |
| 23 | |
| 24 | diff --git a/src/broadcom/vulkan/v3dv_bo.c b/src/broadcom/vulkan/v3dv_bo.c |
| 25 | index 71679ce..dc5e7f5 100644 |
| 26 | --- a/src/broadcom/vulkan/v3dv_bo.c |
| 27 | +++ b/src/broadcom/vulkan/v3dv_bo.c |
| 28 | @@ -67,8 +67,8 @@ bo_dump_stats(struct v3dv_device *device) |
| 29 | |
| 30 | struct timespec time; |
| 31 | clock_gettime(CLOCK_MONOTONIC, &time); |
| 32 | - fprintf(stderr, " now: %ld\n", |
| 33 | - time.tv_sec); |
| 34 | + fprintf(stderr, " now: %lld\n", |
| 35 | + (long long)time.tv_sec); |
| 36 | } |
| 37 | |
| 38 | if (cache->size_list_size) { |
| 39 | -- |
| 40 | 2.34.1 |
| 41 | |