[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 9/9] disas: Add capstone as submodule
From: |
Alex Bennée |
Subject: |
Re: [Qemu-devel] [PATCH v4 9/9] disas: Add capstone as submodule |
Date: |
Mon, 02 Oct 2017 15:43:27 +0100 |
User-agent: |
mu4e 0.9.19; emacs 26.0.60 |
Richard Henderson <address@hidden> writes:
> Do not require the submodule, but use it if present (in preference
> even to a system copy). This will allow us to easily use capstone
> in older systems for which a package is not available, and also
> easily track bug fixes from upstream.
>
> Signed-off-by: Richard Henderson <address@hidden>
> ---
> Makefile | 13 +++++++++++++
> .gitmodules | 3 +++
> capstone | 1 +
> configure | 12 +++++++++++-
> 4 files changed, 28 insertions(+), 1 deletion(-)
> create mode 160000 capstone
>
> diff --git a/Makefile b/Makefile
> index cee6e28659..7ff366f6ca 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -336,6 +336,19 @@ subdir-dtc:dtc/libfdt dtc/tests
> dtc/%:
> mkdir -p $@
>
> +# Overriding CFLAGS causes us to lose defines added in the sub-makefile.
> +# Not overriding CFLAGS leads to mis-matches between compilation modes.
> +# Therefore we replicate some of the logic in the sub-makefile.
> +CAP_CFLAGS = $(subst -Werror,,$(CFLAGS) $(QEMU_CFLAGS))
> +CAP_CFLAGS += -DCAPSTONE_USE_SYS_DYN_MEM
> +CAP_CFLAGS += -DCAPSTONE_HAS_ARM
> +CAP_CFLAGS += -DCAPSTONE_HAS_ARM64
> +CAP_CFLAGS += -DCAPSTONE_HAS_POWERPC
> +CAP_CFLAGS += -DCAPSTONE_HAS_X86
> +
> +subdir-capstone:
> + $(call quiet-command,$(MAKE) -C $(SRC_PATH)/capstone CAPSTONE_SHARED=no
> BUILDDIR="$(BUILD_DIR)/capstone" CC="$(CC)" AR="$(AR)" LD="$(LD)"
> CFLAGS="$(CAP_CFLAGS)" $(SUBDIR_MAKEFLAGS)
> $(BUILD_DIR)/capstone/libcapstone.a)
> +
> $(SUBDIR_RULES): libqemuutil.a $(common-obj-y) $(chardev-obj-y) \
> $(qom-obj-y) $(crypto-aes-obj-$(CONFIG_USER_ONLY))
>
> diff --git a/.gitmodules b/.gitmodules
> index 84c54cdc49..bcb80d701a 100644
> --- a/.gitmodules
> +++ b/.gitmodules
> @@ -34,3 +34,6 @@
> [submodule "roms/QemuMacDrivers"]
> path = roms/QemuMacDrivers
> url = git://git.qemu.org/QemuMacDrivers.git
> +[submodule "capstone"]
> + path = capstone
> + url = https://github.com/aquynh/capstone.git
> diff --git a/capstone b/capstone
> new file mode 160000
> index 0000000000..a279481dbf
> --- /dev/null
> +++ b/capstone
> @@ -0,0 +1 @@
> +Subproject commit a279481dbfd54bb1e2336d771e89978cc6d43176
> diff --git a/configure b/configure
> index 3777db91b6..a6cf0a5a15 100755
> --- a/configure
> +++ b/configure
> @@ -4380,7 +4380,14 @@ fi
> # capstone
>
> if test "$capstone" != no; then
> - if $pkg_config capstone; then
> + if test -f ${source_path}/capstone/Makefile ; then
> + # have submodule capstone - use it
> + capstone=yes
> + capstone_internal=yes
> + mkdir -p capstone
Having a mkdir -p here seems a little out of place. Shouldn't the build
directory creation be handled by the make recipe?
> + QEMU_CFLAGS="$QEMU_CFLAGS -I\$(SRC_PATH)/capstone/include"
> + LIBS="\$(BUILD_DIR)/capstone/libcapstone.a $LIBS"
> + elif $pkg_config capstone; then
> capstone=yes
> QEMU_CFLAGS="$QEMU_CFLAGS $($pkg_config --cflags capstone)"
> LIBS="$($pkg_config --libs capstone) $LIBS"
> @@ -6596,6 +6603,9 @@ done # for target in $targets
> if [ "$dtc_internal" = "yes" ]; then
> echo "config-host.h: subdir-dtc" >> $config_host_mak
> fi
> +if [ "$capstone_internal" = "yes" ]; then
> + echo "config-host.h: subdir-capstone" >> $config_host_mak
> +fi
>
> if test "$numa" = "yes"; then
> echo "CONFIG_NUMA=y" >> $config_host_mak
--
Alex Bennée