[CRIU] [RFC 06/11] Default to ARMv7

[Alexander Kartashov]

On 02/07/2014 09:04 PM, Christopher Covington wrote:
> The current mechanism for determining ARM architecture version
> breaks down when cross-compiling. Default to ARMv7 if the user
> specifies ARCH=arm. Users wishing to cross-compile for ARMv6
> platforms such as the Raspberry Pi should use ARCH=armv6 as
> previously required.
> ---
>   Makefile | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 9fc3c99..480c6d0 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -53,7 +53,7 @@ ifeq ($(ARCH),x86_64)
>   endif
>   
>   ifeq ($(shell echo $(ARCH) | sed -e 's/arm.*/arm/'),arm)
> -	ARMV         := $(shell echo $(ARCH) | sed -r -e 's/armv([[:digit:]]).*/\1/')
> +	ARMV         := $(shell echo $(ARCH) | sed -nr 's/armv([[:digit:]]).*/\1/p; t; i7')
>   	SRCARCH      := arm
>   	DEFINES      := -DCONFIG_ARM -DCONFIG_ARMV$(ARMV)
>   
Acked-by: Alexander Kartashov <alekskartashov at parallels.com>

-- 
Sincerely yours,
Alexander Kartashov

Intern
Core team

www.parallels.com

Skype: aleksandr.kartashov
Email: alekskartashov at parallels.com