From f7d79148b7fd3c4942650ae3d619ff5ba5b9722b Mon Sep 17 00:00:00 2001
From: Dmytro Kosmii <dmytro.kosmii@telink-semi.com>
Date: Fri, 8 Jul 2022 15:37:22 +0300
Subject: [PATCH 1/2] Use rv32i substring as RISC-V architecture selector.

Signed-off-by: Dmytro Kosmii <dmytro.kosmii@telink-semi.com>
Change-Id: Ie5b0b2be987f112bc150ec817080b59a332cbac1
---
 arch/BUILD.gn | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/BUILD.gn b/arch/BUILD.gn
index b027c2e1..9ce96c2d 100644
--- a/arch/BUILD.gn
+++ b/arch/BUILD.gn
@@ -43,7 +43,7 @@ module_group("arch") {
              "$board_cpu" == "ck804ef") {
     modules += [ "csky" ]
   } else if ("$board_cpu" == "") {
-    if ("$board_arch" == "rv32imac" || "$board_arch" == "rv32imafdc") {
+    if ("$board_arch" != string_replace("$board_arch", "rv32i", "")) {
       modules += [ "risc-v" ]
     } else if ("$board" == "esp32") {
       modules += [ "xtensa" ]

From 3a190a1a1be010ce44f1a5484afd8501a4553da9 Mon Sep 17 00:00:00 2001
From: Dmytro Kosmii <dmytro.kosmii@telink-semi.com>
Date: Tue, 12 Jul 2022 19:45:07 +0300
Subject: [PATCH 2/2] Added missed includes.

Signed-off-by: Dmytro Kosmii <dmytro.kosmii@telink-semi.com>
Change-Id: I172a68a1ad6ca194399a6d47d46c54ebcfbd9338
---
 arch/risc-v/riscv32/gcc/los_arch_interrupt.h | 1 +
 kal/posix/src/pthread.c                      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/arch/risc-v/riscv32/gcc/los_arch_interrupt.h b/arch/risc-v/riscv32/gcc/los_arch_interrupt.h
index 2bfbb1ef..b332222b 100644
--- a/arch/risc-v/riscv32/gcc/los_arch_interrupt.h
+++ b/arch/risc-v/riscv32/gcc/los_arch_interrupt.h
@@ -35,6 +35,7 @@
 #include "los_config.h"
 #include "los_interrupt.h"
 #include "los_arch_context.h"
+#include "los_error.h"
 
 #ifdef __cplusplus
 #if __cplusplus
diff --git a/kal/posix/src/pthread.c b/kal/posix/src/pthread.c
index 9daae03b..5865d38a 100644
--- a/kal/posix/src/pthread.c
+++ b/kal/posix/src/pthread.c
@@ -36,6 +36,7 @@
 #include <securec.h>
 #include <limits.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include "los_config.h"
 #include "los_task.h"
 #include "los_debug.h"