Skip to content

native_simulator: Get latest from upstream #96869

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 6, 2025
Merged

native_simulator: Get latest from upstream #96869

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 ...s/native_simulator/common/src/nsi_tasks.h → ..._simulator/common/src/include/nsi_tasks.h
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion scripts/native_simulator/common/src/nce.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ NSI_INLINE int nce_sem_rewait(sem_t *semaphore)
{
int ret;

while ((ret = sem_wait(semaphore)) == EINTR) {
while (((ret = sem_wait(semaphore)) == -1) && (errno == EINTR)) {
/* Restart wait if we were interrupted */
}
return ret;
Expand Down
2 changes: 1 addition & 1 deletion scripts/native_simulator/common/src/nct.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ NSI_INLINE int nct_sem_rewait(sem_t *semaphore)
{
int ret;

while ((ret = sem_wait(semaphore)) == EINTR) {
while (((ret = sem_wait(semaphore)) == -1) && (errno == EINTR)) {
/* Restart wait if we were interrupted */
}
return ret;
Expand Down
7 changes: 3 additions & 4 deletions scripts/native_simulator/common/src/nsi_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#define NSI_COMMON_SRC_NSI_INTERNAL_H

#include <stdint.h>
#include "nsi_utils.h"

#ifdef __cplusplus
extern "C" {
Expand All @@ -23,8 +24,7 @@ extern "C" {
*
* @return least significant bit set, 0 if @a op is 0
*/

static inline unsigned int nsi_find_lsb_set(uint32_t op)
NSI_INLINE unsigned int nsi_find_lsb_set(uint32_t op)
{
return __builtin_ffs(op);
}
Expand All @@ -39,8 +39,7 @@ static inline unsigned int nsi_find_lsb_set(uint32_t op)
*
* @return least significant bit set, 0 if @a op is 0
*/

static inline unsigned int nsi_find_lsb_set64(uint64_t op)
NSI_INLINE unsigned int nsi_find_lsb_set64(uint64_t op)
{
return __builtin_ffsll(op);
}
Expand Down
Loading