From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJd8r-00065K-2J for qemu-devel@nongnu.org; Wed, 11 Sep 2013 01:39:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VJd8k-0006Zo-Se for qemu-devel@nongnu.org; Wed, 11 Sep 2013 01:39:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49079) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VJd8k-0006Zj-KV for qemu-devel@nongnu.org; Wed, 11 Sep 2013 01:38:58 -0400 From: Fam Zheng Date: Wed, 11 Sep 2013 13:38:26 +0800 Message-Id: <1378877909-28518-4-git-send-email-famz@redhat.com> In-Reply-To: <1378877909-28518-1-git-send-email-famz@redhat.com> References: <1378877909-28518-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [RFC PATCH v5 3/6] Makefile: introduce common-obj-m and block-obj-m for DSO List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, famz@redhat.com, mjt@tls.msk.ru, stefanha@redhat.com, pbonzini@redhat.com, vilanova@ac.upc.edu, rth@twiddle.net Add necessary rules and flags for shared object generation. $(common-obj-m) will include $(block-obj-m), like $(common-obj-y) does for $(block-obj-y). The new rules introduced here are: 0) For all %.so compiling: QEMU_CFLAGS += -fPIC 1) %.o in $(common-obj-m) is compiled to %.o, then linked to %.so. 2) %.mo in $(common-obj-m) is the placeholder for %.so for pattern matching in Makefile. It's linked to "-shared" with all its dependencies (multiple *.o) as input. Which means the list of depended objects must be ruled out in each sub-Makefile.objs with an variable: foo.mo-objs := bar.o baz.o qux.o in the same style with foo.o-cflags and foo.o-libs. Signed-off-by: Fam Zheng --- Makefile | 8 +++++++- Makefile.objs | 2 ++ configure | 6 ++++++ rules.mak | 48 ++++++++++++++++++++++++++++++++++++++++-------- 4 files changed, 55 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 9e603c6..db1d091 100644 --- a/Makefile +++ b/Makefile @@ -125,7 +125,9 @@ dummy := $(call unnest-vars,, \ util-obj-y \ qga-obj-y \ block-obj-y \ - common-obj-y) + block-obj-m \ + common-obj-y \ + common-obj-m) ifneq ($(wildcard config-host.mak),) include $(SRC_PATH)/tests/Makefile @@ -249,6 +251,10 @@ clean: rm -f qemu-options.def find . -name '*.[oda]' -type f -exec rm -f {} + find . -name '*.l[oa]' -type f -exec rm -f {} + + find . -name '*.so' -type f -exec rm -f {} + + find . -name '*.mo' -type f -exec rm -f {} + + find . -name '*.dll' -type f -exec rm -f {} + + rm -f $(TOOLS) $(HELPERS-y) qemu-ga TAGS cscope.* *.pod *~ */*~ rm -Rf .libs rm -f qemu-img-cmds.h diff --git a/Makefile.objs b/Makefile.objs index 4f7a364..023166b 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -19,6 +19,8 @@ block-obj-y += qemu-coroutine.o qemu-coroutine-lock.o qemu-coroutine-io.o block-obj-y += qemu-coroutine-sleep.o block-obj-y += coroutine-$(CONFIG_COROUTINE_BACKEND).o +block-obj-m = block/ + ifeq ($(CONFIG_VIRTIO)$(CONFIG_VIRTFS)$(CONFIG_PCI),yyy) # Lots of the fsdev/9pcode is pulled in by vl.c via qemu_fsdev_add. # only pull in the actual virtio-9p device if we also enabled virtio. diff --git a/configure b/configure index cc3cd4d..c6d4a62 100755 --- a/configure +++ b/configure @@ -190,6 +190,8 @@ mingw32="no" gcov="no" gcov_tool="gcov" EXESUF="" +DSOSUF=".so" +LDFLAGS_SHARED="-shared" prefix="/usr/local" mandir="\${prefix}/share/man" datadir="\${prefix}/share" @@ -485,6 +487,7 @@ OpenBSD) Darwin) bsd="yes" darwin="yes" + LDFLAGS_SHARED="-bundle" if [ "$cpu" = "x86_64" ] ; then QEMU_CFLAGS="-arch x86_64 $QEMU_CFLAGS" LDFLAGS="-arch x86_64 $LDFLAGS" @@ -584,6 +587,7 @@ fi if test "$mingw32" = "yes" ; then EXESUF=".exe" + DSOSUF=".dll" QEMU_CFLAGS="-DWIN32_LEAN_AND_MEAN -DWINVER=0x501 $QEMU_CFLAGS" # enable C99/POSIX format strings (needs mingw32-runtime 3.15 or later) QEMU_CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $QEMU_CFLAGS" @@ -4175,6 +4179,8 @@ echo "LIBTOOLFLAGS=$LIBTOOLFLAGS" >> $config_host_mak echo "LIBS+=$LIBS" >> $config_host_mak echo "LIBS_TOOLS+=$libs_tools" >> $config_host_mak echo "EXESUF=$EXESUF" >> $config_host_mak +echo "DSOSUF=$DSOSUF" >> $config_host_mak +echo "LDFLAGS_SHARED=$LDFLAGS_SHARED" >> $config_host_mak echo "LIBS_QGA+=$libs_qga" >> $config_host_mak echo "POD2MAN=$POD2MAN" >> $config_host_mak echo "TRANSLATE_OPT_CFLAGS=$TRANSLATE_OPT_CFLAGS" >> $config_host_mak diff --git a/rules.mak b/rules.mak index 6342d60..ea97888 100644 --- a/rules.mak +++ b/rules.mak @@ -18,6 +18,9 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d QEMU_INCLUDES += -I$( $@-new," GEN $(TARGET_DIR)$@") + $(call quiet-command,diff $@-new $@ &>/dev/null || mv $@-new $@) + @rm $@-new &>/dev/null || true + %$(EXESUF): %.o $(call LINK,$^) @@ -123,7 +137,10 @@ $(foreach v,$($1), \ $(eval $v-cflags := )) \ $(if $($v-libs), \ $(eval $2$v-libs := $($v-libs)) \ - $(eval $v-libs := ))) + $(eval $v-libs := )) \ + $(if $($v-objs), \ + $(eval $2$v-objs := $(addprefix $2,$($v-objs))) \ + $(eval $v-objs := ))) endef define unnest-dir @@ -147,6 +164,14 @@ $(if $(nested-dirs), $(call unnest-vars-1)) endef +define add-modules +$(foreach o,$(filter %.o,$($1)),$(eval \ + $(patsubst %.o,%.mo,$o): $o)) +$(foreach o,$(filter %.mo,$($1)),$(eval \ + $o: $($o-objs))) +$(eval modules-m += $(patsubst %.o,%.mo,$($1))) +endef + define unnest-vars $(eval obj := $1) $(eval nested-vars := $2) @@ -156,4 +181,11 @@ $(foreach var,$(nested-vars),$(eval $(var) := $(filter-out %/, $($(var))))) $(shell mkdir -p $(sort $(foreach var,$(nested-vars),$(dir $($(var)))))) $(foreach var,$(nested-vars), $(eval \ -include $(addsuffix *.d, $(sort $(dir $($(var))))))) + +$(foreach v,$(filter %-m,$(nested-vars)), \ + $(call add-modules,$v)) + +$(eval modules: $(patsubst %.mo,%$(DSOSUF),$(modules-m))) +$(eval all: modules) + endef -- 1.8.3.1