mesa: Fix broadcom vulkan driver build on 32bit arches with 64bit time_t

(From OE-Core rev: 42067ccbf465197ab8d5d6be6d15b71a526decf8)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Khem Raj
2021-12-07 12:14:23 -08:00
committed by Richard Purdie
parent 6fdfe7bc33
commit 921ef29760
2 changed files with 42 additions and 0 deletions

View File

@@ -0,0 +1,41 @@
From e2e2fe86dd61b6fae682a1fec31bd0755ced5cd5 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Tue, 7 Dec 2021 11:13:27 -0800
Subject: [PATCH] v3dv: account for 64bit time_t on 32bit arches
This makes is a bit more portable, especially on 32bit architectures
with 64bit time_t defaults. Especially on musl its a must.
Fixes
../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]
time.tv_sec);
^~~~~~~~~~~
Also reported here [1]
[1] https://github.com/agherzan/meta-raspberrypi/issues/969
Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14118]
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
src/broadcom/vulkan/v3dv_bo.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/broadcom/vulkan/v3dv_bo.c b/src/broadcom/vulkan/v3dv_bo.c
index 71679ce..dc5e7f5 100644
--- a/src/broadcom/vulkan/v3dv_bo.c
+++ b/src/broadcom/vulkan/v3dv_bo.c
@@ -67,8 +67,8 @@ bo_dump_stats(struct v3dv_device *device)
struct timespec time;
clock_gettime(CLOCK_MONOTONIC, &time);
- fprintf(stderr, " now: %ld\n",
- time.tv_sec);
+ fprintf(stderr, " now: %lld\n",
+ (long long)time.tv_sec);
}
if (cache->size_list_size) {
--
2.34.1

View File

@@ -20,6 +20,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \
file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \
file://0001-util-format-Check-for-NEON-before-using-it.patch \
file://0001-v3dv-account-for-64bit-time_t-on-32bit-arches.patch \
"
SRC_URI[sha256sum] = "a2753c09deef0ba14d35ae8a2ceff3fe5cd13698928c7bb62c2ec8736eb09ce1"