[Mesa-dev] [PATCH 1/2] gallium/util: fix debug_get_flags_option on 32-bit

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Fri, Aug 28, 2015 at 1:58 AM, Dave Airlie <airlied at gmail.com> wrote:
> From: Dave Airlie <airlied at redhat.com>
>
> On 32-bit we need to use PRIu64 flags for printfs,
> otherwise this segfaults in R600_DEBUG=help otherwise.
>
> Cc: "11.0" <mesa-stable at lists.freedesktop.org>
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  src/gallium/auxiliary/util/u_debug.c | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/src/gallium/auxiliary/util/u_debug.c b/src/gallium/auxiliary/util/u_debug.c
> index b4503de..5fe9e33 100644
> --- a/src/gallium/auxiliary/util/u_debug.c
> +++ b/src/gallium/auxiliary/util/u_debug.c
> @@ -41,6 +41,7 @@
>  #include "util/u_tile.h"
>  #include "util/u_prim.h"
>  #include "util/u_surface.h"
> +#include <inttypes.h>
>
>  #include <stdio.h>
>  #include <limits.h> /* CHAR_BIT */
> @@ -275,7 +276,7 @@ debug_get_flags_option(const char *name,
>        for (; flags->name; ++flags)
>           namealign = MAX2(namealign, strlen(flags->name));
>        for (flags = orig; flags->name; ++flags)
> -         _debug_printf("| %*s [0x%0*lx]%s%s\n", namealign, flags->name,
> +         _debug_printf("| %*s [0x%0*"PRIu64"]%s%s\n", namealign, flags->name,
>                        (int)sizeof(uint64_t)*CHAR_BIT/4, flags->value,
>                        flags->desc ? " " : "", flags->desc ? flags->desc : "");
>     }
> @@ -290,9 +291,9 @@ debug_get_flags_option(const char *name,
>
>     if (debug_get_option_should_print()) {
>        if (str) {
> -         debug_printf("%s: %s = 0x%lx (%s)\n", __FUNCTION__, name, result, str);
> +         debug_printf("%s: %s = 0x%"PRIu64" (%s)\n", __FUNCTION__, name, result, str);
>        } else {
> -         debug_printf("%s: %s = 0x%lx\n", __FUNCTION__, name, result);
> +         debug_printf("%s: %s = 0x%"PRIu64"\n", __FUNCTION__, name, result);
>        }
>     }
>
> --
> 2.4.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev