Diff for /qemu/Makefile.target between versions 1.1.1.13 and 1.1.1.14

version 1.1.1.13, 2018/04/24 19:17:45 version 1.1.1.14, 2018/04/24 19:35:05
Line 22  QEMU_CFLAGS += -I.. -I$(TARGET_PATH) -DN Line 22  QEMU_CFLAGS += -I.. -I$(TARGET_PATH) -DN
   
 include $(SRC_PATH)/Makefile.objs  include $(SRC_PATH)/Makefile.objs
   
   QEMU_CFLAGS+=-I$(SRC_PATH)/include
   
 ifdef CONFIG_USER_ONLY  ifdef CONFIG_USER_ONLY
 # user emulator name  # user emulator name
 QEMU_PROG=qemu-$(TARGET_ARCH2)  QEMU_PROG=qemu-$(TARGET_ARCH2)
 else  else
 # system emulator name  # system emulator name
   ifneq (,$(findstring -mwindows,$(LIBS)))
   # Terminate program name with a 'w' because the linker builds a windows executable.
   QEMU_PROGW=qemu-system-$(TARGET_ARCH2)w$(EXESUF)
   endif # windows executable
 QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)  QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)
 endif  endif
   
 PROGS=$(QEMU_PROG)  PROGS=$(QEMU_PROG)
   ifdef QEMU_PROGW
   PROGS+=$(QEMU_PROGW)
   endif
 STPFILES=  STPFILES=
   
 ifndef CONFIG_HAIKU  ifndef CONFIG_HAIKU
Line 49  else Line 58  else
 TARGET_TYPE=system  TARGET_TYPE=system
 endif  endif
   
 $(QEMU_PROG).stp:  $(QEMU_PROG).stp: $(SRC_PATH)/trace-events
         $(call quiet-command,sh $(SRC_PATH)/scripts/tracetool \          $(call quiet-command,$(TRACETOOL) \
                 --$(TRACE_BACKEND) \                  --format=stap \
                 --binary $(bindir)/$(QEMU_PROG) \                  --backend=$(TRACE_BACKEND) \
                 --target-arch $(TARGET_ARCH) \                  --binary=$(bindir)/$(QEMU_PROG) \
                 --target-type $(TARGET_TYPE) \                  --target-arch=$(TARGET_ARCH) \
                 --stap < $(SRC_PATH)/trace-events > $(QEMU_PROG).stp,"  GEN   $(QEMU_PROG).stp")                  --target-type=$(TARGET_TYPE) \
                   < $< > $@,"  GEN   $(QEMU_PROG).stp")
 else  else
 stap:  stap:
 endif  endif
Line 71  libobj-y = exec.o translate-all.o cpu-ex Line 81  libobj-y = exec.o translate-all.o cpu-ex
 libobj-y += tcg/tcg.o tcg/optimize.o  libobj-y += tcg/tcg.o tcg/optimize.o
 libobj-$(CONFIG_TCG_INTERPRETER) += tci.o  libobj-$(CONFIG_TCG_INTERPRETER) += tci.o
 libobj-y += fpu/softfloat.o  libobj-y += fpu/softfloat.o
 libobj-y += op_helper.o helper.o  ifneq ($(TARGET_BASE_ARCH), sparc)
 ifeq ($(TARGET_BASE_ARCH), i386)  ifneq ($(TARGET_BASE_ARCH), alpha)
 libobj-y += cpuid.o  libobj-y += op_helper.o
   endif
   endif
   libobj-y += helper.o
   ifneq ($(TARGET_BASE_ARCH), ppc)
   libobj-y += cpu.o
 endif  endif
 libobj-$(TARGET_SPARC64) += vis_helper.o  libobj-$(TARGET_SPARC64) += vis_helper.o
 libobj-$(CONFIG_NEED_MMU) += mmu.o  libobj-$(CONFIG_NEED_MMU) += mmu.o
 libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o  libobj-$(TARGET_ARM) += neon_helper.o iwmmxt_helper.o
 ifeq ($(TARGET_BASE_ARCH), sparc)  ifeq ($(TARGET_BASE_ARCH), sparc)
 libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o  libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o
 libobj-y += cpu_init.o  
 endif  endif
 libobj-$(TARGET_SPARC) += int32_helper.o  libobj-$(TARGET_SPARC) += int32_helper.o
 libobj-$(TARGET_SPARC64) += int64_helper.o  libobj-$(TARGET_SPARC64) += int64_helper.o
   libobj-$(TARGET_ALPHA) += int_helper.o fpu_helper.o sys_helper.o mem_helper.o
   
 libobj-y += disas.o  libobj-y += disas.o
 libobj-$(CONFIG_TCI_DIS) += tci-dis.o  libobj-$(CONFIG_TCI_DIS) += tci-dis.o
Line 92  tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/ Line 107  tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/
   
 $(libobj-y): $(GENERATED_HEADERS)  $(libobj-y): $(GENERATED_HEADERS)
   
 # libqemu  # HELPER_CFLAGS is used for all the legacy code compiled with static register
   
 translate.o: translate.c cpu.h  
   
 translate-all.o: translate-all.c cpu.h  
   
 tcg/tcg.o: cpu.h  
   
 # HELPER_CFLAGS is used for all the code compiled with static register  
 # variables  # variables
 op_helper.o ldst_helper.o user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)  ifneq ($(TARGET_BASE_ARCH), sparc)
   op_helper.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
   endif
   user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)
   
 # Note: this is a workaround. The real fix is to avoid compiling  # Note: this is a workaround. The real fix is to avoid compiling
 # cpu_signal_handler() in user-exec.c.  # cpu_signal_handler() in user-exec.c.
Line 135  obj-m68k-y += m68k-sim.o m68k-semi.o Line 145  obj-m68k-y += m68k-sim.o m68k-semi.o
   
 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)  $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
   
   obj-y += $(addprefix ../, $(universal-obj-y))
 obj-y += $(addprefix ../libuser/, $(user-obj-y))  obj-y += $(addprefix ../libuser/, $(user-obj-y))
 obj-y += $(addprefix ../libdis-user/, $(libdis-y))  obj-y += $(addprefix ../libdis-user/, $(libdis-y))
 obj-y += $(libobj-y)  obj-y += $(libobj-y)
Line 142  obj-y += $(libobj-y) Line 153  obj-y += $(libobj-y)
 endif #CONFIG_LINUX_USER  endif #CONFIG_LINUX_USER
   
 #########################################################  #########################################################
 # Darwin user emulator target  
   
 ifdef CONFIG_DARWIN_USER  
   
 $(call set-vpath, $(SRC_PATH)/darwin-user)  
   
 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  
   
 LIBS+=-lmx  
   
 obj-y = main.o commpage.o machload.o mmap.o signal.o syscall.o thunk.o \  
         gdbstub.o user-exec.o  
   
 obj-i386-y += ioport-user.o  
   
 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)  
   
 obj-y += $(addprefix ../libuser/, $(user-obj-y))  
 obj-y += $(addprefix ../libdis-user/, $(libdis-y))  
 obj-y += $(libobj-y)  
   
 endif #CONFIG_DARWIN_USER  
   
 #########################################################  
 # BSD user emulator target  # BSD user emulator target
   
 ifdef CONFIG_BSD_USER  ifdef CONFIG_BSD_USER
Line 184  obj-i386-y += ioport-user.o Line 168  obj-i386-y += ioport-user.o
   
 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)  $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
   
   obj-y += $(addprefix ../, $(universal-obj-y))
 obj-y += $(addprefix ../libuser/, $(user-obj-y))  obj-y += $(addprefix ../libuser/, $(user-obj-y))
 obj-y += $(addprefix ../libdis-user/, $(libdis-y))  obj-y += $(addprefix ../libdis-user/, $(libdis-y))
 obj-y += $(libobj-y)  obj-y += $(libobj-y)
Line 199  obj-y = arch_init.o cpus.o monitor.o mac Line 184  obj-y = arch_init.o cpus.o monitor.o mac
 # need to fix this properly  # need to fix this properly
 obj-$(CONFIG_NO_PCI) += pci-stub.o  obj-$(CONFIG_NO_PCI) += pci-stub.o
 obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o  obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o virtio-net.o virtio-serial-bus.o
   obj-$(CONFIG_VIRTIO) += virtio-scsi.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_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o  obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.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
 obj-y += memory.o  obj-$(CONFIG_VGA) += vga.o
   obj-y += memory.o savevm.o cputlb.o
 LIBS+=-lz  LIBS+=-lz
   
   obj-i386-$(CONFIG_KVM) += hyperv.o
   
 QEMU_CFLAGS += $(VNC_TLS_CFLAGS)  QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
 QEMU_CFLAGS += $(VNC_SASL_CFLAGS)  QEMU_CFLAGS += $(VNC_SASL_CFLAGS)
 QEMU_CFLAGS += $(VNC_JPEG_CFLAGS)  QEMU_CFLAGS += $(VNC_JPEG_CFLAGS)
 QEMU_CFLAGS += $(VNC_PNG_CFLAGS)  QEMU_CFLAGS += $(VNC_PNG_CFLAGS)
 QEMU_CFLAGS += $(GLIB_CFLAGS)  
   
 # xen support  # xen support
 obj-$(CONFIG_XEN) += xen-all.o xen_machine_pv.o xen_domainbuild.o xen-mapcache.o  obj-$(CONFIG_XEN) += xen-all.o xen_machine_pv.o xen_domainbuild.o xen-mapcache.o
 obj-$(CONFIG_NO_XEN) += xen-stub.o  obj-$(CONFIG_NO_XEN) += xen-stub.o
   
 obj-i386-$(CONFIG_XEN) += xen_platform.o  obj-i386-$(CONFIG_XEN) += xen_platform.o xen_apic.o
   
 # Inter-VM PCI shared memory  # Inter-VM PCI shared memory
 CONFIG_IVSHMEM =  CONFIG_IVSHMEM =
Line 228  ifeq ($(CONFIG_KVM), y) Line 216  ifeq ($(CONFIG_KVM), y)
 endif  endif
 obj-$(CONFIG_IVSHMEM) += ivshmem.o  obj-$(CONFIG_IVSHMEM) += ivshmem.o
   
   # Generic hotplugging
   obj-y += device-hotplug.o
   
 # Hardware support  # Hardware support
 obj-i386-y += vga.o  
 obj-i386-y += mc146818rtc.o pc.o  obj-i386-y += mc146818rtc.o pc.o
 obj-i386-y += cirrus_vga.o sga.o apic.o ioapic.o piix_pci.o  obj-i386-y += apic_common.o apic.o kvmvapic.o
   obj-i386-y += sga.o ioapic_common.o ioapic.o piix_pci.o
 obj-i386-y += vmport.o  obj-i386-y += vmport.o
 obj-i386-y += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o  obj-i386-y += 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_KVM) += kvmclock.o  obj-i386-y += pc_sysfw.o
   obj-i386-$(CONFIG_KVM) += kvm/clock.o kvm/apic.o kvm/i8259.o kvm/ioapic.o kvm/i8254.o
 obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o  obj-i386-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o
   
 # shared objects  # shared objects
 obj-ppc-y = ppc.o ppc_booke.o  obj-ppc-y = ppc.o ppc_booke.o
 obj-ppc-y += vga.o  
 # PREP target  # PREP target
 obj-ppc-y += mc146818rtc.o  obj-ppc-y += mc146818rtc.o
 obj-ppc-y += ppc_prep.o  obj-ppc-y += ppc_prep.o
Line 255  obj-ppc-$(CONFIG_PSERIES) += xics.o spap Line 246  obj-ppc-$(CONFIG_PSERIES) += xics.o spap
 obj-ppc-$(CONFIG_PSERIES) += spapr_pci.o device-hotplug.o pci-hotplug.o  obj-ppc-$(CONFIG_PSERIES) += spapr_pci.o device-hotplug.o pci-hotplug.o
 # PowerPC 4xx boards  # PowerPC 4xx boards
 obj-ppc-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o  obj-ppc-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
 obj-ppc-y += ppc440.o ppc440_bamboo.o  obj-ppc-y += ppc440_bamboo.o
 # PowerPC E500 boards  # PowerPC E500 boards
 obj-ppc-y += ppce500_mpc8544ds.o mpc8544_guts.o ppce500_spin.o  obj-ppc-y += ppce500_mpc8544ds.o mpc8544_guts.o ppce500_spin.o
 # PowerPC 440 Xilinx ML507 reference board.  # PowerPC 440 Xilinx ML507 reference board.
Line 295  obj-lm32-y += framebuffer.o Line 286  obj-lm32-y += framebuffer.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  
 obj-mips-y += jazz_led.o  
 obj-mips-y += gt64xxx.o mc146818rtc.o  obj-mips-y += gt64xxx.o mc146818rtc.o
 obj-mips-y += cirrus_vga.o  
 obj-mips-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o  obj-mips-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o
   
 obj-microblaze-y = petalogix_s3adsp1800_mmu.o  obj-microblaze-y = petalogix_s3adsp1800_mmu.o
 obj-microblaze-y += petalogix_ml605_mmu.o  obj-microblaze-y += petalogix_ml605_mmu.o
   obj-microblaze-y += microblaze_boot.o
   
 obj-microblaze-y += microblaze_pic_cpu.o  obj-microblaze-y += microblaze_pic_cpu.o
 obj-microblaze-y += xilinx_intc.o  obj-microblaze-y += xilinx_intc.o
Line 328  obj-cris-y += etraxfs_ser.o Line 317  obj-cris-y += etraxfs_ser.o
   
 ifeq ($(TARGET_ARCH), sparc64)  ifeq ($(TARGET_ARCH), sparc64)
 obj-sparc-y = sun4u.o apb_pci.o  obj-sparc-y = sun4u.o apb_pci.o
 obj-sparc-y += vga.o  
 obj-sparc-y += mc146818rtc.o  obj-sparc-y += mc146818rtc.o
 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
Line 343  endif Line 330  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
 obj-arm-y += arm_boot.o pl011.o pl031.o pl050.o pl080.o pl110.o pl181.o pl190.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 += versatile_pci.o
   obj-arm-y += versatile_i2c.o
   obj-arm-y += cadence_uart.o
   obj-arm-y += cadence_ttc.o
   obj-arm-y += cadence_gem.o
   obj-arm-y += xilinx_zynq.o zynq_slcr.o
   obj-arm-y += arm_gic.o
 obj-arm-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o  obj-arm-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o
   obj-arm-y += exynos4210_gic.o exynos4210_combiner.o exynos4210.o
   obj-arm-y += exynos4_boards.o exynos4210_uart.o exynos4210_pwm.o
   obj-arm-y += exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o
   obj-arm-y += arm_l2x0.o
   obj-arm-y += arm_mptimer.o a15mpcore.o
 obj-arm-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o  obj-arm-y += armv7m.o armv7m_nvic.o stellaris.o pl022.o stellaris_enet.o
   obj-arm-y += highbank.o
 obj-arm-y += pl061.o  obj-arm-y += pl061.o
   obj-arm-y += xgmac.o
 obj-arm-y += arm-semi.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.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 += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o
Line 356  obj-arm-y += omap1.o omap_lcdc.o omap_dm Line 356  obj-arm-y += omap1.o omap_lcdc.o omap_dm
 obj-arm-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \  obj-arm-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \
                 omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o                  omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o
 obj-arm-y += omap_sx1.o palm.o tsc210x.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 += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o
 obj-arm-y += mst_fpga.o mainstone.o  obj-arm-y += mst_fpga.o mainstone.o
 obj-arm-y += z2.o  obj-arm-y += z2.o
 obj-arm-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o  obj-arm-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o
 obj-arm-y += framebuffer.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  
 obj-arm-y += vexpress.o  obj-arm-y += vexpress.o
 obj-arm-y += strongarm.o  obj-arm-y += strongarm.o
 obj-arm-y += collie.o  obj-arm-y += collie.o
 obj-arm-y += pl041.o lm4549.o  obj-arm-y += pl041.o lm4549.o
   obj-arm-$(CONFIG_FDT) += device_tree.o
   
 obj-sh4-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o  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  obj-sh4-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o
Line 379  obj-m68k-y += m68k-semi.o dummy_m68k.o Line 377  obj-m68k-y += m68k-semi.o dummy_m68k.o
 obj-s390x-y = s390-virtio-bus.o s390-virtio.o  obj-s390x-y = s390-virtio-bus.o s390-virtio.o
   
 obj-alpha-y = mc146818rtc.o  obj-alpha-y = mc146818rtc.o
 obj-alpha-y += vga.o cirrus_vga.o  
 obj-alpha-y += alpha_pci.o alpha_dp264.o alpha_typhoon.o  obj-alpha-y += alpha_pci.o alpha_dp264.o alpha_typhoon.o
   
 obj-xtensa-y += xtensa_pic.o  obj-xtensa-y += xtensa_pic.o
Line 387  obj-xtensa-y += xtensa_sim.o Line 384  obj-xtensa-y += xtensa_sim.o
 obj-xtensa-y += xtensa_lx60.o  obj-xtensa-y += xtensa_lx60.o
 obj-xtensa-y += xtensa-semi.o  obj-xtensa-y += xtensa-semi.o
 obj-xtensa-y += core-dc232b.o  obj-xtensa-y += core-dc232b.o
   obj-xtensa-y += core-dc233c.o
 obj-xtensa-y += core-fsf.o  obj-xtensa-y += core-fsf.o
   
 main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)  main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
Line 395  monitor.o: hmp-commands.h qmp-commands-o Line 393  monitor.o: hmp-commands.h qmp-commands-o
   
 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)  $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
   
   obj-y += $(addprefix ../, $(universal-obj-y))
 obj-y += $(addprefix ../, $(common-obj-y))  obj-y += $(addprefix ../, $(common-obj-y))
 obj-y += $(addprefix ../libdis/, $(libdis-y))  obj-y += $(addprefix ../libdis/, $(libdis-y))
 obj-y += $(libobj-y)  obj-y += $(libobj-y)
Line 413  endif # CONFIG_LINUX_USER Line 412  endif # CONFIG_LINUX_USER
   
 obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o  obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
   
   ifdef QEMU_PROGW
   # The linker builds a windows executable. Make also a console executable.
   $(QEMU_PROGW): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
           $(call LINK,$^)
   $(QEMU_PROG): $(QEMU_PROGW)
           $(call quiet-command,$(OBJCOPY) --subsystem console $(QEMU_PROGW) $(QEMU_PROG),"  GEN   $(TARGET_DIR)$(QEMU_PROG)")
   else
 $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)  $(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)
         $(call LINK,$^)          $(call LINK,$^)
   endif
   
 gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC_PATH)/scripts/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)/scripts/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)$@")
Line 428  qmp-commands-old.h: $(SRC_PATH)/qmp-comm Line 434  qmp-commands-old.h: $(SRC_PATH)/qmp-comm
   
 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 9pfs/*.o          rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o kvm/*.o
         rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c          rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c
 ifdef CONFIG_TRACE_SYSTEMTAP  ifdef CONFIG_TRACE_SYSTEMTAP
         rm -f *.stp          rm -f *.stp
Line 442  ifneq ($(STRIP),) Line 448  ifneq ($(STRIP),)
 endif  endif
 endif  endif
 ifdef CONFIG_TRACE_SYSTEMTAP  ifdef CONFIG_TRACE_SYSTEMTAP
         $(INSTALL_DIR) "$(DESTDIR)$(datadir)/../systemtap/tapset"          $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
         $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(datadir)/../systemtap/tapset"          $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
 endif  endif
   
 # Include automatically generated dependency files  # Include automatically generated dependency files

Removed from v.1.1.1.13  
changed lines
  Added in v.1.1.1.14


unix.superglobalmegacorp.com