[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v6 3/8] Makefile: introduce common-obj-m and blo
From: |
Fam Zheng |
Subject: |
Re: [Qemu-devel] [PATCH v6 3/8] Makefile: introduce common-obj-m and block-obj-m for DSO |
Date: |
Thu, 12 Sep 2013 10:50:35 +0800 |
User-agent: |
Mutt/1.5.21 (2010-09-15) |
On Wed, 09/11 21:34, Fam Zheng wrote:
> 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 <address@hidden>
> ---
> Makefile | 10 ++++++++--
> Makefile.objs | 2 ++
> configure | 6 ++++++
> rules.mak | 45 +++++++++++++++++++++++++++++++++++++--------
> 4 files changed, 53 insertions(+), 10 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 9e603c6..c50b4b3 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -125,13 +125,15 @@ 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
> endif
>
> -all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all
> +all: $(DOCS) $(TOOLS) $(HELPERS-y) recurse-all modules
>
> vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS)
>
> @@ -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 b1d53b5..9275d91 100644
> --- a/rules.mak
> +++ b/rules.mak
> @@ -18,6 +18,9 @@ QEMU_DGFLAGS += -MMD -MP -MT $@ -MF $(*D)/$(*F).d
> QEMU_INCLUDES += -I$(<D) -I$(@D)
>
> extract-libs = $(strip $(foreach o,$1,$($o-libs)))
> +expand-objs = $(strip $(sort $(filter %.o,$1)) \
> + $(foreach o,$(filter %.mo,$1),$($o-objs)) \
> + $(filter-out %.o %.mo,$1))
>
> %.o: %.c
> $(call quiet-command,$(CC) $(QEMU_INCLUDES) $(QEMU_CFLAGS)
> $(QEMU_DGFLAGS) $(CFLAGS) $(address@hidden) -c -o $@ $<," CC
> $(TARGET_DIR)$@")
> @@ -26,8 +29,8 @@ extract-libs = $(strip $(foreach o,$1,$($o-libs)))
>
> ifeq ($(LIBTOOL),)
> LINK = $(call quiet-command,$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
> - $(sort $(filter %.o, $1)) $(filter-out %.o, $1) $(version-obj-y) \
> - $(call extract-libs,$^) $(LIBS)," LINK $(TARGET_DIR)$@")
> + $(call expand-objs $1) $(version-obj-y) \
Missing comma here: ^
So link is broken without libtool.
> + $(call extract-libs,$1) $(LIBS)," LINK $(TARGET_DIR)$@")
> else
> LIBTOOL += $(if $(V),,--quiet)
> %.lo: %.c
> @@ -38,12 +41,12 @@ LIBTOOL += $(if $(V),,--quiet)
> $(call quiet-command,$(LIBTOOL) --mode=compile --tag=CC dtrace -o $@ -G
> -s $<, " lt GEN $(TARGET_DIR)$@")
>
> LINK = $(call quiet-command,\
> - $(if $(filter %.lo %.la,$^),$(LIBTOOL) --mode=link --tag=CC \
> + $(if $(filter %.lo %.la,$1),$(LIBTOOL) --mode=link --tag=CC \
> )$(CC) $(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ \
> - $(sort $(filter %.o, $1)) $(filter-out %.o, $1) \
> - $(if $(filter %.lo %.la,$^),$(version-lobj-y),$(version-obj-y)) \
> - $(if $(filter %.lo %.la,$^),$(LIBTOOLFLAGS)) \
> - $(call extract-libs,$^) $(LIBS),$(if $(filter %.lo %.la,$^),"lt LINK
> ", " LINK ")"$(TARGET_DIR)$@")
> + $(call expand-objs,$1) \
> + $(if $(filter %.lo %.la,$1),$(version-lobj-y),$(version-obj-y)) \
> + $(if $(filter %.lo %.la,$1),$(LIBTOOLFLAGS)) \
> + $(call extract-libs,$1) $(LIBS),$(if $(filter %.lo %.la,$1),"lt LINK
> ", " LINK ")"$(TARGET_DIR)$@")
> endif
>
> %.asm: %.S
> @@ -58,6 +61,17 @@ endif
> %.o: %.dtrace
> $(call quiet-command,dtrace -o $@ -G -s $<, " GEN $(TARGET_DIR)$@")
>
> +%$(DSOSUF): QEMU_CFLAGS += -fPIC
> +%$(DSOSUF): LDFLAGS += $(LDFLAGS_SHARED)
> +%$(DSOSUF): %.mo
> + $(call LINK,$^)
> +
> +.PHONY: modules
> +modules:
> +
> +%.mo:
> + $(call quiet-command,touch $@," GEN $(TARGET_DIR)$@")
> +
> %$(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)
> @@ -159,5 +184,9 @@ $(foreach var,$(nested-vars), $(eval \
>
> $(if $1,$(foreach v,$(nested-vars),$(eval \
> $v := $(addprefix $1/,$(value $v)))))
> +$(foreach v,$(filter %-m,$(nested-vars)), \
> + $(call add-modules,$v))
> +
> +$(eval modules: $(patsubst %.mo,%$(DSOSUF),$(modules-m)))
>
> endef
> --
> 1.8.3.1
>
- Re: [Qemu-devel] [PATCH v6 1/8] make.rule: fix $(obj) to a real relative path, (continued)
[Qemu-devel] [PATCH v6 2/8] rule.mak: allow per object cflags and libs, Fam Zheng, 2013/09/11
[Qemu-devel] [PATCH v6 3/8] Makefile: introduce common-obj-m and block-obj-m for DSO, Fam Zheng, 2013/09/11
[Qemu-devel] [PATCH v6 4/8] module: implement module loading function, Fam Zheng, 2013/09/11
- Re: [Qemu-devel] [PATCH v6 4/8] module: implement module loading function, Daniel P. Berrange, 2013/09/11
- Re: [Qemu-devel] [PATCH v6 4/8] module: implement module loading function, Alex Bligh, 2013/09/11
- Re: [Qemu-devel] [PATCH v6 4/8] module: implement module loading function, Richard Henderson, 2013/09/11
- Re: [Qemu-devel] [PATCH v6 4/8] module: implement module loading function, Fam Zheng, 2013/09/11
- Re: [Qemu-devel] [PATCH v6 4/8] module: implement module loading function, Michael Tokarev, 2013/09/12
- Re: [Qemu-devel] [PATCH v6 4/8] module: implement module loading function, Daniel P. Berrange, 2013/09/12
- Re: [Qemu-devel] [PATCH v6 4/8] module: implement module loading function, Eric Blake, 2013/09/12
- Re: [Qemu-devel] [PATCH v6 4/8] module: implement module loading function, Daniel P. Berrange, 2013/09/12
[Qemu-devel] [PATCH v6 5/8] configure: introduce --enable-modules, Fam Zheng, 2013/09/11