[Qemu-devel] amd64 compile

[Martin Garton <martin@wrasse.demon.co.uk>]

[-- Attachment #1: Type: TEXT/PLAIN, Size: 361 bytes --]


Hi,

qemu compile fails on amd64. the attached patch gives a succesful compile
with targets list "i386 i386-softmmu" It still doesn't run, and i386-user
still doesn't compile.

I don't know if my patch is neccesarily correct. I would appreciate 
any feedback.

Also, if anyone has got and further than I have on amd64, I would like to 
hear.

Regards,
Martin.

[-- Attachment #2: Type: TEXT/PLAIN, Size: 2567 bytes --]

? amd64_compile.patch
? arm-user
? config-host.h
? config-host.mak
? dyngen
? i386
? i386-softmmu
? i386-user
? ppc-softmmu
? ppc-user
? qemu-doc.html
? qemu-mkcow
? qemu-tech.html
? qemu.1
? sparc-user
Index: Makefile
===================================================================
RCS file: /cvsroot/qemu/qemu/Makefile,v
retrieving revision 1.61
diff -u -r1.61 Makefile
--- Makefile	4 Apr 2004 15:21:17 -0000	1.61
+++ Makefile	25 Apr 2004 15:30:51 -0000
@@ -1,6 +1,6 @@
 include config-host.mak
 
-CFLAGS=-Wall -O2 -g
+CFLAGS= -O2 -g
 ifdef CONFIG_WIN32
 CFLAGS+=-fpack-struct 
 endif
Index: Makefile.target
===================================================================
RCS file: /cvsroot/qemu/qemu/Makefile.target,v
retrieving revision 1.26
diff -u -r1.26 Makefile.target
--- Makefile.target	22 Apr 2004 00:02:08 -0000	1.26
+++ Makefile.target	25 Apr 2004 15:30:51 -0000
@@ -7,7 +7,7 @@
 VPATH+=:$(SRC_PATH)/linux-user
 DEFINES+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH)
 endif
-CFLAGS=-Wall -O2 -g
+CFLAGS=-O2 -g
 LDFLAGS=-g
 LIBS=
 HELPER_CFLAGS=$(CFLAGS)
@@ -121,7 +121,7 @@
 ifeq ($(ARCH),alpha)
 # -msmall-data is not used because we want two-instruction relocations
 # for the constant constructions
-OP_CFLAGS=-Wall -O2 -g
+OP_CFLAGS=-O2 -g
 # Ensure there's only a single GP
 CFLAGS += -msmall-data
 LDFLAGS+=-Wl,-T,$(SRC_PATH)/alpha.ld
Index: dyngen-exec.h
===================================================================
RCS file: /cvsroot/qemu/qemu/dyngen-exec.h,v
retrieving revision 1.10
diff -u -r1.10 dyngen-exec.h
--- dyngen-exec.h	21 Mar 2004 17:06:25 -0000	1.10
+++ dyngen-exec.h	25 Apr 2004 15:30:51 -0000
@@ -25,12 +25,16 @@
 typedef unsigned char uint8_t;
 typedef unsigned short uint16_t;
 typedef unsigned int uint32_t;
+#ifndef __x86_64__
 typedef unsigned long long uint64_t;
+#endif
 
 typedef signed char int8_t;
 typedef signed short int16_t;
 typedef signed int int32_t;
+#ifndef __x86_64__
 typedef signed long long int64_t;
+#endif
 
 #define INT8_MIN		(-128)
 #define INT16_MIN		(-32767-1)
Index: vl.c
===================================================================
RCS file: /cvsroot/qemu/qemu/vl.c,v
retrieving revision 1.61
diff -u -r1.61 vl.c
--- vl.c	22 Apr 2004 00:35:09 -0000	1.61
+++ vl.c	25 Apr 2004 15:30:53 -0000
@@ -353,7 +353,7 @@
     return ((int64_t)h << 32) | l;
 }
 
-#elif defined(__i386__)
+#elif defined(__i386__) || defined(__x86_64__)
 
 int64_t cpu_get_real_ticks(void)
 {