diff options
Diffstat (limited to 'package/kvm-unit-tests')
| -rw-r--r-- | package/kvm-unit-tests/0001-remove-werror.patch | 17 | ||||
| -rw-r--r-- | package/kvm-unit-tests/Config.in | 4 | ||||
| -rw-r--r-- | package/kvm-unit-tests/kvm-unit-tests.mk | 5 |
3 files changed, 23 insertions, 3 deletions
diff --git a/package/kvm-unit-tests/0001-remove-werror.patch b/package/kvm-unit-tests/0001-remove-werror.patch new file mode 100644 index 0000000000..058a640d76 --- /dev/null +++ b/package/kvm-unit-tests/0001-remove-werror.patch @@ -0,0 +1,17 @@ +Remove -Werror to avoid build failures + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/Makefile +=================================================================== +--- a/Makefile ++++ b/Makefile +@@ -45,7 +45,7 @@ + > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) + + CFLAGS += -g +-CFLAGS += $(autodepend-flags) -Wall -Werror -Wno-frame-address ++CFLAGS += $(autodepend-flags) -Wall -Wno-frame-address + frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer + fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") + fnostack_protector := $(call cc-option, -fno-stack-protector, "") diff --git a/package/kvm-unit-tests/Config.in b/package/kvm-unit-tests/Config.in index f704a8e0c3..72656462e1 100644 --- a/package/kvm-unit-tests/Config.in +++ b/package/kvm-unit-tests/Config.in @@ -4,7 +4,9 @@ config BR2_PACKAGE_KVM_UNIT_TESTS # on i386 and x86-64, __builtin_reachable is used, so we need # gcc 4.5 at least. on i386, we use the target gcc, while on # x86-64 we use the host gcc (see .mk file for details) - depends on BR2_arm || \ + # On ARM, it uses virtualization extensions + depends on BR2_cortex_a7 || BR2_cortex_a12 || \ + BR2_cortex_a15 || BR2_cortex_a17 || \ (BR2_i386 && BR2_TOOLCHAIN_GCC_AT_LEAST_4_5) || \ BR2_powerpc64 || \ BR2_powerpc64le || \ diff --git a/package/kvm-unit-tests/kvm-unit-tests.mk b/package/kvm-unit-tests/kvm-unit-tests.mk index 1b5ce787ef..0ddb017802 100644 --- a/package/kvm-unit-tests/kvm-unit-tests.mk +++ b/package/kvm-unit-tests/kvm-unit-tests.mk @@ -17,7 +17,7 @@ KVM_UNIT_TESTS_ARCH = i386 else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) KVM_UNIT_TESTS_ARCH = ppc64 else ifeq ($(BR2_x86_64),y) -KVM_UNIT_TESTS_ARCH = x86_84 +KVM_UNIT_TESTS_ARCH = x86_64 endif ifeq ($(BR2_ENDIAN),"LITTLE") @@ -27,7 +27,8 @@ KVM_UNIT_TESTS_ENDIAN = big endif KVM_UNIT_TESTS_CONF_OPTS =\ - --arch="$(KERNEL_ARCH)" \ + --arch="$(KVM_UNIT_TESTS_ARCH)" \ + --processor="$(call qstrip,$(BR2_GCC_TARGET_CPU))" \ --endian="$(KVM_UNIT_TESTS_ENDIAN)" # For all architectures but x86-64, we use the target |
