diff options
Diffstat (limited to 'Makefile.target')
| -rw-r--r-- | Makefile.target | 226 |
1 files changed, 96 insertions, 130 deletions
diff --git a/Makefile.target b/Makefile.target index c97dbf814..12fb0434c 100644 --- a/Makefile.target +++ b/Makefile.target @@ -17,6 +17,9 @@ endif ifeq ($(TARGET_ARCH), ppc64) TARGET_BASE_ARCH:=ppc endif +ifeq ($(TARGET_ARCH), ppc64h) +TARGET_BASE_ARCH:=ppc +endif ifeq ($(TARGET_ARCH), ppcemb) TARGET_BASE_ARCH:=ppc endif @@ -27,15 +30,18 @@ ifeq ($(TARGET_ARCH), ia64) TARGET_BASE_ARCH:=ia64 endif TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) -VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw:$(SRC_PATH)/audio -CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) +VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw +CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MP -DNEED_CPU_H ifdef CONFIG_DARWIN_USER VPATH+=:$(SRC_PATH)/darwin-user CPPFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH) endif ifdef CONFIG_LINUX_USER VPATH+=:$(SRC_PATH)/linux-user -CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ARCH) +ifndef TARGET_ABI_DIR + TARGET_ABI_DIR=$(TARGET_ARCH) +endif +CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) endif BASE_CFLAGS= BASE_LDFLAGS= @@ -70,6 +76,11 @@ ifeq ($(TARGET_ARCH),mips64) TARGET_ARCH2=mips64el endif endif +ifeq ($(TARGET_ARCH),sparc64) + ifeq ($(TARGET_ABI_DIR),sparc) + TARGET_ARCH2=sparc32plus + endif +endif QEMU_USER=qemu-$(TARGET_ARCH2) # system emulator name ifdef CONFIG_SOFTMMU @@ -136,15 +147,15 @@ endif endif ifeq ($(ARCH),x86_64) -BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld + ifneq ($(CONFIG_SOLARIS),yes) + BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld + endif endif ifeq ($(ARCH),ppc) CPPFLAGS+= -D__powerpc__ -ifdef CONFIG_LINUX_USER BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld endif -endif ifeq ($(ARCH),s390) BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld @@ -157,7 +168,7 @@ ifeq ($(ARCH),sparc) OP_CFLAGS+=-fno-omit-frame-pointer else BASE_CFLAGS+=-ffixed-g1 -ffixed-g6 - HELPER_CFLAGS=$(CFLAGS) -ffixed-i0 -mflat + HELPER_CFLAGS=$(CFLAGS) -ffixed-i0 # -static is used to avoid g1/g3 usage by the dynamic linker BASE_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -static endif @@ -255,12 +266,16 @@ main.o: BASE_CFLAGS+=-p endif ifdef CONFIG_LINUX_USER -OBJS= main.o syscall.o mmap.o signal.o path.o osdep.o thunk.o \ - elfload.o linuxload.o +OBJS= main.o syscall.o strace.o mmap.o signal.o path.o osdep.o thunk.o \ + elfload.o linuxload.o uaccess.o LIBS+= $(AIOLIBS) ifdef TARGET_HAS_BFLT OBJS+= flatload.o endif +ifdef TARGET_HAS_ELFLOAD32 +OBJS+= elfload32.o +elfload32.o: elfload.c +endif ifeq ($(TARGET_ARCH), i386) OBJS+= vm86.o @@ -295,9 +310,6 @@ CPPFLAGS+=-I$(SRC_PATH)/fpu ifeq ($(TARGET_ARCH), i386) LIBOBJS+=helper.o helper2.o LIBOBJS+=qemu-kvm-x86.o -ifeq ($(ARCH), i386) -LIBOBJS+=translate-copy.o -endif endif ifeq ($(TARGET_ARCH), x86_64) @@ -332,10 +344,22 @@ endif ifeq ($(TARGET_BASE_ARCH), alpha) LIBOBJS+= op_helper.o helper.o alpha_palcode.o endif + ifeq ($(TARGET_BASE_ARCH), ia64) LIBOBJS+=op_helper.o firmware.o LIBOBJS+=qemu-kvm-ia64.o endif + +ifeq ($(TARGET_BASE_ARCH), cris) +LIBOBJS+= op_helper.o helper.o +LIBOBJS+= cris-dis.o + +ifndef CONFIG_USER_ONLY +LIBOBJS+= mmu.o +endif +endif + + # NOTE: the disassembler code is only needed for debugging LIBOBJS+=disas.o ifeq ($(findstring i386, $(TARGET_ARCH) $(ARCH)),i386) @@ -387,43 +411,29 @@ ifeq ($(ARCH),alpha) endif # must use static linking to avoid leaving stuff in virtual address space -VL_OBJS=vl.o osdep.o readline.o monitor.o pci.o console.o loader.o isa_mmio.o -VL_OBJS+=cutils.o migration.o -VL_OBJS+=block.o block-raw.o -VL_OBJS+=block-cow.o block-qcow.o aes.o block-vmdk.o block-cloop.o block-dmg.o block-bochs.o block-vpc.o block-vvfat.o block-qcow2.o block-parallels.o -VL_OBJS+=irq.o +VL_OBJS=vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o migration.o +# XXX: suppress QEMU_TOOL tests ifdef CONFIG_WIN32 -VL_OBJS+=tap-win32.o +VL_OBJS+=block-raw-win32.o +else +VL_OBJS+=block-raw-posix.o endif -SOUND_HW = sb16.o es1370.o -AUDIODRV = audio.o noaudio.o wavaudio.o mixeng.o -ifdef CONFIG_SDL -AUDIODRV += sdlaudio.o -endif -ifdef CONFIG_OSS -AUDIODRV += ossaudio.o -endif -ifdef CONFIG_COREAUDIO -AUDIODRV += coreaudio.o -endif ifdef CONFIG_ALSA -AUDIODRV += alsaaudio.o LIBS += -lasound endif ifdef CONFIG_DSOUND -AUDIODRV += dsoundaudio.o LIBS += -lole32 -ldxguid endif ifdef CONFIG_FMOD -AUDIODRV += fmodaudio.o -audio.o fmodaudio.o: CPPFLAGS := -I$(CONFIG_FMOD_INC) $(CPPFLAGS) LIBS += $(CONFIG_FMOD_LIB) endif + +SOUND_HW = sb16.o es1370.o ifdef CONFIG_ADLIB SOUND_HW += fmopl.o adlib.o endif -AUDIODRV+= wavcapture.o + ifdef CONFIG_KVM_KERNEL_INC CFLAGS += -I $(CONFIG_KVM_KERNEL_INC) LIBS += -lkvm @@ -435,14 +445,11 @@ CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS) LIBS += $(CONFIG_VNC_TLS_LIBS) endif -VL_OBJS += i2c.o smbus.o - # SCSI layer -VL_OBJS+= scsi-disk.o cdrom.o lsi53c895a.o +VL_OBJS+= lsi53c895a.o # USB layer -VL_OBJS+= usb.o usb-hub.o usb-linux.o usb-hid.o usb-ohci.o usb-msd.o -VL_OBJS+= usb-wacom.o +VL_OBJS+= usb-ohci.o # EEPROM emulation VL_OBJS += eeprom93xx.o @@ -458,10 +465,10 @@ VL_OBJS+= hypercall.o ifeq ($(TARGET_BASE_ARCH), i386) # Hardware support -VL_OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV) +VL_OBJS+= ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o VL_OBJS+= fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o VL_OBJS+= cirrus_vga.o apic.o parallel.o acpi.o piix_pci.o -VL_OBJS+= usb-uhci.o smbus_eeprom.o vmmouse.o vmport.o vmware_vga.o +VL_OBJS+= usb-uhci.o vmmouse.o vmport.o vmware_vga.o CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE endif ifeq ($(TARGET_BASE_ARCH), ia64) @@ -473,20 +480,36 @@ VL_OBJS+= usb-uhci.o smbus_eeprom.o CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE endif ifeq ($(TARGET_BASE_ARCH), ppc) -VL_OBJS+= ppc.o ide.o pckbd.o ps2.o vga.o $(SOUND_HW) dma.o $(AUDIODRV) -VL_OBJS+= mc146818rtc.o serial.o i8259.o i8254.o fdc.o m48t59.o pflash_cfi02.o -VL_OBJS+= ppc_prep.o ppc_chrp.o cuda.o adb.o openpic.o heathrow_pic.o -VL_OBJS+= grackle_pci.o prep_pci.o unin_pci.o ppc405_uc.o ppc405_boards.o CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE +# shared objects +VL_OBJS+= ppc.o ide.o vga.o $(SOUND_HW) dma.o openpic.o +# PREP target +VL_OBJS+= pckbd.o ps2.o serial.o i8259.o i8254.o fdc.o m48t59.o mc146818rtc.o +VL_OBJS+= prep_pci.o ppc_prep.o +# Mac shared devices +VL_OBJS+= macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o +# OldWorld PowerMac +VL_OBJS+= heathrow_pic.o grackle_pci.o ppc_oldworld.o +# NewWorld PowerMac +VL_OBJS+= unin_pci.o ppc_chrp.o +# PowerPC 4xx boards +VL_OBJS+= pflash_cfi02.o ppc4xx_devs.o ppc405_uc.o ppc405_boards.o endif ifeq ($(TARGET_BASE_ARCH), mips) -VL_OBJS+= mips_r4k.o mips_malta.o mips_pica61.o +VL_OBJS+= mips_r4k.o mips_malta.o mips_pica61.o mips_mipssim.o VL_OBJS+= mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o VL_OBJS+= jazz_led.o VL_OBJS+= ide.o gt64xxx.o pckbd.o ps2.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o -VL_OBJS+= piix_pci.o smbus_eeprom.o parallel.o mixeng.o cirrus_vga.o $(SOUND_HW) $(AUDIODRV) +VL_OBJS+= piix_pci.o parallel.o cirrus_vga.o $(SOUND_HW) +VL_OBJS+= mipsnet.o CPPFLAGS += -DHAS_AUDIO endif +ifeq ($(TARGET_BASE_ARCH), cris) +VL_OBJS+= etraxfs.o +VL_OBJS+= ptimer.o +VL_OBJS+= etraxfs_timer.o +VL_OBJS+= etraxfs_ser.o +endif ifeq ($(TARGET_BASE_ARCH), sparc) ifeq ($(TARGET_ARCH), sparc64) VL_OBJS+= sun4u.o ide.o pckbd.o ps2.o vga.o apb_pci.o @@ -495,38 +518,38 @@ VL_OBJS+= cirrus_vga.o parallel.o ptimer.o else VL_OBJS+= sun4m.o tcx.o pcnet.o iommu.o m48t59.o slavio_intctl.o VL_OBJS+= slavio_timer.o slavio_serial.o slavio_misc.o fdc.o esp.o sparc32_dma.o -VL_OBJS+= cs4231.o ptimer.o +VL_OBJS+= cs4231.o ptimer.o eccmemctl.o endif endif ifeq ($(TARGET_BASE_ARCH), arm) VL_OBJS+= integratorcp.o versatilepb.o ps2.o smc91c111.o arm_pic.o arm_timer.o VL_OBJS+= arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o -VL_OBJS+= versatile_pci.o sd.o ptimer.o -VL_OBJS+= arm_gic.o realview.o arm_sysctl.o +VL_OBJS+= versatile_pci.o ptimer.o +VL_OBJS+= realview_gic.o realview.o arm_sysctl.o mpcore.o +VL_OBJS+= armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o +VL_OBJS+= pl061.o VL_OBJS+= arm-semi.o VL_OBJS+= pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o -VL_OBJS+= pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o max111x.o max7310.o -VL_OBJS+= spitz.o ads7846.o ide.o serial.o nand.o $(AUDIODRV) wm8750.o -VL_OBJS+= omap.o omap_lcdc.o omap1_clk.o omap_mmc.o palm.o ecc.o +VL_OBJS+= pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o +VL_OBJS+= pflash_cfi01.o gumstix.o +VL_OBJS+= spitz.o ide.o serial.o nand.o ecc.o +VL_OBJS+= omap.o omap_lcdc.o omap1_clk.o omap_mmc.o omap_i2c.o +VL_OBJS+= palm.o tsc210x.o +VL_OBJS+= mst_fpga.o mainstone.o CPPFLAGS += -DHAS_AUDIO endif ifeq ($(TARGET_BASE_ARCH), sh4) VL_OBJS+= shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o -VL_OBJS+= sh_timer.o ptimer.o sh_serial.o +VL_OBJS+= sh_timer.o ptimer.o sh_serial.o sh_intc.o endif ifeq ($(TARGET_BASE_ARCH), m68k) VL_OBJS+= an5206.o mcf5206.o ptimer.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o -VL_OBJS+= m68k-semi.o +VL_OBJS+= m68k-semi.o dummy_m68k.o endif ifdef CONFIG_GDBSTUB VL_OBJS+=gdbstub.o endif -ifdef CONFIG_SDL -VL_OBJS+=sdl.o x_keymap.o -endif -VL_OBJS+=vnc.o d3des.o ifdef CONFIG_COCOA -VL_OBJS+=cocoa.o COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit ifdef CONFIG_COREAUDIO COCOA_LIBS+=-framework CoreAudio @@ -534,10 +557,6 @@ endif endif ifdef CONFIG_SLIRP CPPFLAGS+=-I$(SRC_PATH)/slirp -SLIRP_OBJS=cksum.o if.o ip_icmp.o ip_input.o ip_output.o \ -slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o \ -tcp_subr.o tcp_timer.o udp.o bootp.o debug.o tftp.o -VL_OBJS+=$(addprefix slirp/, $(SLIRP_OBJS)) endif VL_LDFLAGS=$(VL_OS_LDFLAGS) @@ -572,25 +591,20 @@ ifeq ($(ARCH),sparc64) endif endif +ifeq ($(ARCH),x86_64) + VL_LDFLAGS+=-m64 + ifneq ($(CONFIG_SOLARIS),yes) + VL_LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld + endif +endif + ifdef CONFIG_WIN32 SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole endif -$(QEMU_SYSTEM): $(VL_OBJS) libqemu.a $(DEPLIBS) +$(QEMU_SYSTEM): $(VL_OBJS) ../libqemu_common.a libqemu.a $(DEPLIBS) $(CC) $(VL_LDFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(VL_LIBS) -cocoa.o: cocoa.m - $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $< - -sdl.o: sdl.c keymaps.c sdl_keysym.h - $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) $(BASE_CFLAGS) -c -o $@ $< - -vnc.o: vnc.c keymaps.c sdl_keysym.h vnchextile.h d3des.c d3des.h - $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $< - -sdlaudio.o: sdlaudio.c - $(CC) $(CFLAGS) $(CPPFLAGS) $(SDL_CFLAGS) $(BASE_CFLAGS) -c -o $@ $< - depend: $(SRCS) $(CC) -MM $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) $^ 1>.depend @@ -654,58 +668,6 @@ endif signal.o: signal.c $(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $< -vga.o: pixel_ops.h - -tcx.o: pixel_ops.h - -ifeq ($(TARGET_BASE_ARCH), i386) -op.o: op.c opreg_template.h ops_template.h ops_template_mem.h ops_mem.h ops_sse.h -endif - -ifeq ($(TARGET_ARCH), arm) -op.o: op.c op_template.h -pl110.o: pl110_template.h -endif - -ifeq ($(TARGET_BASE_ARCH), sparc) -helper.o: cpu.h exec-all.h -op.o: op.c op_template.h op_mem.h fop_template.h fbranch_template.h exec.h cpu.h -op_helper.o: exec.h softmmu_template.h cpu.h -translate.o: cpu.h exec-all.h disas.h -endif - -ifeq ($(TARGET_BASE_ARCH), ppc) -op.o: op.c op_template.h op_mem.h op_helper.h -op_helper.o: op_helper.c mfrom_table.c op_helper_mem.h op_helper.h -translate.o: translate.c translate_init.c -endif - -ifeq ($(TARGET_BASE_ARCH), mips) -helper.o: cpu.h exec-all.h -op.o: op_template.c fop_template.c op_mem.c exec.h cpu.h -op_helper.o: op_helper_mem.c exec.h softmmu_template.h cpu.h -translate.o: translate_init.c exec-all.h disas.h -endif - -loader.o: loader.c elf_ops.h - -ifeq ($(TARGET_ARCH), sh4) -op.o: op.c op_mem.c cpu.h -op_helper.o: op_helper.c exec.h cpu.h -helper.o: helper.c exec.h cpu.h -sh7750.o: sh7750.c sh7750_regs.h sh7750_regnames.h cpu.h -shix.o: shix.c sh7750_regs.h sh7750_regnames.h -sh7750_regnames.o: sh7750_regnames.c sh7750_regnames.h sh7750_regs.h -tc58128.o: tc58128.c -endif - -ifeq ($(TARGET_BASE_ARCH), alpha) -op.o: op.c op_template.h op_mem.h -op_helper.o: op_helper_mem.h -endif - -$(OBJS) $(LIBOBJS) $(VL_OBJS): config.h ../config-host.h - %.o: %.c $(CC) $(CFLAGS) $(CPPFLAGS) $(BASE_CFLAGS) -c -o $@ $< @@ -713,7 +675,8 @@ $(OBJS) $(LIBOBJS) $(VL_OBJS): config.h ../config-host.h $(CC) $(CPPFLAGS) -c -o $@ $< clean: - rm -f *.o *.a *~ $(PROGS) gen-op.h opc.h op.h nwfpe/*.o slirp/*.o fpu/*.o + rm -f *.o *.a *~ $(PROGS) gen-op.h opc.h op.h nwfpe/*.o fpu/*.o + rm -f *.d */*.d install: all ifneq ($(PROGS),) @@ -729,3 +692,6 @@ audio.o sdlaudio.o dsoundaudio.o ossaudio.o wavaudio.o noaudio.o \ fmodaudio.o alsaaudio.o mixeng.o sb16.o es1370.o gus.o adlib.o: \ CFLAGS := $(CFLAGS) -Wall -Werror -W -Wsign-compare endif + +# Include automatically generated dependency files +-include $(wildcard *.d */*.d) |