ExternalVendorCode/AFLplusplus
1
0
Fork 0
mirror of https://github.com/AFLplusplus/AFLplusplus.git synced 2025-06-13 02:28:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix for qemu_mode where capstone 4.0+ is installed

Browse Source
This commit is contained in:
van Hauser
2020-02-28 06:50:15 +01:00
parent 0e8388d3ea
commit 7fa289316a
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/Changelog.md
View File

@ -10,8 +10,9 @@ sending a mail to <afl-users+subscribe@googlegroups.com>.
### Version ++2.62d (developt): ### Version ++2.62d (developt):
- qemu_mode now uses solely the internal capstone version to fix builds
- ... your patch? :-) on modern Linux distributions
- more tools get environment variable usage info in the help output
### Version ++2.62c (release): ### Version ++2.62c (release):

4
qemu_mode/build_qemu_support.sh
View File

@ -177,7 +177,7 @@ if [ "$STATIC" = "1" ]; then
--disable-sdl --disable-seccomp --disable-smartcard --disable-snappy --disable-spice --disable-libssh2 \ --disable-sdl --disable-seccomp --disable-smartcard --disable-snappy --disable-spice --disable-libssh2 \
--disable-libusb --disable-usb-redir --disable-vde --disable-vhost-net --disable-virglrenderer \ --disable-libusb --disable-usb-redir --disable-vde --disable-vhost-net --disable-virglrenderer \
--disable-virtfs --disable-vnc --disable-vte --disable-xen --disable-xen-pci-passthrough --disable-xfsctl \ --disable-virtfs --disable-vnc --disable-vte --disable-xen --disable-xen-pci-passthrough --disable-xfsctl \
--enable-linux-user --disable-system --disable-blobs --disable-tools \ --enable-linux-user --disable-system --disable-blobs --disable-tools --enable-capstone=internal \
--target-list="${CPU_TARGET}-linux-user" --static --disable-pie --cross-prefix=$CROSS_PREFIX || exit 1 --target-list="${CPU_TARGET}-linux-user" --static --disable-pie --cross-prefix=$CROSS_PREFIX || exit 1
else else
@ -186,7 +186,7 @@ else
# improvement, much to my surprise. Not sure how universal this is.. # improvement, much to my surprise. Not sure how universal this is..
./configure --disable-system \ ./configure --disable-system \
--enable-linux-user --disable-gtk --disable-sdl --disable-vnc \ --enable-linux-user --disable-gtk --disable-sdl --disable-vnc --enable-capstone=internal \
--target-list="${CPU_TARGET}-linux-user" --enable-pie $CROSS_PREFIX || exit 1 --target-list="${CPU_TARGET}-linux-user" --enable-pie $CROSS_PREFIX || exit 1
fi fi

23
qemu_mode/patches/configure.diff
View File

@ -1,12 +1,18 @@
diff --git a/configure b/configure --- a/configure 2019-08-02 18:04:50.000000000 +0200
index 1c9f609..3edc9a7 100755 +++ b/configure 2020-02-28 06:31:30.424895061 +0100
--- a/configure @@ -1479,6 +1479,8 @@
+++ b/configure ;;
@@ -4603,6 +4603,21 @@ if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \ --enable-capstone=system) capstone="system"
libs_softmmu="-lutil $libs_softmmu" ;;
+ --enable-capstone=internal) capstone="internal"
+ ;;
--with-git=*) git="$optarg"
;;
--enable-git-update) git_update=yes
@@ -4604,6 +4606,21 @@
fi fi
+########################################## ##########################################
+cat > $TMPC << EOF +cat > $TMPC << EOF
+#include <dlfcn.h> +#include <dlfcn.h>
+#include <stdlib.h> +#include <stdlib.h>
@ -21,6 +27,7 @@ index 1c9f609..3edc9a7 100755
+ error_exit "libdl check failed" + error_exit "libdl check failed"
+fi +fi
+ +
########################################## +##########################################
# spice probe # spice probe
if test "$spice" != "no" ; then if test "$spice" != "no" ; then
cat > $TMPC << EOF