On Thu, Mar 23, 2017 at 12:42:41PM +0000, Peter Maydell wrote:
> The REG_PC define in disas/microblaze.c clashes with a define in
> the Linux SPARC system headers:
>
> /home/pm215/qemu/disas/microblaze.c:162:0: error: "REG_PC" redefined [-Werror]
> #define REG_PC 32 /* PC */
>
> In file included from /usr/include/signal.h:326:0,
> from /home/pm215/qemu/include/qemu/osdep.h:86,
> from /home/pm215/qemu/disas/microblaze.c:36:
> /usr/include/sparc64-linux-gnu/sys/ucontext.h:96:0: note: this is the
> location of the previous definition
> #define REG_PC (1)
>
> Since the code doesn't actually use the REG_PC define
> anywhere, the simplest fix is just to remove it.
Reviewed-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
>
> Signed-off-by: Peter Maydell <peter.mayd...@linaro.org>
> ---
> disas/microblaze.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/disas/microblaze.c b/disas/microblaze.c
> index 407c0a3..7795a0b 100644
> --- a/disas/microblaze.c
> +++ b/disas/microblaze.c
> @@ -159,7 +159,7 @@ enum microblaze_instr_type {
> #define MIN_PVR_REGNUM 0
> #define MAX_PVR_REGNUM 15
>
> -#define REG_PC 32 /* PC */
> +/* 32 is REG_PC */
> #define REG_MSR 33 /* machine status reg */
> #define REG_EAR 35 /* Exception reg */
> #define REG_ESR 37 /* Exception reg */
> --
> 2.7.4
>
