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

version 1.1.1.12, 2018/04/24 18:56:37 version 1.1.1.13, 2018/04/24 19:17:45
Line 27  ifdef CONFIG_USER_ONLY Line 27  ifdef CONFIG_USER_ONLY
 QEMU_PROG=qemu-$(TARGET_ARCH2)  QEMU_PROG=qemu-$(TARGET_ARCH2)
 else  else
 # system emulator name  # system emulator name
 ifeq ($(TARGET_ARCH), i386)  
 QEMU_PROG=qemu$(EXESUF)  
 else  
 QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)  QEMU_PROG=qemu-system-$(TARGET_ARCH2)$(EXESUF)
 endif  endif
 endif  
   
 PROGS=$(QEMU_PROG)  PROGS=$(QEMU_PROG)
 STPFILES=  STPFILES=
Line 44  endif Line 40  endif
 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
   
 ifdef CONFIG_SYSTEMTAP_TRACE  ifdef CONFIG_TRACE_SYSTEMTAP
 stap: $(QEMU_PROG).stp  stap: $(QEMU_PROG).stp
   
 ifdef CONFIG_USER_ONLY  ifdef CONFIG_USER_ONLY
Line 72  all: $(PROGS) stap Line 68  all: $(PROGS) stap
 #########################################################  #########################################################
 # cpu emulator library  # cpu emulator library
 libobj-y = exec.o translate-all.o cpu-exec.o translate.o  libobj-y = exec.o translate-all.o cpu-exec.o translate.o
 libobj-y += tcg/tcg.o  libobj-y += tcg/tcg.o tcg/optimize.o
   libobj-$(CONFIG_TCG_INTERPRETER) += tci.o
 libobj-y += fpu/softfloat.o  libobj-y += fpu/softfloat.o
 libobj-y += op_helper.o helper.o  libobj-y += op_helper.o helper.o
 ifeq ($(TARGET_BASE_ARCH), i386)  ifeq ($(TARGET_BASE_ARCH), i386)
 libobj-y += cpuid.o  libobj-y += cpuid.o
 endif  endif
   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)
   libobj-y += fop_helper.o cc_helper.o win_helper.o mmu_helper.o ldst_helper.o
   libobj-y += cpu_init.o
   endif
   libobj-$(TARGET_SPARC) += int32_helper.o
   libobj-$(TARGET_SPARC64) += int64_helper.o
   
 libobj-y += disas.o  libobj-y += disas.o
   libobj-$(CONFIG_TCI_DIS) += tci-dis.o
   
   tci-dis.o: QEMU_CFLAGS += -I$(SRC_PATH)/tcg -I$(SRC_PATH)/tcg/tci
   
 $(libobj-y): $(GENERATED_HEADERS)  $(libobj-y): $(GENERATED_HEADERS)
   
Line 95  tcg/tcg.o: cpu.h Line 102  tcg/tcg.o: cpu.h
   
 # HELPER_CFLAGS is used for all the code compiled with static register  # HELPER_CFLAGS is used for all the code compiled with static register
 # variables  # variables
 op_helper.o user-exec.o: QEMU_CFLAGS += $(HELPER_CFLAGS)  op_helper.o ldst_helper.o 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 111  $(call set-vpath, $(SRC_PATH)/linux-user Line 118  $(call set-vpath, $(SRC_PATH)/linux-user
 QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user  QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR) -I$(SRC_PATH)/linux-user
 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 user-exec.o $(oslib-obj-y)        user-exec.o $(oslib-obj-y)
   
 obj-$(TARGET_HAS_BFLT) += flatload.o  obj-$(TARGET_HAS_BFLT) += flatload.o
   
Line 187  endif #CONFIG_BSD_USER Line 194  endif #CONFIG_BSD_USER
 # System emulator target  # System emulator target
 ifdef CONFIG_SOFTMMU  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 ioport.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-$(CONFIG_NO_PCI) += pci-stub.o  obj-$(CONFIG_NO_PCI) += pci-stub.o
Line 195  obj-$(CONFIG_VIRTIO) += virtio.o virtio- Line 202  obj-$(CONFIG_VIRTIO) += virtio.o virtio-
 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-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
   obj-y += memory.o
 LIBS+=-lz  LIBS+=-lz
   
 QEMU_CFLAGS += $(VNC_TLS_CFLAGS)  QEMU_CFLAGS += $(VNC_TLS_CFLAGS)
Line 223  obj-$(CONFIG_IVSHMEM) += ivshmem.o Line 230  obj-$(CONFIG_IVSHMEM) += ivshmem.o
   
 # Hardware support  # Hardware support
 obj-i386-y += vga.o  obj-i386-y += vga.o
 obj-i386-y += mc146818rtc.o i8259.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 += cirrus_vga.o sga.o apic.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 += device-hotplug.o pci-hotplug.o smbios.o wdt_ib700.o
Line 233  obj-i386-$(CONFIG_KVM) += kvmclock.o Line 240  obj-i386-$(CONFIG_KVM) += kvmclock.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  obj-ppc-y = ppc.o ppc_booke.o
 obj-ppc-y += vga.o  obj-ppc-y += vga.o
 # PREP target  # PREP target
 obj-ppc-y += i8259.o mc146818rtc.o  obj-ppc-y += mc146818rtc.o
 obj-ppc-y += ppc_prep.o  obj-ppc-y += ppc_prep.o
 # OldWorld PowerMac  # OldWorld PowerMac
 obj-ppc-y += ppc_oldworld.o  obj-ppc-y += ppc_oldworld.o
 # NewWorld PowerMac  # NewWorld PowerMac
 obj-ppc-y += ppc_newworld.o  obj-ppc-y += ppc_newworld.o
 # IBM pSeries (sPAPR)  # IBM pSeries (sPAPR)
 ifeq ($(CONFIG_FDT)$(TARGET_PPC64),yy)  obj-ppc-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o spapr_rtas.o spapr_vio.o
 obj-ppc-y += spapr.o spapr_hcall.o spapr_rtas.o spapr_vio.o  obj-ppc-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o
 obj-ppc-y += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o  obj-ppc-$(CONFIG_PSERIES) += spapr_pci.o device-hotplug.o pci-hotplug.o
 endif  
 # 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.o ppc440_bamboo.o
 # PowerPC E500 boards  # PowerPC E500 boards
 obj-ppc-y += ppce500_mpc8544ds.o mpc8544_guts.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.
 obj-ppc-y += virtex_ml507.o  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
   # PowerPC OpenPIC
   obj-ppc-y += openpic.o
   
 # Xilinx PPC peripherals  # Xilinx PPC peripherals
 obj-ppc-y += xilinx_intc.o  obj-ppc-y += xilinx_intc.o
Line 287  obj-lm32-y += framebuffer.o Line 295  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 i8259.o  obj-mips-y += vga.o
 obj-mips-y += g364fb.o jazz_led.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-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
Line 309  obj-microblaze-$(CONFIG_FDT) += device_t Line 317  obj-microblaze-$(CONFIG_FDT) += device_t
 # Boards  # Boards
 obj-cris-y = cris_pic_cpu.o  obj-cris-y = cris_pic_cpu.o
 obj-cris-y += cris-boot.o  obj-cris-y += cris-boot.o
 obj-cris-y += etraxfs.o axis_dev88.o  
 obj-cris-y += axis_dev88.o  obj-cris-y += axis_dev88.o
   
 # IO blocks  # IO blocks
Line 351  obj-arm-y += omap2.o omap_dss.o soc_dma. Line 358  obj-arm-y += omap2.o omap_dss.o soc_dma.
 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 vga.o cbus.o tusb6010.o usb-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 += 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.o syborg_fb.o syborg_interrupt.o syborg_keyboard.o
Line 359  obj-arm-y += syborg_virtio.o Line 367  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-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 369  obj-m68k-y += m68k-semi.o dummy_m68k.o Line 378  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 = i8259.o mc146818rtc.o  obj-alpha-y = mc146818rtc.o
 obj-alpha-y += vga.o cirrus_vga.o  obj-alpha-y += vga.o cirrus_vga.o
   obj-alpha-y += alpha_pci.o alpha_dp264.o alpha_typhoon.o
   
   obj-xtensa-y += xtensa_pic.o
   obj-xtensa-y += xtensa_sim.o
   obj-xtensa-y += xtensa_lx60.o
   obj-xtensa-y += xtensa-semi.o
   obj-xtensa-y += core-dc232b.o
   obj-xtensa-y += core-fsf.o
   
 main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)  main.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
   
 monitor.o: hmp-commands.h qmp-commands.h  monitor.o: hmp-commands.h qmp-commands-old.h
   
 $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)  $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y): $(GENERATED_HEADERS)
   
Line 382  obj-y += $(addprefix ../, $(common-obj-y Line 399  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)
 obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y))  obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y))
   obj-y += $(addprefix ../, $(trace-obj-y))
   
 endif # CONFIG_SOFTMMU  endif # CONFIG_SOFTMMU
   
 ifndef CONFIG_LINUX_USER  ifndef CONFIG_LINUX_USER
   ifndef CONFIG_BSD_USER
 # libcacard needs qemu-thread support, and besides is only needed by devices  # libcacard needs qemu-thread support, and besides is only needed by devices
 # so not requires with linux-user targets  # so not requires with linux-user / bsd-user targets
 obj-$(CONFIG_SMARTCARD_NSS) += $(addprefix ../libcacard/, $(libcacard-y))  obj-$(CONFIG_SMARTCARD_NSS) += $(addprefix ../libcacard/, $(libcacard-y))
   endif # CONFIG_BSD_USER
 endif # CONFIG_LINUX_USER  endif # CONFIG_LINUX_USER
   
 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,$^)
   
   
 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
Line 404  gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC Line 423  gdbstub-xml.c: $(TARGET_XML_FILES) $(SRC
 hmp-commands.h: $(SRC_PATH)/hmp-commands.hx  hmp-commands.h: $(SRC_PATH)/hmp-commands.hx
         $(call quiet-command,sh $(SRC_PATH)/scripts/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  qmp-commands-old.h: $(SRC_PATH)/qmp-commands.hx
         $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $(TARGET_DIR)$@")          $(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 9pfs/*.o          rm -f *.d */*.d tcg/*.o ide/*.o 9pfs/*.o
         rm -f hmp-commands.h qmp-commands.h gdbstub-xml.c          rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c
 ifdef CONFIG_SYSTEMTAP_TRACE  ifdef CONFIG_TRACE_SYSTEMTAP
         rm -f *.stp          rm -f *.stp
 endif  endif
   
Line 422  ifneq ($(STRIP),) Line 441  ifneq ($(STRIP),)
         $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))          $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))
 endif  endif
 endif  endif
 ifdef CONFIG_SYSTEMTAP_TRACE  ifdef CONFIG_TRACE_SYSTEMTAP
         $(INSTALL_DIR) "$(DESTDIR)$(datadir)/../systemtap/tapset"          $(INSTALL_DIR) "$(DESTDIR)$(datadir)/../systemtap/tapset"
         $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(datadir)/../systemtap/tapset"          $(INSTALL_DATA) $(QEMU_PROG).stp "$(DESTDIR)$(datadir)/../systemtap/tapset"
 endif  endif

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


unix.superglobalmegacorp.com