[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] Mingw build fails on ppc-softmmu
From: |
Filip Navara |
Subject: |
Re: [Qemu-devel] Mingw build fails on ppc-softmmu |
Date: |
Tue, 08 Jun 2004 22:40:24 +0200 |
User-agent: |
Mozilla Thunderbird 0.6 (Windows/20040502) |
Try the attached patch... I don't like it, but it solves the problems
for me.
- Filip
Maarten Boekhold wrote:
Hi,
I'm trying to build qemu using mingw, and the build fails at:
make[1]: Entering directory `/e/Maarten/src/qemu/ppc-softmmu'
gcc -Wall -O2 -g -fno-strict-aliasing -fomit-frame-pointer -I.
-I/e/Maarten/src/qemu/target-ppc -I/e/Maarten/src/qemu -D_GNU_SOURCE
-c -o vl.o /e/Maarten/src/qemu/vl.c
In file included from E:/msys/1.0/mingw/include/windef.h:246,
from E:/msys/1.0/mingw/include/windows.h:48,
from e:/Maarten/src/qemu/vl.c:60:
E:/msys/1.0/mingw/include/winnt.h:97: parse error before numeric constant
I've been trying to track how this case is different from when it
builds it from i386-softmmu (which succeeds), to no avail. Any
suggestions?
This is a CVS checkout of the 7th...
Maarten
diff -u -r qemu/target-ppc/cpu.h qemu.wincopy/target-ppc/cpu.h
--- qemu/target-ppc/cpu.h Wed Jun 2 20:54:28 2004
+++ qemu.wincopy/target-ppc/cpu.h Tue Jun 8 20:19:10 2004
@@ -343,7 +343,8 @@
#define THRM2 SPR_ENCODE(1021)
#define THRM3 SPR_ENCODE(1022)
#define SP SPR_ENCODE(1021)
-#define LP SPR_ENCODE(1022)
+/* Conflicts with Win32 API defininition on MinGW builds */
+/* #define LP SPR_ENCODE(1022) */
#define DABR_MASK 0xFFFFFFF8
#define FPECR SPR_ENCODE(1022)
#define PIR SPR_ENCODE(1023)
diff -u -r qemu/target-ppc/helper.c qemu.wincopy/target-ppc/helper.c
--- qemu/target-ppc/helper.c Wed Jun 2 20:54:28 2004
+++ qemu.wincopy/target-ppc/helper.c Tue Jun 8 20:29:02 2004
@@ -27,8 +27,6 @@
//#define DEBUG_BATS
//#define DEBUG_EXCEPTIONS
-extern FILE *stdout, *stderr;
-
/*****************************************************************************/
/* PPC MMU emulation */
int cpu_ppc_handle_mmu_fault (CPUState *env, uint32_t address, int rw,
diff -u -r qemu/target-ppc/op_helper.c qemu.wincopy/target-ppc/op_helper.c
--- qemu/target-ppc/op_helper.c Wed Jun 2 20:54:30 2004
+++ qemu.wincopy/target-ppc/op_helper.c Tue Jun 8 20:30:06 2004
@@ -464,7 +464,14 @@
/*****************************************************************************/
/* Special helpers for debug */
+#ifndef _WIN32
extern FILE *stdout;
+#else
+struct FILE { int opaque; };
+extern FILE (*_imp___iob)[];
+#define _iob (*_imp___iob)
+#define stdout (&_iob[1])
+#endif
void dump_state (void)
{