Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 971297d2 authored by Jeremy Linton's avatar Jeremy Linton Committed by Greg Kroah-Hartman
Browse files

lib/raid6: Fix arm64 test build 



[ Upstream commit 313a06e636808387822af24c507cba92703568b1 ]

The lib/raid6/test fails to build the neon objects
on arm64 because the correct machine type is 'aarch64'.

Once this is correctly enabled, the neon recovery objects
need to be added to the build.

Reviewed-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarJeremy Linton <jeremy.linton@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e255a9e0

lib/raid6/test/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ ifeq ($(ARCH),arm) 
        CFLAGS += -I../../../arch/arm/include -mfpu=neon

        CFLAGS += -I../../../arch/arm/include -mfpu=neon

        HAS_NEON = yes

        HAS_NEON = yes

endif

endif

ifeq ($(ARCH),arm64)

ifeq ($(ARCH),aarch64)

        CFLAGS += -I../../../arch/arm64/include

        CFLAGS += -I../../../arch/arm64/include

        HAS_NEON = yes

        HAS_NEON = yes

endif

endif
@@ -37,7 +37,7 @@ ifeq ($(IS_X86),yes) 
                    gcc -c -x assembler - >&/dev/null &&	\

                    gcc -c -x assembler - >&/dev/null &&	\

                    rm ./-.o && echo -DCONFIG_AS_AVX2=1)

                    rm ./-.o && echo -DCONFIG_AS_AVX2=1)

else ifeq ($(HAS_NEON),yes)

else ifeq ($(HAS_NEON),yes)

        OBJS   += neon.o neon1.o neon2.o neon4.o neon8.o

        OBJS   += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o

        CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1

        CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1

else

else

        HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\

        HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\