]> git.karo-electronics.de Git - karo-tx-linux.git/commit
ARM: pxa: fix building without IWMMXT
authorArnd Bergmann <arnd@arndb.de>
Fri, 29 Jan 2016 14:06:31 +0000 (15:06 +0100)
committerRobert Jarzmik <robert.jarzmik@free.fr>
Mon, 1 Feb 2016 20:44:29 +0000 (21:44 +0100)
commit343c1cdbc81c0c7bef05380b10e5c880faf8fb4c
tree95ecdd48e17d9dad6739b8393cddc0e6bfa19b6a
parenta9a54caed96561d01f1d923df61bd11b71df4b93
ARM: pxa: fix building without IWMMXT

When CONFIG_IWMMXT, the pxa3xx and pxa27x suspend/resume code
emits some xscale specific instructions, which are rejected
by the assembler, because gcc is built with -march=armv5
-mtune=xscale and passes that option to the assembler:

/tmp/cciHumzr.s:553: Error: selected processor does not support ARM mode `mra r2,r3,acc0'
/tmp/cciHumzr.s:605: Error: selected processor does not support ARM mode `mar acc0,r2,r3'
make[3]: *** [arch/arm/mach-pxa/pxa3xx.o] Error 1
/tmp/cci5MUNu.s:326: Error: selected processor does not support ARM mode `mra r2,r3,acc0'
/tmp/cci5MUNu.s:367: Error: selected processor does not support ARM mode `mar acc0,r2,r3'
make[3]: *** [arch/arm/mach-pxa/pxa27x.o] Error 1

Overriding with -Wa,-march=xscale no longer works, so instead
I'm adding an explict ".arch_extension" directive in all four inline
assembly statements, which should work even if they end up in a different
order in the assembly output.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>
arch/arm/mach-pxa/pxa27x.c
arch/arm/mach-pxa/pxa3xx.c