--- qemu/Makefile.target 2018/04/24 17:21:05 1.1.1.8 +++ qemu/Makefile.target 2018/04/24 17:34:56 1.1.1.9 @@ -1,11 +1,16 @@ -include config.mak +# -*- Mode: makefile -*- + +# This needs to be defined before rules.mak +GENERATED_HEADERS = config-target.h + +include ../config-host.mak +include config-devices.mak +include config-target.mak include $(SRC_PATH)/rules.mak TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH) VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw -CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H -#CFLAGS+=-Werror -LIBS= +QEMU_CFLAGS+= -I.. -I$(TARGET_PATH) -DNEED_CPU_H ifdef CONFIG_USER_ONLY # user emulator name @@ -21,135 +26,43 @@ endif PROGS=$(QEMU_PROG) -# cc-option -# Usage: CFLAGS+=$(call cc-option, $(CFLAGS), -falign-functions=0, -malign-functions=0) - -cc-option = $(shell if $(CC) $(1) $(2) -S -o /dev/null -xc /dev/null \ - > /dev/null 2>&1; then echo "$(2)"; else echo "$(3)"; fi ;) - -HELPER_CFLAGS= - -ifeq ($(ARCH),i386) -HELPER_CFLAGS+=-fomit-frame-pointer -endif - -ifeq ($(subst ppc64,ppc,$(ARCH))$(TARGET_BASE_ARCH),ppcppc) -translate.o: CFLAGS := $(CFLAGS) $(call cc-option, $(CFLAGS), -fno-unit-at-a-time,) -endif - -ifeq ($(ARCH),sparc) - ifneq ($(CONFIG_SOLARIS),y) - HELPER_CFLAGS+=-ffixed-i0 - endif -endif - -ifeq ($(ARCH),alpha) -# Ensure there's only a single GP -CFLAGS+=-msmall-data -endif - -ifeq ($(ARCH),ia64) -CFLAGS+=-mno-sdata -endif - -CPPFLAGS+=-D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -CPPFLAGS+=-U_FORTIFY_SOURCE LIBS+=-lm -ifdef CONFIG_WIN32 -LIBS+=-lwinmm -lws2_32 -liphlpapi -endif -ifdef CONFIG_SOLARIS -LIBS+=-lsocket -lnsl -lresolv -ifdef NEEDS_LIBSUNMATH -LIBS+=-lsunmath -LDFLAGS+=-L/opt/SUNWspro/prod/lib -R/opt/SUNWspro/prod/lib -CFLAGS+=-I/opt/SUNWspro/prod/include/cc -endif -endif -kvm.o: CFLAGS+=$(KVM_CFLAGS) -kvm-all.o: CFLAGS+=$(KVM_CFLAGS) +kvm.o kvm-all.o: QEMU_CFLAGS+=$(KVM_CFLAGS) + +config-target.h: config-target.h-timestamp +config-target.h-timestamp: config-target.mak all: $(PROGS) + # Dummy command so that make thinks it has done something @true ######################################################### # cpu emulator library -libobj-y = exec.o translate-all.o cpu-exec.o translate.o host-utils.o -libobj-$(CONFIG_KQEMU) += kqemu.o -# TCG code generator -libobj-y += tcg/tcg.o tcg/tcg-runtime.o -CPPFLAGS+=-I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/$(ARCH) -ifeq ($(ARCH),sparc64) -CPPFLAGS+=-I$(SRC_PATH)/tcg/sparc -endif -ifdef CONFIG_SOFTFLOAT -libobj-y += fpu/softfloat.o -else -libobj-y += fpu/softfloat-native.o -endif -CPPFLAGS+=-I$(SRC_PATH)/fpu +libobj-y = exec.o translate-all.o cpu-exec.o translate.o +libobj-y += tcg/tcg.o +libobj-$(CONFIG_SOFTFLOAT) += fpu/softfloat.o +libobj-$(CONFIG_NOSOFTFLOAT) += fpu/softfloat-native.o libobj-y += op_helper.o helper.o - -ifeq ($(TARGET_BASE_ARCH), arm) -libobj-y += neon_helper.o iwmmxt_helper.o -endif - -ifeq ($(TARGET_BASE_ARCH), alpha) -libobj-y += alpha_palcode.o -endif - -ifeq ($(TARGET_BASE_ARCH), cris) -libobj-y += cris-dis.o - -ifndef CONFIG_USER_ONLY -libobj-y += mmu.o -endif -endif +libobj-$(CONFIG_NEED_MMU) += mmu.o +libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o +libobj-$(TARGET_ALPHA) += alpha_palcode.o # NOTE: the disassembler code is only needed for debugging libobj-y += disas.o -ifeq ($(findstring i386, $(TARGET_ARCH) $(ARCH)),i386) -USE_I386_DIS=y -endif -ifeq ($(findstring x86_64, $(TARGET_ARCH) $(ARCH)),x86_64) -USE_I386_DIS=y -endif -libobj-$(USE_I386_DIS) += i386-dis.o -ifeq ($(findstring alpha, $(TARGET_ARCH) $(ARCH)),alpha) -libobj-y += alpha-dis.o -endif -ifeq ($(findstring ppc, $(TARGET_BASE_ARCH) $(ARCH)),ppc) -libobj-y += ppc-dis.o -endif -ifeq ($(findstring microblaze, $(TARGET_BASE_ARCH) $(ARCH)),microblaze) -libobj-y += microblaze-dis.o -ifndef CONFIG_USER_ONLY -libobj-y += mmu.o -endif -endif -ifeq ($(findstring mips, $(TARGET_BASE_ARCH) $(ARCH)),mips) -libobj-y += mips-dis.o -endif -ifeq ($(findstring sparc, $(TARGET_BASE_ARCH) $(ARCH)),sparc) -libobj-y += sparc-dis.o -endif -ifeq ($(findstring arm, $(TARGET_ARCH) $(ARCH)),arm) -libobj-y += arm-dis.o -endif -ifeq ($(findstring m68k, $(TARGET_ARCH) $(ARCH)),m68k) -libobj-y += m68k-dis.o -endif -ifeq ($(findstring sh4, $(TARGET_ARCH) $(ARCH)),sh4) -libobj-y += sh4-dis.o -endif -ifeq ($(findstring hppa, $(TARGET_BASE_ARCH) $(ARCH)),hppa) -libobj-y += hppa-dis.o -endif -ifeq ($(findstring s390, $(TARGET_ARCH) $(ARCH)),s390) -libobj-y += s390-dis.o -endif +libobj-$(CONFIG_ALPHA_DIS) += alpha-dis.o +libobj-$(CONFIG_ARM_DIS) += arm-dis.o +libobj-$(CONFIG_CRIS_DIS) += cris-dis.o +libobj-$(CONFIG_HPPA_DIS) += hppa-dis.o +libobj-$(CONFIG_I386_DIS) += i386-dis.o +libobj-$(CONFIG_M68K_DIS) += m68k-dis.o +libobj-$(CONFIG_MICROBLAZE_DIS) += microblaze-dis.o +libobj-$(CONFIG_MIPS_DIS) += mips-dis.o +libobj-$(CONFIG_PPC_DIS) += ppc-dis.o +libobj-$(CONFIG_S390_DIS) += s390-dis.o +libobj-$(CONFIG_SH4_DIS) += sh4-dis.o +libobj-$(CONFIG_SPARC_DIS) += sparc-dis.o # libqemu @@ -163,9 +76,11 @@ tcg/tcg.o: cpu.h # HELPER_CFLAGS is used for all the code compiled with static register # variables -op_helper.o: CFLAGS += $(HELPER_CFLAGS) +op_helper.o cpu-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS) -cpu-exec.o: CFLAGS += $(HELPER_CFLAGS) +# Note: this is a workaround. The real fix is to avoid compiling +# cpu_signal_handler() in cpu-exec.c. +signal.o: QEMU_CFLAGS += $(HELPER_CFLAGS) ######################################################### # Linux user emulator target @@ -173,130 +88,35 @@ cpu-exec.o: CFLAGS += $(HELPER_CFLAGS) ifdef CONFIG_LINUX_USER VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -CPPFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) - -ifdef CONFIG_STATIC -LDFLAGS+=-static -endif - -ifeq ($(ARCH),i386) -ifdef TARGET_GPROF -USE_I386_LD=y -endif -ifdef CONFIG_STATIC -USE_I386_LD=y -endif -ifdef USE_I386_LD -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -else -# WARNING: this LDFLAGS is _very_ tricky : qemu is an ELF shared object -# that the kernel ELF loader considers as an executable. I think this -# is the simplest way to make it self virtualizable! -LDFLAGS+=-Wl,-shared -endif -endif - -ifeq ($(ARCH),x86_64) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),ppc) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),ppc64) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),s390) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),sparc) -# -static is used to avoid g1/g3 usage by the dynamic linker -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -static -endif - -ifeq ($(ARCH),sparc64) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif +QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) +obj-y = main.o syscall.o strace.o mmap.o signal.o thunk.o \ + elfload.o linuxload.o uaccess.o gdbstub.o -ifeq ($(ARCH),alpha) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),ia64) -LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),arm) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),m68k) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),mips) -ifeq ($(WORDS_BIGENDIAN),yes) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -else -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld -endif -endif - -ifeq ($(ARCH),mips64) -ifeq ($(WORDS_BIGENDIAN),yes) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -else -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld -endif -endif - -# profiling code -ifdef TARGET_GPROF -LDFLAGS+=-p -CFLAGS+=-p -endif - -obj-y = main.o syscall.o strace.o mmap.o signal.o path.o thunk.o \ - elfload.o linuxload.o uaccess.o envlist.o gdbstub.o gdbstub-xml.o \ - ioport-user.o obj-$(TARGET_HAS_BFLT) += flatload.o - -ifdef TARGET_HAS_ELFLOAD32 -elfload32.o: elfload.c -endif obj-$(TARGET_HAS_ELFLOAD32) += elfload32.o -ifeq ($(TARGET_ARCH), i386) -obj-y += vm86.o -endif +obj-$(TARGET_I386) += vm86.o -nwfpe-obj-y := fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o +obj-i386-y += ioport-user.o + +nwfpe-obj-y = fpa11.o fpa11_cpdo.o fpa11_cpdt.o fpa11_cprt.o fpopcode.o nwfpe-obj-y += single_cpdo.o double_cpdo.o extended_cpdo.o obj-arm-y += $(addprefix nwfpe/, $(nwfpe-obj-y)) obj-arm-y += arm-semi.o obj-m68k-y += m68k-sim.o m68k-semi.o -# Note: this is a workaround. The real fix is to avoid compiling -# cpu_signal_handler() in cpu-exec.c. -signal.o: CFLAGS += $(HELPER_CFLAGS) +ARLIBS=../libuser/libuser.a libqemu.a -ARLIBS=../libqemu_user.a libqemu.a endif #CONFIG_LINUX_USER -LIBS+= $(PTHREADLIBS) -LIBS+= $(CLOCKLIBS) - ######################################################### # Darwin user emulator target ifdef CONFIG_DARWIN_USER VPATH+=:$(SRC_PATH)/darwin-user -CPPFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH) +QEMU_CFLAGS+=-I$(SRC_PATH)/darwin-user -I$(SRC_PATH)/darwin-user/$(TARGET_ARCH) # Leave some space for the regular program loading zone LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x1000 -image_base 0x0e000000 @@ -304,13 +124,11 @@ LDFLAGS+=-Wl,-segaddr,__STD_PROG_ZONE,0x LIBS+=-lmx obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \ - gdbstub.o gdbstub-xml.o ioport-user.o + gdbstub.o -# Note: this is a workaround. The real fix is to avoid compiling -# cpu_signal_handler() in cpu-exec.c. -signal.o: CFLAGS += $(HELPER_CFLAGS) +obj-i386-y += ioport-user.o -ARLIBS=libqemu.a +ARLIBS=../libuser/libuser.a libqemu.a endif #CONFIG_DARWIN_USER @@ -320,128 +138,28 @@ endif #CONFIG_DARWIN_USER ifdef CONFIG_BSD_USER VPATH+=:$(SRC_PATH)/bsd-user -CPPFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH) - -ifdef CONFIG_STATIC -LDFLAGS+=-static -endif - -ifeq ($(ARCH),i386) -ifdef TARGET_GPROF -USE_I386_LD=y -endif -ifdef CONFIG_STATIC -USE_I386_LD=y -endif -ifdef USE_I386_LD -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -else -# WARNING: this LDFLAGS is _very_ tricky : qemu is an ELF shared object -# that the kernel ELF loader considers as an executable. I think this -# is the simplest way to make it self virtualizable! -LDFLAGS+=-Wl,-shared -endif -endif - -ifeq ($(ARCH),x86_64) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),ppc) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),ppc64) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),s390) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif +QEMU_CFLAGS+=-I$(SRC_PATH)/bsd-user -I$(SRC_PATH)/bsd-user/$(TARGET_ARCH) -ifeq ($(ARCH),sparc) -# -static is used to avoid g1/g3 usage by the dynamic linker -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -static -endif - -ifeq ($(ARCH),sparc64) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),alpha) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),ia64) -LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),arm) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif - -ifeq ($(ARCH),m68k) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -endif +obj-y = main.o bsdload.o elfload.o mmap.o signal.o strace.o syscall.o \ + gdbstub.o uaccess.o -ifeq ($(ARCH),mips) -ifeq ($(WORDS_BIGENDIAN),yes) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -else -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld -endif -endif - -ifeq ($(ARCH),mips64) -ifeq ($(WORDS_BIGENDIAN),yes) -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH).ld -else -LDFLAGS+=-Wl,-T,$(SRC_PATH)/$(ARCH)el.ld -endif -endif - -obj-y = main.o bsdload.o elfload.o mmap.o path.o signal.o strace.o syscall.o \ - gdbstub.o gdbstub-xml.o ioport-user.o -obj-y += uaccess.o - -# Note: this is a workaround. The real fix is to avoid compiling -# cpu_signal_handler() in cpu-exec.c. -signal.o: CFLAGS += $(HELPER_CFLAGS) +obj-i386-y += ioport-user.o -ARLIBS=libqemu.a ../libqemu_user.a +ARLIBS=../libuser/libuser.a libqemu.a endif #CONFIG_BSD_USER ######################################################### # System emulator target -ifndef CONFIG_USER_ONLY +ifdef CONFIG_SOFTMMU -obj-y = vl.o osdep.o monitor.o pci.o loader.o isa_mmio.o machine.o \ - gdbstub.o gdbstub-xml.o msix.o ioport.o +obj-y = vl.o async.o monitor.o pci.o pci_host.o pcie_host.o machine.o gdbstub.o # virtio has to be here due to weird dependency between PCI and virtio-net. # need to fix this properly -obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o +obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o obj-$(CONFIG_KVM) += kvm.o kvm-all.o - +obj-$(CONFIG_ISA_MMIO) += isa_mmio.o LIBS+=-lz -ifdef CONFIG_ALSA -LIBS += -lasound -endif -ifdef CONFIG_ESD -LIBS += -lesd -endif -ifdef CONFIG_PA -LIBS += -lpulse-simple -endif -ifdef CONFIG_DSOUND -LIBS += -lole32 -ldxguid -endif -ifdef CONFIG_FMOD -LIBS += $(CONFIG_FMOD_LIB) -endif -ifdef CONFIG_OSS -LIBS += $(CONFIG_OSS_LIB) -endif sound-obj-y = sound-obj-$(CONFIG_SB16) += sb16.o @@ -451,59 +169,40 @@ sound-obj-$(CONFIG_ADLIB) += fmopl.o adl sound-obj-$(CONFIG_GUS) += gus.o gusemu_hal.o gusemu_mixer.o sound-obj-$(CONFIG_CS4231A) += cs4231a.o -ifdef CONFIG_ADLIB -adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0 -endif - -ifdef CONFIG_VNC_TLS -CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS) -LIBS += $(CONFIG_VNC_TLS_LIBS) -endif - -ifdef CONFIG_VNC_SASL -CPPFLAGS += $(CONFIG_VNC_SASL_CFLAGS) -LIBS += $(CONFIG_VNC_SASL_LIBS) -endif +adlib.o fmopl.o: QEMU_CFLAGS += -DBUILD_Y8950=0 -ifdef CONFIG_BLUEZ -LIBS += $(CONFIG_BLUEZ_LIBS) -endif +QEMU_CFLAGS += $(VNC_TLS_CFLAGS) +QEMU_CFLAGS += $(VNC_SASL_CFLAGS) # xen backend driver support obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o -ifeq ($(CONFIG_XEN), y) - LIBS += $(XEN_LIBS) -endif # USB layer -obj-y += usb-ohci.o +obj-$(CONFIG_USB_OHCI) += usb-ohci.o # PCI network cards obj-y += eepro100.o -obj-y += ne2000.o obj-y += pcnet.o obj-y += rtl8139.o obj-y += e1000.o -# Generic watchdog support and some watchdog devices -obj-y += wdt_ib700.o wdt_i6300esb.o - # Hardware support -obj-i386-y = ide.o pckbd.o vga.o $(sound-obj-y) dma.o +obj-i386-y = ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o +obj-i386-y += pckbd.o $(sound-obj-y) dma.o +obj-i386-y += vga.o vga-pci.o vga-isa.o obj-i386-y += fdc.o mc146818rtc.o serial.o i8259.o i8254.o pcspk.o pc.o obj-i386-y += cirrus_vga.o apic.o ioapic.o parallel.o acpi.o piix_pci.o obj-i386-y += usb-uhci.o vmmouse.o vmport.o vmware_vga.o hpet.o -obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o - -ifeq ($(TARGET_BASE_ARCH), i386) -CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE -endif +obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o +obj-i386-y += ne2000-isa.o # shared objects -obj-ppc-y = ppc.o ide.o vga.o $(sound-obj-y) dma.o openpic.o +obj-ppc-y = ppc.o ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/macio.o +obj-ppc-y += ide/cmd646.o +obj-ppc-y += vga.o vga-pci.o $(sound-obj-y) dma.o openpic.o # PREP target obj-ppc-y += pckbd.o serial.o i8259.o i8254.o fdc.o mc146818rtc.o -obj-ppc-y += prep_pci.o ppc_prep.o +obj-ppc-y += prep_pci.o ppc_prep.o ne2000-isa.o # Mac shared devices obj-ppc-y += macio.o cuda.o adb.o mac_nvram.o mac_dbdma.o # OldWorld PowerMac @@ -516,29 +215,19 @@ obj-ppc-y += ppc440.o ppc440_bamboo.o # PowerPC E500 boards obj-ppc-y += ppce500_pci.o ppce500_mpc8544ds.o obj-ppc-$(CONFIG_KVM) += kvm_ppc.o - -ifeq ($(TARGET_BASE_ARCH), ppc) -CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE -endif - -ifdef FDT_LIBS -obj-ppc-y += device_tree.o -LIBS+= $(FDT_LIBS) -endif +obj-ppc-$(CONFIG_FDT) += device_tree.o obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o obj-mips-y += mips_timer.o mips_int.o dma.o vga.o serial.o i8254.o i8259.o rc4030.o +obj-mips-y += vga-pci.o vga-isa.o vga-isa-mm.o obj-mips-y += g364fb.o jazz_led.o dp8393x.o -obj-mips-y += ide.o gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o -obj-mips-y += piix_pci.o parallel.o cirrus_vga.o pcspk.o $(sound-obj-y) -obj-mips-y += mipsnet.o +obj-mips-y += ide/core.o ide/qdev.o ide/isa.o ide/pci.o ide/piix.o +obj-mips-y += gt64xxx.o pckbd.o fdc.o mc146818rtc.o usb-uhci.o acpi.o ds1225y.o +obj-mips-y += piix4.o parallel.o cirrus_vga.o pcspk.o $(sound-obj-y) +obj-mips-y += mipsnet.o ne2000-isa.o obj-mips-y += pflash_cfi01.o obj-mips-y += vmware_vga.o -ifeq ($(TARGET_BASE_ARCH), mips) -CPPFLAGS += -DHAS_AUDIO -DHAS_AUDIO_CHOICE -endif - obj-microblaze-y = petalogix_s3adsp1800_mmu.o obj-microblaze-y += microblaze_pic_cpu.o @@ -549,10 +238,7 @@ obj-microblaze-y += xilinx_ethlite.o obj-microblaze-y += pflash_cfi02.o -ifdef FDT_LIBS -obj-microblaze-y += device_tree.o -LIBS+= $(FDT_LIBS) -endif +obj-microblaze-$(CONFIG_FDT) += device_tree.o # Boards obj-cris-y = cris_pic_cpu.o etraxfs.o axis_dev88.o @@ -567,111 +253,68 @@ obj-cris-y += etraxfs_ser.o obj-cris-y += pflash_cfi02.o ifeq ($(TARGET_ARCH), sparc64) -obj-sparc-y = sun4u.o ide.o pckbd.o vga.o apb_pci.o +obj-sparc-y = sun4u.o pckbd.o apb_pci.o +obj-sparc-y += ide/core.o ide/qdev.o ide/pci.o ide/cmd646.o +obj-sparc-y += vga.o vga-pci.o obj-sparc-y += fdc.o mc146818rtc.o serial.o obj-sparc-y += cirrus_vga.o parallel.o else -obj-sparc-y = sun4m.o tcx.o iommu.o slavio_intctl.o +obj-sparc-y = sun4m.o lance.o tcx.o iommu.o slavio_intctl.o obj-sparc-y += slavio_timer.o slavio_misc.o fdc.o sparc32_dma.o obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o endif -obj-arm-y = integratorcp.o versatilepb.o smc91c111.o arm_pic.o arm_timer.o +obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o obj-arm-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.o obj-arm-y += versatile_pci.o -obj-arm-y += realview_gic.o realview.o arm_sysctl.o mpcore.o +obj-arm-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o obj-arm-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o obj-arm-y += pl061.o obj-arm-y += arm-semi.o obj-arm-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o obj-arm-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o obj-arm-y += pflash_cfi01.o gumstix.o -obj-arm-y += zaurus.o ide.o serial.o spitz.o tosa.o tc6393xb.o +obj-arm-y += zaurus.o ide/core.o ide/microdrive.o serial.o spitz.o tosa.o tc6393xb.o obj-arm-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o obj-arm-y += omap2.o omap_dss.o soc_dma.o obj-arm-y += omap_sx1.o palm.o tsc210x.o obj-arm-y += nseries.o blizzard.o onenand.o vga.o cbus.o tusb6010.o usb-musb.o obj-arm-y += mst_fpga.o mainstone.o -obj-arm-y += musicpal.o pflash_cfi02.o +obj-arm-y += musicpal.o pflash_cfi02.o bitbang_i2c.o marvell_88w8618_audio.o obj-arm-y += framebuffer.o obj-arm-y += syborg.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o obj-arm-y += syborg_serial.o syborg_timer.o syborg_pointer.o syborg_rtc.o obj-arm-y += syborg_virtio.o -ifeq ($(TARGET_BASE_ARCH), arm) -CPPFLAGS += -DHAS_AUDIO -endif - obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o obj-sh4-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o serial.o -obj-sh4-y += ide.o +obj-sh4-y += ide/core.o ide/mmio.o obj-m68k-y = an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o obj-m68k-y += m68k-semi.o dummy_m68k.o -ifdef CONFIG_COCOA -COCOA_LIBS=-F/System/Library/Frameworks -framework Cocoa -framework IOKit -ifdef CONFIG_COREAUDIO -COCOA_LIBS+=-framework CoreAudio -endif -endif -ifdef CONFIG_SLIRP -CPPFLAGS+=-I$(SRC_PATH)/slirp -endif - -# specific flags are needed for non soft mmu emulator -ifdef CONFIG_STATIC -LDFLAGS+=-static -endif -ifndef CONFIG_DARWIN -ifndef CONFIG_WIN32 -ifndef CONFIG_SOLARIS -ifndef CONFIG_AIX -LIBS+=-lutil -endif -endif -endif -endif -ifdef TARGET_GPROF -vl.o: CFLAGS+=-p -LDFLAGS+=-p -endif - -ifeq ($(ARCH),ia64) -LDFLAGS+=-Wl,-G0 -Wl,-T,$(SRC_PATH)/ia64.ld -endif +obj-s390x-y = s390-virtio-bus.o s390-virtio.o -ifdef CONFIG_WIN32 -SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole -endif +main.o vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) -# profiling code -ifdef TARGET_GPROF -LDFLAGS+=-p -main.o: CFLAGS+=-p -endif - -vl.o: CFLAGS+=$(SDL_CFLAGS) +vl.o: QEMU_CFLAGS+=$(SDL_CFLAGS) vl.o: qemu-options.h monitor.o: qemu-monitor.h -LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) $(CURL_LIBS) ARLIBS=../libqemu_common.a libqemu.a $(HWLIB) -endif # !CONFIG_USER_ONLY +endif # CONFIG_SOFTMMU + +obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS) $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)) gdbstub-xml.c: $(TARGET_XML_FILES) feature_to_c.sh -ifeq ($(TARGET_XML_FILES),) - $(call quiet-command,rm -f $@ && echo > $@," GEN $(TARGET_DIR)$@") -else $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES)," GEN $(TARGET_DIR)$@") -endif qemu-options.h: $(SRC_PATH)/qemu-options.hx $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@," GEN $(TARGET_DIR)$@") @@ -681,7 +324,7 @@ qemu-monitor.h: $(SRC_PATH)/qemu-monitor clean: rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o - rm -f *.d */*.d tcg/*.o + rm -f *.d */*.d tcg/*.o ide/*.o rm -f qemu-options.h qemu-monitor.h gdbstub-xml.c install: all