From: Andrew Cooper Date: Mon, 1 Aug 2016 12:36:44 +0000 (+0100) Subject: xen/types: Correct the definition of uintptr_t X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~651 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2eee1c746af6f683247700642786b7c21c991234;p=xen.git xen/types: Correct the definition of uintptr_t uintptr_t is specified as unsigned int in 32bit, not unsigned long. This is why, when copying inttypes.h from GCC, the use of PRIxPTR and similar is broken for 32bit builds. Use __attribute__((__mode__(__pointer__))) to get the compilers default pointer type, which matches the pre-existing inttypes.h Fix the identified breakage with ELF_PRPTRVAL Compile tested on all architectures, with a manual printk() to trigger any potential -Wformat issues. Signed-off-by: Andrew Cooper Reviewed-by: Jan Beulich --- diff --git a/xen/include/xen/libelf.h b/xen/include/xen/libelf.h index 95b5370ab4..d430c83b5d 100644 --- a/xen/include/xen/libelf.h +++ b/xen/include/xen/libelf.h @@ -83,15 +83,7 @@ typedef uintptr_t elf_ptrval; #define ELF_HANDLE_DECL(structname) structname##_handle /* Provides a type declaration for a HANDLE. */ -#ifdef __XEN__ -# define ELF_PRPTRVAL "lx" - /* - * PRIxPTR is misdefined in xen/include/xen/inttypes.h, on 32-bit, - * to "x", when in fact uintptr_t is an unsigned long. - */ -#else -# define ELF_PRPTRVAL PRIxPTR -#endif +#define ELF_PRPTRVAL PRIxPTR /* printf format a la PRId... for a PTRVAL */ #define ELF_DEFINE_HANDLE(structname) \ diff --git a/xen/include/xen/types.h b/xen/include/xen/types.h index c8092d0716..7bdc83bc2f 100644 --- a/xen/include/xen/types.h +++ b/xen/include/xen/types.h @@ -59,7 +59,7 @@ typedef __u32 __be32; typedef __u64 __le64; typedef __u64 __be64; -typedef unsigned long uintptr_t; +typedef unsigned int __attribute__((__mode__(__pointer__))) uintptr_t; typedef bool bool_t; #define test_and_set_bool(b) xchg(&(b), true)