* [Qemu-devel] [PATCH for-2.9] disas/microblaze: Remove unused REG_PC define
@ 2017-03-23 12:42 Peter Maydell
2017-03-23 19:41 ` Edgar E. Iglesias
0 siblings, 1 reply; 3+ messages in thread
From: Peter Maydell @ 2017-03-23 12:42 UTC (permalink / raw)
To: qemu-devel; +Cc: patches, Edgar E. Iglesias
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>
---
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.9] disas/microblaze: Remove unused REG_PC define
2017-03-23 12:42 [Qemu-devel] [PATCH for-2.9] disas/microblaze: Remove unused REG_PC define Peter Maydell
@ 2017-03-23 19:41 ` Edgar E. Iglesias
2017-03-24 11:24 ` Peter Maydell
0 siblings, 1 reply; 3+ messages in thread
From: Edgar E. Iglesias @ 2017-03-23 19:41 UTC (permalink / raw)
To: Peter Maydell; +Cc: qemu-devel, patches
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.iglesias@xilinx.com>
>
> Signed-off-by: Peter Maydell <peter.maydell@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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH for-2.9] disas/microblaze: Remove unused REG_PC define
2017-03-23 19:41 ` Edgar E. Iglesias
@ 2017-03-24 11:24 ` Peter Maydell
0 siblings, 0 replies; 3+ messages in thread
From: Peter Maydell @ 2017-03-24 11:24 UTC (permalink / raw)
To: Edgar E. Iglesias; +Cc: QEMU Developers, patches
On 23 March 2017 at 19:41, Edgar E. Iglesias <edgar.iglesias@gmail.com> wrote:
> 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.iglesias@xilinx.com>
Thanks; applied to master.
-- PMM
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-03-24 11:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-23 12:42 [Qemu-devel] [PATCH for-2.9] disas/microblaze: Remove unused REG_PC define Peter Maydell
2017-03-23 19:41 ` Edgar E. Iglesias
2017-03-24 11:24 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.