mbox series

[v2,0/2] Update capstone module

Message ID 20190523204954.13122-1-richard.henderson@linaro.org
Headers show
Series Update capstone module | expand

Message

Richard Henderson May 23, 2019, 8:49 p.m. UTC
There has recently been some good progress in the upstream
capstone repository, syncing the instruction sets from the
(further) upstream llvm.

In particular, there are Power9 and System z13 instructions.
Both of which were missing from our current snapshot and from
our (ancient) binutils opcodes snapshots.

Changes for v2:
  * Drop the installed directory change.  This does force a
    different include change when building from git.
  * Drop the s390 skipdata callback for now.


r~


Richard Henderson (2):
  capstone: Update to master
  capstone: Enable disassembly for s390x

 Makefile           | 1 +
 disas.c            | 3 +++
 target/s390x/cpu.c | 4 ++++
 capstone           | 2 +-
 configure          | 2 +-
 5 files changed, 10 insertions(+), 2 deletions(-)

-- 
2.17.1

Comments

Alex Bennée May 31, 2019, 8:20 a.m. UTC | #1
no-reply@patchew.org writes:

> Patchew URL: https://patchew.org/QEMU/20190523204954.13122-1-richard.henderson@linaro.org/

>

>

>

> Hi,

>

> This series failed build test on s390x host. Please find the details below.

>

> === TEST SCRIPT BEGIN ===

> #!/bin/bash

> # Testing script will be invoked under the git checkout with

> # HEAD pointing to a commit that has the patches applied on top of "base"

> # branch

> set -e

> CC=$HOME/bin/cc

> INSTALL=$PWD/install

> BUILD=$PWD/build

> mkdir -p $BUILD $INSTALL

> SRC=$PWD

> cd $BUILD

> $SRC/configure --cc=$CC --prefix=$INSTALL

> make -j4

> # XXX: we need reliable clean up

> # make check -j4 V=1

> make install

>

> echo

> echo "=== ENV ==="

> env

>

> echo

> echo "=== PACKAGES ==="

> rpm -qa

> === TEST SCRIPT END ===

>

>   GEN     ui/input-keymap-qcode-to-atset1.c

>   CC      cs.o

>   CC      utils.o

> cs.c:17:10: fatal error: capstone/capstone.h: No such file or directory

>    17 | #include <capstone/capstone.h>

>       |          ^~~~~~~~~~~~~~~~~~~~~

> compilation terminated.

> ---

>   CC      /var/tmp/patchew-tester-tmp-c6t41dq_/src/build/slirp/src/socket.o

> In file included from utils.h:13,

>                  from utils.c:12:

> cs_priv.h:7:10: fatal error: capstone/capstone.h: No such file or directory

>     7 | #include <capstone/capstone.h>

>       |          ^~~~~~~~~~~~~~~~~~~~~

> compilation terminated.

>

>

> The full log is available at

> http://patchew.org/logs/20190523204954.13122-1-richard.henderson@linaro.org/testing.s390x/?type=message.


I saw this on my laptop (which doesn't have system capstone installed)
as well. Did I imagine there was a patch floating around to deal with
the captone/capstone inconsistency?

--
Alex Bennée
Richard Henderson May 31, 2019, 8:46 a.m. UTC | #2
On 5/31/19 3:20 AM, Alex Bennée wrote:
> 

> no-reply@patchew.org writes:

> 

>> Patchew URL: https://patchew.org/QEMU/20190523204954.13122-1-richard.henderson@linaro.org/

>>

>>

>>

>> Hi,

>>

>> This series failed build test on s390x host. Please find the details below.

>>

>> === TEST SCRIPT BEGIN ===

>> #!/bin/bash

>> # Testing script will be invoked under the git checkout with

>> # HEAD pointing to a commit that has the patches applied on top of "base"

>> # branch

>> set -e

>> CC=$HOME/bin/cc

>> INSTALL=$PWD/install

>> BUILD=$PWD/build

>> mkdir -p $BUILD $INSTALL

>> SRC=$PWD

>> cd $BUILD

>> $SRC/configure --cc=$CC --prefix=$INSTALL

>> make -j4

>> # XXX: we need reliable clean up

>> # make check -j4 V=1

>> make install

>>

>> echo

>> echo "=== ENV ==="

>> env

>>

>> echo

>> echo "=== PACKAGES ==="

>> rpm -qa

>> === TEST SCRIPT END ===

>>

>>   GEN     ui/input-keymap-qcode-to-atset1.c

>>   CC      cs.o

>>   CC      utils.o

>> cs.c:17:10: fatal error: capstone/capstone.h: No such file or directory

>>    17 | #include <capstone/capstone.h>

>>       |          ^~~~~~~~~~~~~~~~~~~~~

>> compilation terminated.

>> ---

>>   CC      /var/tmp/patchew-tester-tmp-c6t41dq_/src/build/slirp/src/socket.o

>> In file included from utils.h:13,

>>                  from utils.c:12:

>> cs_priv.h:7:10: fatal error: capstone/capstone.h: No such file or directory

>>     7 | #include <capstone/capstone.h>

>>       |          ^~~~~~~~~~~~~~~~~~~~~

>> compilation terminated.

>>

>>

>> The full log is available at

>> http://patchew.org/logs/20190523204954.13122-1-richard.henderson@linaro.org/testing.s390x/?type=message.

> 

> I saw this on my laptop (which doesn't have system capstone installed)

> as well. Did I imagine there was a patch floating around to deal with

> the captone/capstone inconsistency?


You did see one, but that was for users of capstone.
This is while building capstone itself.

This means that something changed in capstone's own build system that I failed
to replicate while pulling it into ours, and I failed to notice because the
build here found the system header instead.

Ho hum.


r~