Module: Mesa Branch: staging/21.3 Commit: 4620e9a8b7a1654bd83fc80fe0df628643e375c3 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4620e9a8b7a1654bd83fc80fe0df628643e375c3
Author: satmandu <[email protected]> Date: Fri Sep 10 20:58:09 2021 +0000 Fix compilation on armv7l with gcc 11.2.0 Cc: mesa-stable Reviewed-by: Rob Clark <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12810> (cherry picked from commit d27805753fdc6319676ef1c7aa86ac3d941c6a3c) --- .pick_status.json | 2 +- src/gallium/drivers/freedreno/freedreno_util.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 351119bbd7e..53d69045230 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -436,7 +436,7 @@ "description": "Fix compilation on armv7l with gcc 11.2.0", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/gallium/drivers/freedreno/freedreno_util.h b/src/gallium/drivers/freedreno/freedreno_util.h index 5e0065717e4..22f99c41909 100644 --- a/src/gallium/drivers/freedreno/freedreno_util.h +++ b/src/gallium/drivers/freedreno/freedreno_util.h @@ -106,12 +106,14 @@ extern bool fd_binning_enabled; #include <unistd.h> #include <sys/types.h> +#include <sys/syscall.h> #define DBG(fmt, ...) \ do { \ if (FD_DBG(MSGS)) \ - mesa_logi("%5d: %s:%d: " fmt, gettid(), __FUNCTION__, __LINE__, \ - ##__VA_ARGS__); \ + mesa_logi("%5d: %s:%d: " fmt, ((pid_t)syscall(SYS_gettid)), \ + __FUNCTION__, __LINE__, \ + ##__VA_ARGS__); \ } while (0) #define perf_debug_message(debug, type, ...) \
