From d6747dd6ad7d58ed88bf29cb4f834279606f28c5 Mon Sep 17 00:00:00 2001 From: chao an Date: Fri, 5 May 2023 11:36:58 +0800 Subject: [PATCH] libc/armv8-m: fix build break if MVE is disabled machine/arm/armv8-m/gnu/arch_memcpy.S: Assembler messages: machine/arm/armv8-m/gnu/arch_memcpy.S:105: Error: bad instruction `prologue push_ip=HAVE_PAC_LEAF' machine/arm/armv8-m/gnu/arch_memcpy.S:121: Error: bad instruction `epilogue push_ip=HAVE_PAC_LEAF' make[1]: *** [Makefile:143: bin/arch_memcpy.o] Error Signed-off-by: chao an --- libs/libc/machine/arm/armv8-m/gnu/arch_memcpy.S | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/libc/machine/arm/armv8-m/gnu/arch_memcpy.S b/libs/libc/machine/arm/armv8-m/gnu/arch_memcpy.S index ae35a8b1f0..161072e212 100644 --- a/libs/libc/machine/arm/armv8-m/gnu/arch_memcpy.S +++ b/libs/libc/machine/arm/armv8-m/gnu/arch_memcpy.S @@ -29,7 +29,6 @@ * ****************************************************************************/ -#ifndef __ARM_FEATURE_MVE /* This memcpy routine is optimised for Cortex-M3/M4 cores with/without unaligned access. @@ -50,8 +49,11 @@ __OPT_BIG_BLOCK_SIZE: Size of big block in words. Default to 64. __OPT_MID_BLOCK_SIZE: Size of big block in words. Default to 16. */ + #include "arm_asm.h" +#ifndef __ARM_FEATURE_MVE + #ifndef __OPT_BIG_BLOCK_SIZE #define __OPT_BIG_BLOCK_SIZE (4 * 16) #endif