diff mbox series

[v4,9/9] disas: Add capstone as submodule

Message ID 20170928165414.7339-10-richard.henderson@linaro.org
State Superseded
Headers show
Series Support the Capstone disassembler | expand

Commit Message

Richard Henderson Sept. 28, 2017, 4:54 p.m. UTC 
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 <richard.henderson@linaro.org>

---
 Makefile    | 13 +++++++++++++
 .gitmodules |  3 +++
 capstone    |  1 +
 configure   | 12 +++++++++++-
 4 files changed, 28 insertions(+), 1 deletion(-)
 create mode 160000 capstone

-- 
2.13.5

Comments

Philippe Mathieu-Daudé Oct. 2, 2017, 1:54 p.m. UTC | #1 
Hi Richard,

just a small suggestion to have more useful output if some user fill a 
bug report.

On 09/28/2017 01:54 PM, Richard Henderson wrote:
> 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 <richard.henderson@linaro.org>

> ---

>   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="submodule"

or "internal"

> +    capstone_internal=yes


drop

> +    mkdir -p capstone

> +    QEMU_CFLAGS="$QEMU_CFLAGS -I\$(SRC_PATH)/capstone/include"

> +    LIBS="\$(BUILD_DIR)/capstone/libcapstone.a $LIBS"

> +  elif $pkg_config capstone; then

>       capstone=yes


     capstone="system"

...

-if test "$capstone" = "yes" ; then
+if test "$capstone" != "no" ; then
    echo "CONFIG_CAPSTONE=y" >> $config_host_mak
  fi

...

>       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


if [ "$capstone" = "submodule" ]; then

> +  echo "config-host.h: subdir-capstone" >> $config_host_mak

> +fi

>   

>   if test "$numa" = "yes"; then

>     echo "CONFIG_NUMA=y" >> $config_host_mak

> 


Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


both:
- debian + libcapstone-dev
- git submodule update --init (no libcapstone-dev)
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


Regards,

Phil.
Alex Bennée Oct. 2, 2017, 2:43 p.m. UTC | #2 
Richard Henderson <richard.henderson@linaro.org> 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 <richard.henderson@linaro.org>

> ---

>  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
Richard Henderson Oct. 2, 2017, 6:27 p.m. UTC | #3 
On 10/02/2017 10:43 AM, Alex Bennée wrote:
>> +    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?


*shrug* We do this for the other directories at configure time.


r~
Alex Bennée Oct. 13, 2017, 7:50 a.m. UTC | #4 
Richard Henderson <richard.henderson@linaro.org> writes:

> On 10/02/2017 10:43 AM, Alex Bennée wrote:

>>> +    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?

>

> *shrug* We do this for the other directories at configure time.


fair enough.

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>


>

>

> r~



--
Alex Bennée
diff mbox series

Patch

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
+    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