gwj / at91sam9263 · Commits

Commit e3086fbf8f3e8242f7b5040a7a080e051bb9c2b3

Authored by bellard
1 parent 7c3fc84d

kqemu support 


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1277 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 2 changed files with 15 additions and 2 deletions
Makefile
  View file @e3086fb
@@ -17,6 +17,9 @@ all: dyngen$(EXESUF) $(TOOLS) $(DOCS) @@ -17,6 +17,9 @@ all: dyngen$(EXESUF) $(TOOLS) $(DOCS)
17 for d in $(TARGET_DIRS); do \ 17 for d in $(TARGET_DIRS); do \
18 $(MAKE) -C $$d $@ || exit 1 ; \ 18 $(MAKE) -C $$d $@ || exit 1 ; \
19 done 19 done
  20 +ifdef CONFIG_KQEMU
  21 + $(MAKE) -C kqemu
  22 +endif
20 23
21 qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c 24 qemu-img$(EXESUF): qemu-img.c block.c block-cow.c block-qcow.c aes.c block-vmdk.c block-cloop.c block-dmg.c
22 $(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS) 25 $(CC) -DQEMU_TOOL $(CFLAGS) $(LDFLAGS) $(DEFINES) -o $@ $^ -lz $(LIBS)
@@ -32,6 +35,9 @@ clean: @@ -32,6 +35,9 @@ clean:
32 for d in $(TARGET_DIRS); do \ 35 for d in $(TARGET_DIRS); do \
33 $(MAKE) -C $$d $@ || exit 1 ; \ 36 $(MAKE) -C $$d $@ || exit 1 ; \
34 done 37 done
  38 +ifdef CONFIG_KQEMU
  39 + $(MAKE) -C kqemu clean
  40 +endif
35 41
36 distclean: clean 42 distclean: clean
37 rm -f config-host.mak config-host.h 43 rm -f config-host.mak config-host.h
@@ -63,6 +69,9 @@ endif @@ -63,6 +69,9 @@ endif
63 for d in $(TARGET_DIRS); do \ 69 for d in $(TARGET_DIRS); do \
64 $(MAKE) -C $$d $@ || exit 1 ; \ 70 $(MAKE) -C $$d $@ || exit 1 ; \
65 done 71 done
  72 +ifdef CONFIG_KQEMU
  73 + cd kqemu ; ./install.sh
  74 +endif
66 75
67 # various test targets 76 # various test targets
68 test speed test2: all 77 test speed test2: all
Makefile.target
  View file @e3086fb
@@ -237,8 +237,8 @@ SRCS:= $(OBJS:.o=.c) @@ -237,8 +237,8 @@ SRCS:= $(OBJS:.o=.c)
237 OBJS+= libqemu.a 237 OBJS+= libqemu.a
238 238
239 # cpu emulator library 239 # cpu emulator library
240 -LIBOBJS=exec.o translate-all.o cpu-exec.o\  
241 - translate.o op.o 240 +LIBOBJS=exec.o kqemu.o translate-all.o cpu-exec.o\
  241 + translate.o op.o
242 242
243 ifeq ($(TARGET_ARCH), i386) 243 ifeq ($(TARGET_ARCH), i386)
244 LIBOBJS+=helper.o helper2.o 244 LIBOBJS+=helper.o helper2.o
@@ -363,6 +363,10 @@ ifndef CONFIG_WIN32 @@ -363,6 +363,10 @@ ifndef CONFIG_WIN32
363 VL_LIBS=-lutil 363 VL_LIBS=-lutil
364 endif 364 endif
365 endif 365 endif
  366 +ifdef TARGET_GPROF
  367 +vl.o: CFLAGS+=-p
  368 +VL_LDFLAGS+=-p
  369 +endif
366 370
367 $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a 371 $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
368 $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(VL_LIBS) 372 $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(VL_LIBS)