From 71db6550cd5511ad9814477409fc47c237cf9efd Mon Sep 17 00:00:00 2001
From: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
Date: Mon, 20 Nov 2023 11:39:12 +0100
Subject: [PATCH] native simulator: Get latest from upstream

Align with native_simulator's upstream main
7d652dbfb313260cf07d595ccf26638f2b3c2959

Which includes:
* 7d652db Provide macros for noreturn and unreachable & annotate

Signed-off-by: Alberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
---
 scripts/native_simulator/common/src/include/nsi_main.h  | 4 +++-
 scripts/native_simulator/common/src/include/nsi_utils.h | 4 ++++
 scripts/native_simulator/common/src/main.c              | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/scripts/native_simulator/common/src/include/nsi_main.h b/scripts/native_simulator/common/src/include/nsi_main.h
index 83ba8cac433..33508edb7fe 100644
--- a/scripts/native_simulator/common/src/include/nsi_main.h
+++ b/scripts/native_simulator/common/src/include/nsi_main.h
@@ -7,6 +7,8 @@
 #ifndef NSI_COMMON_SRC_INCL_NSI_MAIN_H
 #define NSI_COMMON_SRC_INCL_NSI_MAIN_H
 
+#include "nsi_utils.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -31,7 +33,7 @@ int nsi_exit_inner(int exit_code);
  *            Note that other components may have requested a different
  *            exit code which may have precedence if it was !=0
  */
-void nsi_exit(int exit_code);
+NSI_FUNC_NORETURN void nsi_exit(int exit_code);
 
 #ifdef __cplusplus
 }
diff --git a/scripts/native_simulator/common/src/include/nsi_utils.h b/scripts/native_simulator/common/src/include/nsi_utils.h
index f41fdf9ddc8..996ad635409 100644
--- a/scripts/native_simulator/common/src/include/nsi_utils.h
+++ b/scripts/native_simulator/common/src/include/nsi_utils.h
@@ -25,4 +25,8 @@
 #define NSI_ARG_UNUSED(x) (void)(x)
 #endif
 
+#define NSI_CODE_UNREACHABLE __builtin_unreachable()
+
+#define NSI_FUNC_NORETURN __attribute__((__noreturn__))
+
 #endif /* NSI_COMMON_SRC_INCL_NSI_UTILS_H */
diff --git a/scripts/native_simulator/common/src/main.c b/scripts/native_simulator/common/src/main.c
index ffe1d3b93d1..b9d97c91748 100644
--- a/scripts/native_simulator/common/src/main.c
+++ b/scripts/native_simulator/common/src/main.c
@@ -44,7 +44,7 @@ int nsi_exit_inner(int exit_code)
 	return max_exit_code;
 }
 
-void nsi_exit(int exit_code)
+NSI_FUNC_NORETURN void nsi_exit(int exit_code)
 {
 	exit(nsi_exit_inner(exit_code));
 }