| Message ID | 20181106001441.42934-1-jeremy.linton@arm.com |
|---|---|
| State | Accepted |
| Commit | 313a06e636808387822af24c507cba92703568b1 |
| Headers | show |
| Series | lib/raid6: Fix arm64 test build | expand |
(+ Catalin, Will) On 6 November 2018 at 01:14, Jeremy Linton <jeremy.linton@arm.com> wrote: > 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. > > Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> > --- > lib/raid6/test/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/lib/raid6/test/Makefile b/lib/raid6/test/Makefile > index 5d73f5cb4d8a..79777645cac9 100644 > --- a/lib/raid6/test/Makefile > +++ b/lib/raid6/test/Makefile > @@ -27,7 +27,7 @@ ifeq ($(ARCH),arm) > CFLAGS += -I../../../arch/arm/include -mfpu=neon > HAS_NEON = yes > endif > -ifeq ($(ARCH),arm64) > +ifeq ($(ARCH),aarch64) > CFLAGS += -I../../../arch/arm64/include > HAS_NEON = yes > endif > @@ -41,7 +41,7 @@ ifeq ($(IS_X86),yes) > gcc -c -x assembler - >&/dev/null && \ > rm ./-.o && echo -DCONFIG_AS_AVX512=1) > 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 > else > HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\ > -- > 2.17.2 >
On Tue, Nov 06, 2018 at 09:16:04AM +0100, Ard Biesheuvel wrote: > (+ Catalin, Will) > > On 6 November 2018 at 01:14, Jeremy Linton <jeremy.linton@arm.com> wrote: > > 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. > > > > Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> > > Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> I can pick this up for 4.20-rc2 (I can't find a maintainers entry for this Makefile). -- Catalin
diff --git a/lib/raid6/test/Makefile b/lib/raid6/test/Makefile index 5d73f5cb4d8a..79777645cac9 100644 --- a/lib/raid6/test/Makefile +++ b/lib/raid6/test/Makefile @@ -27,7 +27,7 @@ ifeq ($(ARCH),arm) CFLAGS += -I../../../arch/arm/include -mfpu=neon HAS_NEON = yes endif -ifeq ($(ARCH),arm64) +ifeq ($(ARCH),aarch64) CFLAGS += -I../../../arch/arm64/include HAS_NEON = yes endif @@ -41,7 +41,7 @@ ifeq ($(IS_X86),yes) gcc -c -x assembler - >&/dev/null && \ rm ./-.o && echo -DCONFIG_AS_AVX512=1) 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 else HAS_ALTIVEC := $(shell printf '\#include <altivec.h>\nvector int a;\n' |\
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. Signed-off-by: Jeremy Linton <jeremy.linton@arm.com> --- lib/raid6/test/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.17.2