From 85e1b39fcaa6eecd7905d5ec939e579ac988da3c Mon Sep 17 00:00:00 2001
From: chirag-silabs <100861685+chirag-silabs@users.noreply.github.com>
Date: Thu, 27 Apr 2023 01:04:50 +0530
Subject: [PATCH] [Silabs] [SiWx917] Addressing build failures on 917 SOC due
 to GCC update (#26266)

* addressing build failures on 917 SOC due to GCC update

* updating the matter support pointer
---
 examples/platform/silabs/SiWx917/BUILD.gn      | 3 +++
 src/platform/silabs/SiWx917/wifi/dhcp_client.h | 1 +
 src/platform/silabs/SiWx917/wifi/wfx_msgs.h    | 2 ++
 third_party/silabs/matter_support              | 2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/examples/platform/silabs/SiWx917/BUILD.gn b/examples/platform/silabs/SiWx917/BUILD.gn
index 7404436fbc90d8..ad3775845f3efa 100644
--- a/examples/platform/silabs/SiWx917/BUILD.gn
+++ b/examples/platform/silabs/SiWx917/BUILD.gn
@@ -186,6 +186,8 @@ config("siwx917-common-config") {
   if (siwx917_commissionable_data) {
     defines += [ "SIWX917_USE_COMISSIONABLE_DATA=1" ]
   }
+
+  ldflags = [ "-Wl,--no-warn-rwx-segment" ]
 }
 
 config("silabs-wifi-config") {
@@ -238,6 +240,7 @@ source_set("siwx917-common") {
   sources = [
     "${silabs_common_plat_dir}/LEDWidget.cpp",
     "${silabs_common_plat_dir}/heap_4_silabs.c",
+    "${silabs_common_plat_dir}/syscalls_stubs.cpp",
     "${wifi_sdk_dir}/dhcp_client.cpp",
     "${wifi_sdk_dir}/ethernetif.cpp",
     "${wifi_sdk_dir}/lwip_netif.cpp",
diff --git a/src/platform/silabs/SiWx917/wifi/dhcp_client.h b/src/platform/silabs/SiWx917/wifi/dhcp_client.h
index 4ee9d2f5d0d68d..d5a6bd903104bd 100644
--- a/src/platform/silabs/SiWx917/wifi/dhcp_client.h
+++ b/src/platform/silabs/SiWx917/wifi/dhcp_client.h
@@ -18,6 +18,7 @@
 #if LWIP_IPV4 && LWIP_DHCP
 
 #pragma once
+#include <stdint.h>
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/platform/silabs/SiWx917/wifi/wfx_msgs.h b/src/platform/silabs/SiWx917/wifi/wfx_msgs.h
index 44ff525a56a347..b87a7c070716a2 100644
--- a/src/platform/silabs/SiWx917/wifi/wfx_msgs.h
+++ b/src/platform/silabs/SiWx917/wifi/wfx_msgs.h
@@ -17,6 +17,8 @@
 
 #ifndef _WFX_MSGS_H_
 #define _WFX_MSGS_H_
+
+#include <stdint.h>
 /*
  * Taken from sl_wfx firmware - so I can re-use.
  * I need to do a better job than to use this stuff
diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
index 53c27ef4ed0cff..4d93227fc8679d 160000
--- a/third_party/silabs/matter_support
+++ b/third_party/silabs/matter_support
@@ -1 +1 @@
-Subproject commit 53c27ef4ed0cff01ad913b9e25d57ccb58cd49f4
+Subproject commit 4d93227fc8679d66f0dd8d408b114425ca73bc0c