From 176a1b3dadf08835b9435bed4957daa066702a39 Mon Sep 17 00:00:00 2001 From: Alexandre Belloni Date: Thu, 19 Mar 2015 21:14:40 +0100 Subject: ARM: at91: fix pm_suspend.S compilation when ARMv6 is selected When compiling for multiplatform for both ARMv6 and ARMv7, the default compiler flags are for ARMv6, and results in: arch/arm/mach-at91/pm_suspend.S:144: Error: selected processor does not support ARM mode `dsb' Enforce ARMv7 flags for pm_suspend.o when CPU_V7 is selected. Reported-by: kbuild test robot Signed-off-by: Alexandre Belloni Signed-off-by: Nicolas Ferre --- arch/arm/mach-at91/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index ea54c9824d89..12440ec60924 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -15,6 +15,9 @@ obj-$(CONFIG_SOC_SAMA5) += sama5.o obj-$(CONFIG_PM) += pm.o obj-$(CONFIG_PM) += pm_suspend.o +ifeq ($(CONFIG_CPU_V7),y) +AFLAGS_pm_suspend.o := -march=armv7-a +endif ifeq ($(CONFIG_PM_DEBUG),y) CFLAGS_pm.o += -DDEBUG endif -- cgit v1.2.3