On 09/14/2016 03:59 PM, Alex Bennée wrote:
>
> David Gibson <da...@gibson.dropbear.id.au> writes:
>
>> From: Cédric Le Goater <c...@kaod.org>
>>
>> The exact same routine will be used in PowerNV.
>>
>> Signed-off-by: Cédric Le Goater <c...@kaod.org>
>> Signed-off-by: David Gibson <da...@gibson.dropbear.id.au>
>
> This patch has broken 32 bit x86 builds on CentOS6 (I happened to be looking
> at something else and found it broken):
>
> 14:57 alex@centos6-x86/i686 [qemu.git/bisect:???] >make
> CC ppc-softmmu/hw/ppc/fdt.o
> In file included from /home/alex/lsrc/qemu.git/hw/ppc/fdt.c:14:
> /home/alex/lsrc/qemu.git/include/hw/ppc/fdt.h:15: error: redefinition of
> typedef ‘CPUPPCState’
> /home/alex/lsrc/qemu.git/target-ppc/cpu-qom.h:41: note: previous
> declaration of ‘CPUPPCState’ was here
> make[1]: *** [hw/ppc/fdt.o] Error 1
> make: *** [subdir-ppc-softmmu] Error 2
ok. CentOS6 must be 4.4 compiler, which has that kind of problem.
Could you try that quick fix ?
Thanks,
C.
>From 0d0c0ac07ef82c656a8664241bef4f8e834a9b44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <c...@kaod.org>
Date: Wed, 14 Sep 2016 16:27:26 +0200
Subject: [PATCH] hw/ppc: fix a compile breakage on CentOS 6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Old versions of gcc, like on CentOS 6, do not support multiple
declarations of the same typedef. Let's remove the extra one in header
file hw/ppc/fdt.h.
Signed-off-by: Cédric Le Goater <c...@kaod.org>
---
include/hw/ppc/fdt.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/include/hw/ppc/fdt.h b/include/hw/ppc/fdt.h
index 2c68d1616f5c..b58ef616c45c 100644
--- a/include/hw/ppc/fdt.h
+++ b/include/hw/ppc/fdt.h
@@ -12,8 +12,6 @@
#include "qemu/error-report.h"
-typedef struct CPUPPCState CPUPPCState;
-
#define _FDT(exp) \
do { \
int ret = (exp); \
--
2.7.4
