mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

disas/microblaze: Remove unused REG_PC define

Browse Source 
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.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1490272961-1128-1-git-send-email-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell 2017-03-23 12:42:41 +00:00
parent 0832970119
commit bd517b4337
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
disas/microblaze.c
View File

@ -159,7 +159,7 @@ enum microblaze_instr_type {
#define MIN_PVR_REGNUM 0 #define MIN_PVR_REGNUM 0
#define MAX_PVR_REGNUM 15 #define MAX_PVR_REGNUM 15
#define REG_PC 32 /* PC */ /* 32 is REG_PC */
#define REG_MSR 33 /* machine status reg */ #define REG_MSR 33 /* machine status reg */
#define REG_EAR 35 /* Exception reg */ #define REG_EAR 35 /* Exception reg */
#define REG_ESR 37 /* Exception reg */ #define REG_ESR 37 /* Exception reg */