Merge branch 'drop-zlib' of https://github.com/radare/unicorn into radare-drop-zlib

This commit is contained in:
Nguyen Anh Quynh 2016-06-15 16:41:13 +07:00
commit 40ac55cf74
3 changed files with 0 additions and 20 deletions

18
qemu/configure vendored
View File

@ -220,7 +220,6 @@ pkgversion=""
pie=""
zero_malloc=""
win_sdk="no"
zlib="yes"
# parse CC options first
for opt do
@ -1073,23 +1072,6 @@ if ! has "$pkg_config_exe"; then
error_exit "pkg-config binary '$pkg_config_exe' not found"
fi
##########################################
# zlib check
if test "$zlib" != "no" ; then
cat > $TMPC << EOF
#include <zlib.h>
int main(void) { zlibVersion(); return 0; }
EOF
if compile_prog "" "-lz" ; then
:
else
error_exit "zlib check failed" \
"Make sure to have the zlib libs and headers installed."
fi
fi
LIBS="$LIBS -lz"
##########################################
# libtool probe

View File

@ -24,7 +24,6 @@
#include "qemu/bitops.h"
#include "internals.h"
#include "qemu/crc32c.h"
#include <zlib.h> /* For crc32 */
/* C2.4.7 Multiply and divide */
/* special cases for 0 and LLONG_MIN are mandated by the standard */

View File

@ -7,7 +7,6 @@
#include "qemu/crc32c.h"
#include "exec/cpu_ldst.h"
#include "arm_ldst.h"
#include <zlib.h> /* For crc32 */
#ifndef CONFIG_USER_ONLY
static inline int get_phys_addr(CPUARMState *env, target_ulong address,