From 3564ce8b030428153a53003d6be79729463fa63b Mon Sep 17 00:00:00 2001
From: cnlohr <lohr85@gmail.com>
Date: Tue, 13 Feb 2024 05:51:22 -0500
Subject: [PATCH] Use host GCC for non-003 devs.

---
 ch32v003fun/ch32v003fun.mk | 3 ++-
 ch32v003fun/ch32v10xfun.mk | 1 +
 ch32v003fun/ch32v20xfun.mk | 1 +
 ch32v003fun/ch32v30xfun.mk | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ch32v003fun/ch32v003fun.mk b/ch32v003fun/ch32v003fun.mk
index b8a7690..fc382a3 100644
--- a/ch32v003fun/ch32v003fun.mk
+++ b/ch32v003fun/ch32v003fun.mk
@@ -33,6 +33,7 @@ ifeq ($(TARGET_MCU),CH32V003)
 	GENERATED_LD_FILE?=$(CH32V003FUN)/generated_ch32v003.ld
 	TARGET_MCU_LD:=0
 	LINKER_SCRIPT?=$(GENERATED_LD_FILE)
+	LDFLAGS+=-L$(CH32V003FUN)/../misc -lgcc
 else
 	ifeq ($(findstring CH32V10,$(TARGET_MCU)),CH32V10)
 		include $(CH32V003FUN)/ch32v10xfun.mk
@@ -45,7 +46,7 @@ else
 	endif
 endif
 
-LDFLAGS+=-T $(LINKER_SCRIPT) -Wl,--gc-sections -L$(CH32V003FUN)/../misc -lgcc
+LDFLAGS+=-T $(LINKER_SCRIPT) -Wl,--gc-sections
 
 ifeq ($(TARGET_MCU), CH32V003)
 
diff --git a/ch32v003fun/ch32v10xfun.mk b/ch32v003fun/ch32v10xfun.mk
index b5a073a..94bf13b 100644
--- a/ch32v003fun/ch32v10xfun.mk
+++ b/ch32v003fun/ch32v10xfun.mk
@@ -26,6 +26,7 @@ else ifeq ($(findstring C6, $(TARGET_MCU_PACKAGE)), C6)
 endif
 
 TARGET_MCU_LD:=1
+LDFLAGS+=-lgcc
 
 GENERATED_LD_FILE:=$(CH32V003FUN)/generated_$(TARGET_MCU_PACKAGE).ld
 LINKER_SCRIPT:=$(GENERATED_LD_FILE)
diff --git a/ch32v003fun/ch32v20xfun.mk b/ch32v003fun/ch32v20xfun.mk
index eb9e8fe..012dcc9 100644
--- a/ch32v003fun/ch32v20xfun.mk
+++ b/ch32v003fun/ch32v20xfun.mk
@@ -53,6 +53,7 @@ else
 endif
 
 TARGET_MCU_LD:=2
+LDFLAGS+=-lgcc
 
 GENERATED_LD_FILE:=$(CH32V003FUN)/generated_$(TARGET_MCU_PACKAGE).ld
 LINKER_SCRIPT:=$(GENERATED_LD_FILE)
diff --git a/ch32v003fun/ch32v30xfun.mk b/ch32v003fun/ch32v30xfun.mk
index 0b1600c..eeab434 100644
--- a/ch32v003fun/ch32v30xfun.mk
+++ b/ch32v003fun/ch32v30xfun.mk
@@ -39,6 +39,7 @@ else
 endif
 
 TARGET_MCU_LD:=3
+LDFLAGS+=-lgcc
 
 GENERATED_LD_FILE:=$(CH32V003FUN)/generated_$(TARGET_MCU_PACKAGE).ld
 LINKER_SCRIPT:=$(GENERATED_LD_FILE)
-- 
GitLab