]> xenbits.xensource.com Git - qemu-xen-4.6-testing.git/commitdiff
enabled system emulator build on PowerPC - increased portability of soft mmu code
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Thu, 30 Oct 2003 01:18:42 +0000 (01:18 +0000)
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>
Thu, 30 Oct 2003 01:18:42 +0000 (01:18 +0000)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@435 c046a42c-6fe2-441c-8c8c-71466251a162

Makefile.target

index cb6a0cc60a874dcfa45e21098af76de6b923e5c7..5bd8a8c3b6ed9b7927009a90ae391e90351fde13 100644 (file)
@@ -20,10 +20,18 @@ endif
 ifdef CONFIG_USER_ONLY
 PROGS=$(QEMU_USER)
 else
-ifeq ($(ARCH),i386)
 ifeq ($(TARGET_ARCH), i386)
+
+ifeq ($(ARCH), i386)
+PROGS+=$(QEMU_SYSTEM)
+endif
+
+ifeq ($(ARCH), ppc)
+ifdef CONFIG_SOFTMMU
 PROGS+=$(QEMU_SYSTEM)
 endif
+endif
+
 endif
 endif
 
@@ -174,8 +182,17 @@ VL_OBJS+=sdl.o
 SDL_LIBS+=-L/usr/X11R6/lib -lX11 -lXext -lXv -ldl -lm
 endif
 
+VL_LDFLAGS=
+# specific flags are needed for non soft mmu emulator
+ifndef CONFIG_SOFTMMU
+VL_LDFLAGS+=-static -Wl,-T,$(SRC_PATH)/i386-vl.ld 
+endif
+ifdef CONFIG_STATIC
+VL_LDFLAGS+=-static
+endif
+
 $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a
-       $(CC) -static -Wl,-T,$(SRC_PATH)/i386-vl.ld -o $@ $^ $(LIBS) $(SDL_LIBS)
+       $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS)
 
 sdl.o: sdl.c
        $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $<