cr2 update (dosemu VGA support fix)

[qemu] / Makefile

diff --git a/Makefile b/Makefile
index c1b3d56..a5d4556 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,6 +29,18 @@ OP_CFLAGS=$(CFLAGS)
 LDFLAGS+=-Wl,-T,s390.ld
 endif
 
+ifeq ($(ARCH),sparc)
+CFLAGS+=-m32 -ffixed-g1 -ffixed-g2 -ffixed-g3 -ffixed-g6
+LDFLAGS+=-m32
+OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -ffixed-i0
+endif
+
+ifeq ($(ARCH),sparc64)
+CFLAGS+=-m64 -ffixed-g1 -ffixed-g2 -ffixed-g3 -ffixed-g6
+LDFLAGS+=-m64
+OP_CFLAGS=$(CFLAGS) -fno-delayed-branch -ffixed-i0
+endif
+
 ifeq ($(ARCH),alpha)
 # -msmall-data is not used because we want two-instruction relocations
 # for the constant constructions
@@ -63,8 +75,15 @@ SRCS:= $(OBJS:.o=.c)
 OBJS+= libqemu.a
 
 LIBOBJS+=thunk.o translate-i386.o op-i386.o exec-i386.o exec.o
+
 # NOTE: the disassembler code is only needed for debugging
-LIBOBJS+=disas.o ppc-dis.o i386-dis.o alpha-dis.o dis-buf.o
+LIBOBJS+=disas.o i386-dis.o dis-buf.o
+ifeq ($(ARCH),alpha)
+LIBOBJS+=alpha-dis.o
+endif
+ifeq ($(ARCH),ppc)
+LIBOBJS+=ppc-dis.o
+endif
 
 ifeq ($(ARCH),ia64)
 OBJS += ia64-syscall.o
@@ -128,11 +147,11 @@ FILES= \
 README README.distrib COPYING COPYING.LIB TODO Changelog VERSION \
 dyngen.c ioctls.h ops_template.h op_string.h  syscall_types.h\
 Makefile     elf.h       thunk.c\
-elfload.c   main.c            signal.c        thunk.h\
+elfload.c   main.c            signal.c        thunk.h exec.h\
 cpu-i386.h qemu.h op-i386.c opc-i386.h syscall-i386.h  translate-i386.c\
-dis-asm.h    gen-i386.h  syscall.c\
-dis-buf.c disas.c disas.h ppc-dis.c i386-dis.c  opreg_template.h  syscall_defs.h\
-ppc.ld s390.ld exec-i386.h exec-i386.c path.c configure \
+syscall.c opreg_template.h  syscall_defs.h vm86.c\
+dis-asm.h dis-buf.c disas.c disas.h alpha-dis.c ppc-dis.c i386-dis.c\
+ppc.ld s390.ld exec-i386.h exec-i386.c path.c exec.c mmap.c configure \
 tests/Makefile\
 tests/test-i386.c tests/test-i386-shift.h tests/test-i386.h\
 tests/test-i386-muldiv.h tests/test-i386-code16.S\