Diff for /qemu/Makefile.target between versions 1.1.1.10 and 1.1.1.11

version 1.1.1.10, 2018/04/24 18:24:34 version 1.1.1.11, 2018/04/24 18:34:22
Line 1 Line 1
 # -*- Mode: makefile -*-  # -*- Mode: makefile -*-
   
 GENERATED_HEADERS = config-target.h  GENERATED_HEADERS = config-target.h
   CONFIG_NO_PCI = $(if $(subst n,,$(CONFIG_PCI)),n,y)
 CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y)  CONFIG_NO_KVM = $(if $(subst n,,$(CONFIG_KVM)),n,y)
   
 include ../config-host.mak  include ../config-host.mak
Line 30  endif Line 31  endif
 endif  endif
   
 PROGS=$(QEMU_PROG)  PROGS=$(QEMU_PROG)
   STPFILES=
   
   ifndef CONFIG_HAIKU
 LIBS+=-lm  LIBS+=-lm
   endif
   
 kvm.o kvm-all.o vhost.o vhost_net.o: QEMU_CFLAGS+=$(KVM_CFLAGS)  kvm.o kvm-all.o vhost.o vhost_net.o: QEMU_CFLAGS+=$(KVM_CFLAGS)
   
 config-target.h: config-target.h-timestamp  config-target.h: config-target.h-timestamp
 config-target.h-timestamp: config-target.mak  config-target.h-timestamp: config-target.mak
   
 all: $(PROGS)  ifdef CONFIG_SYSTEMTAP_TRACE
   stap: $(QEMU_PROG).stp
   
   ifdef CONFIG_USER_ONLY
   TARGET_TYPE=user
   else
   TARGET_TYPE=system
   endif
   
   $(QEMU_PROG).stp:
           $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool \
                   --$(TRACE_BACKEND) \
                   --binary $(bindir)/$(QEMU_PROG) \
                   --target-arch $(TARGET_ARCH) \
                   --target-type $(TARGET_TYPE) \
                   --stap < $(SRC_PATH)/trace-events > $(QEMU_PROG).stp,"  GEN   $(QEMU_PROG).stp")
   else
   stap:
   endif
   
   all: $(PROGS) stap
   
 # Dummy command so that make thinks it has done something  # Dummy command so that make thinks it has done something
         @true          @true
Line 86  $(call set-vpath, $(SRC_PATH)/linux-user Line 110  $(call set-vpath, $(SRC_PATH)/linux-user
 QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)  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 \  obj-y = main.o syscall.o strace.o mmap.o signal.o thunk.o \
       elfload.o linuxload.o uaccess.o gdbstub.o cpu-uname.o \        elfload.o linuxload.o uaccess.o gdbstub.o cpu-uname.o \
       qemu-malloc.o        qemu-malloc.o $(oslib-obj-y)
   
 obj-$(TARGET_HAS_BFLT) += flatload.o  obj-$(TARGET_HAS_BFLT) += flatload.o
   
Line 165  ifdef CONFIG_SOFTMMU Line 189  ifdef CONFIG_SOFTMMU
 obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o  obj-y = arch_init.o cpus.o monitor.o machine.o gdbstub.o balloon.o
 # virtio has to be here due to weird dependency between PCI and virtio-net.  # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly  # need to fix this properly
 obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o  obj-$(CONFIG_NO_PCI) += pci-stub.o
   obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
 obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o  obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
 obj-y += vhost_net.o  obj-y += vhost_net.o
 obj-$(CONFIG_VHOST_NET) += vhost.o  obj-$(CONFIG_VHOST_NET) += vhost.o
 obj-$(CONFIG_VIRTFS) += virtio-9p.o  obj-$(CONFIG_REALLY_VIRTFS) += virtio-9p.o
 obj-y += rwhandler.o  obj-y += rwhandler.o
 obj-$(CONFIG_KVM) += kvm.o kvm-all.o  obj-$(CONFIG_KVM) += kvm.o kvm-all.o
 obj-$(CONFIG_NO_KVM) += kvm-stub.o  obj-$(CONFIG_NO_KVM) += kvm-stub.o
Line 183  QEMU_CFLAGS += $(VNC_PNG_CFLAGS) Line 208  QEMU_CFLAGS += $(VNC_PNG_CFLAGS)
 # xen backend driver support  # xen backend driver support
 obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o  obj-$(CONFIG_XEN) += xen_machine_pv.o xen_domainbuild.o
   
 # USB layer  
 obj-$(CONFIG_USB_OHCI) += usb-ohci.o  
   
 # PCI network cards  
 obj-y += rtl8139.o  
 obj-y += e1000.o  
   
 # Inter-VM PCI shared memory  # Inter-VM PCI shared memory
 obj-$(CONFIG_KVM) += ivshmem.o  obj-$(CONFIG_KVM) += ivshmem.o
   
Line 201  obj-i386-y += vmmouse.o vmport.o hpet.o  Line 219  obj-i386-y += vmmouse.o vmport.o hpet.o 
 obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o  obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
 obj-i386-y += debugcon.o multiboot.o  obj-i386-y += debugcon.o multiboot.o
 obj-i386-y += pc_piix.o  obj-i386-y += pc_piix.o
   obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o
   
 # shared objects  # shared objects
 obj-ppc-y = ppc.o  obj-ppc-y = ppc.o
Line 217  obj-ppc-y += ppc4xx_devs.o ppc4xx_pci.o  Line 236  obj-ppc-y += ppc4xx_devs.o ppc4xx_pci.o 
 obj-ppc-y += ppc440.o ppc440_bamboo.o  obj-ppc-y += ppc440.o ppc440_bamboo.o
 # PowerPC E500 boards  # PowerPC E500 boards
 obj-ppc-y += ppce500_mpc8544ds.o  obj-ppc-y += ppce500_mpc8544ds.o
   # PowerPC 440 Xilinx ML507 reference board.
   obj-ppc-y += virtex_ml507.o
 obj-ppc-$(CONFIG_KVM) += kvm_ppc.o  obj-ppc-$(CONFIG_KVM) += kvm_ppc.o
 obj-ppc-$(CONFIG_FDT) += device_tree.o  obj-ppc-$(CONFIG_FDT) += device_tree.o
   
   # Xilinx PPC peripherals
   obj-ppc-y += xilinx_intc.o
   obj-ppc-y += xilinx_timer.o
   obj-ppc-y += xilinx_uartlite.o
   obj-ppc-y += xilinx_ethlite.o
   
 obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o  obj-mips-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o
 obj-mips-y += mips_addr.o mips_timer.o mips_int.o  obj-mips-y += mips_addr.o mips_timer.o mips_int.o
 obj-mips-y += vga.o i8259.o  obj-mips-y += vga.o i8259.o
Line 259  obj-sparc-y += cirrus_vga.o Line 286  obj-sparc-y += cirrus_vga.o
 else  else
 obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o  obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
 obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o  obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
 obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o  obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o
   
   # GRLIB
   obj-sparc-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o
 endif  endif
   
 obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o  obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
Line 299  obj-alpha-y = alpha_palcode.o Line 329  obj-alpha-y = alpha_palcode.o
   
 main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)  main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
   
 monitor.o: qemu-monitor.h  monitor.o: hmp-commands.h qmp-commands.h
   
 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)  $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
   
Line 310  obj-y += $(addprefix $(HWDIR)/, $(hw-obj Line 340  obj-y += $(addprefix $(HWDIR)/, $(hw-obj
   
 endif # CONFIG_SOFTMMU  endif # CONFIG_SOFTMMU
   
   obj-y += $(addprefix ../, $(trace-obj-y))
 obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o  obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
   
 $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)  $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
         $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))          $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
   
   
 gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/feature_to_c.sh  gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/feature_to_c.sh
         $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/feature_to_c.sh $@ $(TARGET_XML_FILES),"  GEN   $(TARGET_DIR)$@")          $(call quiet-command,rm -f $@ && $(SHELL) $(SRC_PATH)/scripts/feature_to_c.sh $@ $(TARGET_XML_FILES),"  GEN   $(TARGET_DIR)$@")
   
 qemu-monitor.h: $(SRC_PATH)/qemu-monitor.hx  hmp-commands.h: $(SRC_PATH)/hmp-commands.hx
         $(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")          $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")
   
   qmp-commands.h: $(SRC_PATH)/qmp-commands.hx
           $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")
   
 clean:  clean:
         rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o          rm -f *.o *.a *~ $(PROGS) nwfpe/*.o fpu/*.o
         rm -f *.d */*.d tcg/*.o ide/*.o          rm -f *.d */*.d tcg/*.o ide/*.o
         rm -f qemu-monitor.h gdbstub-xml.c          rm -f hmp-commands.h qmp-commands.h gdbstub-xml.c
   ifdef CONFIG_SYSTEMTAP_TRACE
           rm -f *.stp
   endif
   
 install: all  install: all
 ifneq ($(PROGS),)  ifneq ($(PROGS),)
         $(INSTALL) -m 755 $(STRIP_OPT) $(PROGS) "$(DESTDIR)$(bindir)"          $(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
   ifneq ($(STRIP),)
           $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))
   endif
   endif
   ifdef CONFIG_SYSTEMTAP_TRACE
           $(INSTALL_DIR) "$(DESTDIR)$(datadir)/../systemtap/tapset"
           $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(datadir)/../systemtap/tapset"
 endif  endif
   
 # Include automatically generated dependency files  # Include automatically generated dependency files

Removed from v.1.1.1.10  
changed lines
  Added in v.1.1.1.11


unix.superglobalmegacorp.com