detect arm in build_qemu_support.sh

This commit is contained in:
Andrea Fioraldi 2020-03-22 12:09:52 +01:00
parent bd239d7e3d
commit aac7c7d75d
2 changed files with 10 additions and 7 deletions

View File

@ -64,11 +64,6 @@ ifneq "$(shell uname -m)" "x86_64"
endif
endif
#support for qemu on arm
ifneq "$(findstring arm, $(shell uname -m))" ""
export CPU_TARGET=arm
endif
CFLAGS ?= -O3 -funroll-loops $(CFLAGS_OPT)
override CFLAGS += -Wall -g -Wno-pointer-sign -I include/ \
-DAFL_PATH=\"$(HELPER_PATH)\" -DBIN_PATH=\"$(BIN_PATH)\" \

View File

@ -143,8 +143,16 @@ echo "[*] Configuring QEMU for $CPU_TARGET..."
ORIG_CPU_TARGET="$CPU_TARGET"
test "$CPU_TARGET" = "" && CPU_TARGET="`uname -m`"
test "$CPU_TARGET" = "i686" && CPU_TARGET="i386"
if [ "$ORIG_CPU_TARGET" = "" ]; then
CPU_TARGET="`uname -m`"
test "$CPU_TARGET" = "i686" && CPU_TARGET="i386"
test "$CPU_TARGET" = "arm64v8" && CPU_TARGET="aarch64"
case "$CPU_TARGET" in
*arm*)
CPU_TARGET="arm"
;;
esac
fi
cd qemu-$VERSION || exit 1