Commit c321f673095506f7fd67af8298eaf361f89fe554
1 parent
7f7f9873
enabled system emulator build on PowerPC - increased portability of soft mmu code
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@435 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
19 additions
and
2 deletions
Makefile.target
| ... | ... | @@ -20,11 +20,19 @@ endif |
| 20 | 20 | ifdef CONFIG_USER_ONLY |
| 21 | 21 | PROGS=$(QEMU_USER) |
| 22 | 22 | else |
| 23 | -ifeq ($(ARCH),i386) | |
| 24 | 23 | ifeq ($(TARGET_ARCH), i386) |
| 24 | + | |
| 25 | +ifeq ($(ARCH), i386) | |
| 26 | +PROGS+=$(QEMU_SYSTEM) | |
| 27 | +endif | |
| 28 | + | |
| 29 | +ifeq ($(ARCH), ppc) | |
| 30 | +ifdef CONFIG_SOFTMMU | |
| 25 | 31 | PROGS+=$(QEMU_SYSTEM) |
| 26 | 32 | endif |
| 27 | 33 | endif |
| 34 | + | |
| 35 | +endif | |
| 28 | 36 | endif |
| 29 | 37 | |
| 30 | 38 | ifdef CONFIG_STATIC |
| ... | ... | @@ -174,8 +182,17 @@ VL_OBJS+=sdl.o |
| 174 | 182 | SDL_LIBS+=-L/usr/X11R6/lib -lX11 -lXext -lXv -ldl -lm |
| 175 | 183 | endif |
| 176 | 184 | |
| 185 | +VL_LDFLAGS= | |
| 186 | +# specific flags are needed for non soft mmu emulator | |
| 187 | +ifndef CONFIG_SOFTMMU | |
| 188 | +VL_LDFLAGS+=-static -Wl,-T,$(SRC_PATH)/i386-vl.ld | |
| 189 | +endif | |
| 190 | +ifdef CONFIG_STATIC | |
| 191 | +VL_LDFLAGS+=-static | |
| 192 | +endif | |
| 193 | + | |
| 177 | 194 | $(QEMU_SYSTEM): $(VL_OBJS) libqemu.a |
| 178 | - $(CC) -static -Wl,-T,$(SRC_PATH)/i386-vl.ld -o $@ $^ $(LIBS) $(SDL_LIBS) | |
| 195 | + $(CC) $(VL_LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) | |
| 179 | 196 | |
| 180 | 197 | sdl.o: sdl.c |
| 181 | 198 | $(CC) $(CFLAGS) $(DEFINES) $(SDL_CFLAGS) -c -o $@ $< | ... | ... |