ARMv7s and ARMv7

Signed-off-by: Goffredo Marocchi <goffredo.marocchi@gamesys.co.uk>