Merge branch 'master' into 'master'

Fix running qemu with aarch64 on MacOS

See merge request !1332

mk/qemu.mk

@@ -108,6 +108,10 @@ ifeq ($(UNAME),Linux)
 	endif
 endif
 
+ifeq ($(UNAME),Darwin)
+	QEMUFLAGS+=-cpu $(QEMU_CPU)
+endif
+
 ifeq ($(UNAME),Linux)
 $(BUILD)/extra.img:
 	fallocate --posix --length 1G $@