tests: cris: remove check_time1

[qemu.git] / Makefile.target

diff --git a/Makefile.target b/Makefile.target
index 137d0b05176a25a1b178fce15452dd0d3bcf12b9..19cc49c0d7c5150ebfa322097bcdb46bb2d4e387 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -1,11 +1,13 @@
 # -*- Mode: makefile -*-
 
 # -*- Mode: makefile -*-
 

+BUILD_DIR?=$(CURDIR)/..
+

 include ../config-host.mak
 include config-target.mak
 include config-devices.mak
 include $(SRC_PATH)/rules.mak
 
 include ../config-host.mak
 include config-target.mak
 include config-devices.mak
 include $(SRC_PATH)/rules.mak
 

-$(call set-vpath, $(SRC_PATH))
+$(call set-vpath, $(SRC_PATH):$(BUILD_DIR))

 ifdef CONFIG_LINUX
 QEMU_CFLAGS += -I../linux-headers
 endif
 ifdef CONFIG_LINUX
 QEMU_CFLAGS += -I../linux-headers
 endif


@@ -38,7 +40,7 @@ config-target.h: config-target.h-timestamp
 config-target.h-timestamp: config-target.mak
 
 ifdef CONFIG_TRACE_SYSTEMTAP
 config-target.h-timestamp: config-target.mak
 
 ifdef CONFIG_TRACE_SYSTEMTAP

-stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp
+stap: $(QEMU_PROG).stp-installed $(QEMU_PROG).stp $(QEMU_PROG)-simpletrace.stp

 
 ifdef CONFIG_USER_ONLY
 TARGET_TYPE=user
 
 ifdef CONFIG_USER_ONLY
 TARGET_TYPE=user


@@ -46,7 +48,7 @@ else
 TARGET_TYPE=system
 endif
 
 TARGET_TYPE=system
 endif
 

-$(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events
+$(QEMU_PROG).stp-installed: $(BUILD_DIR)/trace-events-all

        $(call quiet-command,$(TRACETOOL) \
                --format=stap \
                --backends=$(TRACE_BACKENDS) \
        $(call quiet-command,$(TRACETOOL) \
                --format=stap \
                --backends=$(TRACE_BACKENDS) \


@@ -55,7 +57,7 @@ $(QEMU_PROG).stp-installed: $(SRC_PATH)/trace-events
                --target-type=$(TARGET_TYPE) \
                < $< > $@,"  GEN   $(TARGET_DIR)$(QEMU_PROG).stp-installed")
 
                --target-type=$(TARGET_TYPE) \
                < $< > $@,"  GEN   $(TARGET_DIR)$(QEMU_PROG).stp-installed")
 

-$(QEMU_PROG).stp: $(SRC_PATH)/trace-events
+$(QEMU_PROG).stp: $(BUILD_DIR)/trace-events-all

        $(call quiet-command,$(TRACETOOL) \
                --format=stap \
                --backends=$(TRACE_BACKENDS) \
        $(call quiet-command,$(TRACETOOL) \
                --format=stap \
                --backends=$(TRACE_BACKENDS) \


@@ -64,6 +66,13 @@ $(QEMU_PROG).stp: $(SRC_PATH)/trace-events
                --target-type=$(TARGET_TYPE) \
                < $< > $@,"  GEN   $(TARGET_DIR)$(QEMU_PROG).stp")
 
                --target-type=$(TARGET_TYPE) \
                < $< > $@,"  GEN   $(TARGET_DIR)$(QEMU_PROG).stp")
 

+$(QEMU_PROG)-simpletrace.stp: $(BUILD_DIR)/trace-events-all
+       $(call quiet-command,$(TRACETOOL) \
+               --format=simpletrace-stap \
+               --backends=$(TRACE_BACKENDS) \
+               --probe-prefix=qemu.$(TARGET_TYPE).$(TARGET_NAME) \
+               < $< > $@,"  GEN   $(TARGET_DIR)$(QEMU_PROG)-simpletrace.stp")
+

 else
 stap:
 endif
 else
 stap:
 endif


@@ -76,8 +85,11 @@ all: $(PROGS) stap
 #########################################################
 # cpu emulator library
 obj-y = exec.o translate-all.o cpu-exec.o
 #########################################################
 # cpu emulator library
 obj-y = exec.o translate-all.o cpu-exec.o

-obj-y += tcg/tcg.o tcg/optimize.o
+obj-y += translate-common.o
+obj-y += cpu-exec-common.o
+obj-y += tcg/tcg.o tcg/tcg-op.o tcg/optimize.o

 obj-$(CONFIG_TCG_INTERPRETER) += tci.o
 obj-$(CONFIG_TCG_INTERPRETER) += tci.o

+obj-y += tcg/tcg-common.o

 obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o
 obj-y += fpu/softfloat.o
 obj-y += target-$(TARGET_BASE_ARCH)/
 obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o
 obj-y += fpu/softfloat.o
 obj-y += target-$(TARGET_BASE_ARCH)/


@@ -96,7 +108,9 @@ obj-$(CONFIG_LIBDECNUMBER) += libdecnumber/dpd/decimal128.o
 
 ifdef CONFIG_LINUX_USER
 
 
 ifdef CONFIG_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/host/$(ARCH) \
+             -I$(SRC_PATH)/linux-user

 
 obj-y += linux-user/
 obj-y += gdbstub.o thunk.o user-exec.o
 
 obj-y += linux-user/
 obj-y += gdbstub.o thunk.o user-exec.o


@@ -120,14 +134,14 @@ endif #CONFIG_BSD_USER
 # System emulator target
 ifdef CONFIG_SOFTMMU
 obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o
 # System emulator target
 ifdef CONFIG_SOFTMMU
 obj-y += arch_init.o cpus.o monitor.o gdbstub.o balloon.o ioport.o numa.o

-obj-y += qtest.o
+obj-y += qtest.o bootdevice.o

 obj-y += hw/
 obj-y += hw/

-obj-$(CONFIG_FDT) += device_tree.o

 obj-$(CONFIG_KVM) += kvm-all.o
 obj-$(CONFIG_KVM) += kvm-all.o

-obj-y += memory.o savevm.o cputlb.o
+obj-y += memory.o cputlb.o

 obj-y += memory_mapping.o
 obj-y += dump.o
 obj-y += memory_mapping.o
 obj-y += dump.o

-LIBS+=$(libs_softmmu)
+obj-y += migration/ram.o migration/savevm.o
+LIBS := $(libs_softmmu) $(LIBS)

 
 # xen support
 obj-$(CONFIG_XEN) += xen-common.o
 
 # xen support
 obj-$(CONFIG_XEN) += xen-common.o


@@ -142,7 +156,7 @@ else
 obj-y += hw/$(TARGET_BASE_ARCH)/
 endif
 
 obj-y += hw/$(TARGET_BASE_ARCH)/
 endif
 

-GENERATED_HEADERS += hmp-commands.h qmp-commands-old.h
+GENERATED_HEADERS += hmp-commands.h hmp-commands-info.h

 
 endif # CONFIG_SOFTMMU
 
 
 endif # CONFIG_SOFTMMU
 


@@ -152,34 +166,53 @@ endif # CONFIG_SOFTMMU
 dummy := $(call unnest-vars,,obj-y)
 all-obj-y := $(obj-y)
 
 dummy := $(call unnest-vars,,obj-y)
 all-obj-y := $(obj-y)
 

+target-obj-y :=

 block-obj-y :=
 common-obj-y :=
 include $(SRC_PATH)/Makefile.objs
 block-obj-y :=
 common-obj-y :=
 include $(SRC_PATH)/Makefile.objs

+dummy := $(call unnest-vars,,target-obj-y)
+target-obj-y-save := $(target-obj-y)

 dummy := $(call unnest-vars,.., \
                block-obj-y \
                block-obj-m \
 dummy := $(call unnest-vars,.., \
                block-obj-y \
                block-obj-m \

+               crypto-obj-y \
+               crypto-aes-obj-y \
+               qom-obj-y \
+               io-obj-y \

                common-obj-y \
                common-obj-m)
                common-obj-y \
                common-obj-m)

+target-obj-y := $(target-obj-y-save)

 all-obj-y += $(common-obj-y)
 all-obj-y += $(common-obj-y)

+all-obj-y += $(target-obj-y)
+all-obj-y += $(qom-obj-y)

 all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)
 all-obj-$(CONFIG_SOFTMMU) += $(block-obj-y)

+all-obj-$(CONFIG_USER_ONLY) += $(crypto-aes-obj-y)
+all-obj-$(CONFIG_SOFTMMU) += $(crypto-obj-y)
+all-obj-$(CONFIG_SOFTMMU) += $(io-obj-y)
+
+$(QEMU_PROG_BUILD): config-devices.mak

 
 # build either PROG or PROGW
 $(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a
 
 # build either PROG or PROGW
 $(QEMU_PROG_BUILD): $(all-obj-y) ../libqemuutil.a ../libqemustub.a

-       $(call LINK,$^)
+       $(call LINK, $(filter-out %.mak, $^))
+ifdef CONFIG_DARWIN
+       $(call quiet-command,Rez -append $(SRC_PATH)/pc-bios/qemu.rsrc -o $@,"  REZ   $(TARGET_DIR)$@")
+       $(call quiet-command,SetFile -a C $@,"  SETFILE $(TARGET_DIR)$@")
+endif

 
 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)$@")
 
 
 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)$@")
 

-hmp-commands.h: $(SRC_PATH)/hmp-commands.hx
+hmp-commands.h: $(SRC_PATH)/hmp-commands.hx $(SRC_PATH)/scripts/hxtool

        $(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-old.h: $(SRC_PATH)/qmp-commands.hx
+hmp-commands-info.h: $(SRC_PATH)/hmp-commands-info.hx $(SRC_PATH)/scripts/hxtool

        $(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: clean-target

        rm -f *.a *~ $(PROGS)
        rm -f $(shell find . -name '*.[od]')
        rm -f *.a *~ $(PROGS)
        rm -f $(shell find . -name '*.[od]')

-       rm -f hmp-commands.h qmp-commands-old.h gdbstub-xml.c
+       rm -f hmp-commands.h gdbstub-xml.c

 ifdef CONFIG_TRACE_SYSTEMTAP
        rm -f *.stp
 endif
 ifdef CONFIG_TRACE_SYSTEMTAP
        rm -f *.stp
 endif


@@ -191,6 +224,7 @@ endif
 ifdef CONFIG_TRACE_SYSTEMTAP
        $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
        $(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG).stp"
 ifdef CONFIG_TRACE_SYSTEMTAP
        $(INSTALL_DIR) "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset"
        $(INSTALL_DATA) $(QEMU_PROG).stp-installed "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG).stp"

+       $(INSTALL_DATA) $(QEMU_PROG)-simpletrace.stp "$(DESTDIR)$(qemu_datadir)/../systemtap/tapset/$(QEMU_PROG)-simpletrace.stp"

 endif
 
 GENERATED_HEADERS += config-target.h
 endif
 
 GENERATED_HEADERS += config-target.h