From a487143e9d09757ef2613fee10440f5dc00bfb36 Mon Sep 17 00:00:00 2001
From: Huaqi Fang <578567190@qq.com>
Date: Tue, 11 Jun 2024 14:39:30 +0800
Subject: [PATCH] build: use -mstringop-strategy=scalar to replace
 -mmemcpy-strategy=scalar

Signed-off-by: Huaqi Fang <578567190@qq.com>
---
 Build/toolchain/nuclei_gnu.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Build/toolchain/nuclei_gnu.mk b/Build/toolchain/nuclei_gnu.mk
index 08af1583..e64c58d0 100644
--- a/Build/toolchain/nuclei_gnu.mk
+++ b/Build/toolchain/nuclei_gnu.mk
@@ -130,10 +130,11 @@ COMMON_FLAGS += -fomit-frame-pointer -fno-shrink-wrap-separate
 endif
 
 # TODO Workaround: when v extension is enabled, disable memcpy generated using vector instruction
-# upstream just remove this -mmemcpy-strategy option, will remove it later
+# upstream just rename this -mmemcpy-strategy option to -mstringop-strategy option now
+# see https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=4ae5a7336ac8e1ba57ee1e885b5b76ed86cdbfd5
 ifneq ($(findstring v,$(ARCH_EXT)),)
 #COMMON_FLAGS += -mmemcpy-strategy=scalar
-#COMMON_FLAGS += -mstringop-strategy=scalar
+COMMON_FLAGS += -mstringop-strategy=scalar
 endif
 
 LDFLAGS += -nodefaultlibs