diff --git a/qemu/configure b/qemu/configure index 65d09a3b..c3ed462b 100755 --- a/qemu/configure +++ b/qemu/configure @@ -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 -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 diff --git a/qemu/target-arm/helper-a64.c b/qemu/target-arm/helper-a64.c index 819193f2..63f62b42 100644 --- a/qemu/target-arm/helper-a64.c +++ b/qemu/target-arm/helper-a64.c @@ -24,7 +24,6 @@ #include "qemu/bitops.h" #include "internals.h" #include "qemu/crc32c.h" -#include /* For crc32 */ /* C2.4.7 Multiply and divide */ /* special cases for 0 and LLONG_MIN are mandated by the standard */ diff --git a/qemu/target-arm/helper.c b/qemu/target-arm/helper.c index ed5c03d7..6eb86016 100644 --- a/qemu/target-arm/helper.c +++ b/qemu/target-arm/helper.c @@ -7,7 +7,6 @@ #include "qemu/crc32c.h" #include "exec/cpu_ldst.h" #include "arm_ldst.h" -#include /* For crc32 */ #ifndef CONFIG_USER_ONLY static inline int get_phys_addr(CPUARMState *env, target_ulong address,