From 8e717f41426df720dc5211801441a6a7efc8c71a Mon Sep 17 00:00:00 2001
From: ccrause <christo.crause@gmail.com>
Date: Sat, 18 May 2024 15:30:36 +0200
Subject: [PATCH] Add support for esp-idf v4.4

---
 compiler/pmodules.pas                    |  7 +++-
 rtl/freertos/Makefile                    |  2 +-
 rtl/freertos/Makefile.fpc                |  2 +-
 rtl/freertos/riscv32/esp32c3idf_40400.pp | 49 ++++++++++++++++++++++++
 4 files changed, 57 insertions(+), 3 deletions(-)
 create mode 100644 rtl/freertos/riscv32/esp32c3idf_40400.pp

diff --git a/compiler/pmodules.pas b/compiler/pmodules.pas
index 32355c7219..bf321ae461 100644
--- a/compiler/pmodules.pas
+++ b/compiler/pmodules.pas
@@ -525,7 +525,12 @@ implementation
         if not(curr.is_unit) and (target_info.system=system_riscv32_freertos) then
           if (current_settings.controllertype=ct_esp32c3) then
             begin
-              CheckAddUnit('esp32c3idf_50000')
+              if idf_version>=50000 then
+                CheckAddUnit('esp32c3idf_50000')
+              else if idf_version>=40400 then
+                CheckAddUnit('esp32c3idf_40400')
+              else
+                Comment(V_Warning, 'Unsupported esp-idf version');
             end;
 {$endif XTENSA}
       end;
diff --git a/rtl/freertos/Makefile b/rtl/freertos/Makefile
index e456158bc9..7420bf1a3d 100644
--- a/rtl/freertos/Makefile
+++ b/rtl/freertos/Makefile
@@ -922,7 +922,7 @@ ifeq ($(ARCH),riscv32)
 CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
 ifeq ($(SUBARCH),rv32imc)
 override FPCOPT+=-Cprv32imc
-CPU_UNITS=esp32c3 esp32c3idf_50000
+CPU_UNITS=esp32c3 esp32c3idf_40400 esp32c3idf_50000
 CPU_UNITS_DEFINED=1
 endif
 ifeq ($(CPU_UNITS_DEFINED),)
diff --git a/rtl/freertos/Makefile.fpc b/rtl/freertos/Makefile.fpc
index ce86d63de4..d3f07c0588 100644
--- a/rtl/freertos/Makefile.fpc
+++ b/rtl/freertos/Makefile.fpc
@@ -82,7 +82,7 @@ ifeq ($(ARCH),riscv32)
 CPU_SPECIFIC_COMMON_UNITS=$(SYSUTILSUNIT) $(MATHUNIT) $(CLASSESUNIT) $(FGLUNIT) $(MACPASUNIT) $(TYPINFOUNIT) $(TYPESUNIT) $(RTLCONSTSUNIT) $(GETOPTSUNIT) $(LINEINFOUNIT)
 ifeq ($(SUBARCH),rv32imc)
 override FPCOPT+=-Cprv32imc
-CPU_UNITS=esp32c3 esp32c3idf_50000
+CPU_UNITS=esp32c3 esp32c3idf_40400 esp32c3idf_50000
 CPU_UNITS_DEFINED=1
 endif
 ifeq ($(CPU_UNITS_DEFINED),)
diff --git a/rtl/freertos/riscv32/esp32c3idf_40400.pp b/rtl/freertos/riscv32/esp32c3idf_40400.pp
new file mode 100644
index 0000000000..c95479b7bb
--- /dev/null
+++ b/rtl/freertos/riscv32/esp32c3idf_40400.pp
@@ -0,0 +1,49 @@
+{
+    This file is part of the Free Pascal run time library.
+    Copyright (c) 2021 by Florian Klaempfl
+    member of the Free Pascal development team.
+
+    System unit for FreeRTOS systems
+
+    See the file COPYING.FPC, included in this distribution,
+    for details about the copyright.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+ **********************************************************************}
+{$IFNDEF FPC_DOTTEDUNITS}
+unit esp32c3idf_40400;
+{$ENDIF FPC_DOTTEDUNITS}
+
+interface
+
+{$linklib app_update,static}
+{$linklib bootloader_support,static}
+{$linklib driver,static}
+{$linklib efuse,static}
+{$linklib esp_common,static}
+{$linklib esp_hw_support,static}
+{$linklib esp_pm,static}
+{$linklib esp_ringbuf,static}
+{$linklib esp_rom,static}
+{$linklib esp_system,static}
+{$linklib esp_timer,static}
+{$linklib freertos,static}
+{$linklib hal,static}
+{$linklib heap,static}
+{$linklib log,static}
+{$linklib newlib,static}
+{$linklib pthread,static}
+{$linklib riscv,static}
+{$linklib soc,static}
+{$linklib spi_flash,static}
+{$linklib vfs,static}
+{$linklib c,static}
+{$linklib m,static}
+{$linklib gcc,static}
+
+implementation
+
+end.