diff --git a/arch/Kconfig b/arch/Kconfig index 89aeaccc558..3ecda330a46 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -77,6 +77,7 @@ config ARCH_SIM select ARCH_HAVE_MULTICPU select ARCH_HAVE_RTC_SUBSECONDS select ARCH_HAVE_SERIAL_TERMIOS + select ARCH_HAVE_SYSCALL_HOOKS select ARCH_HAVE_TICKLESS select ARCH_HAVE_POWEROFF select ARCH_HAVE_TESTSET diff --git a/arch/sim/include/syscall.h b/arch/sim/include/syscall.h index 931ddffa250..b0437201803 100644 --- a/arch/sim/include/syscall.h +++ b/arch/sim/include/syscall.h @@ -33,6 +33,8 @@ * Pre-processor Definitions ****************************************************************************/ +#define CONFIG_SYS_RESERVED 0 + /**************************************************************************** * Public Types ****************************************************************************/ diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile index 21c871553f9..e9bed7e1f31 100644 --- a/arch/sim/src/Makefile +++ b/arch/sim/src/Makefile @@ -227,6 +227,13 @@ ifneq ($(CONFIG_HOST_MACOS),y) LDSTARTGROUP ?= --start-group LDENDGROUP ?= --end-group endif + +# Additional rules for system call wrapper + +ifeq ($(CONFIG_SCHED_INSTRUMENTATION_SYSCALL),y) + EXTRALINKCMDS += @$(TOPDIR)/syscall/syscall_wraps.ldcmd +endif + LDFLAGS += $(addprefix -T,$(call CONVERT_PATH,$(ARCHSCRIPT))) # Determine which NuttX libraries will need to be linked in @@ -293,7 +300,8 @@ nuttx-names.dat: nuttx-names.in # necessary for macOS. nuttx$(EXEEXT): libarch$(LIBEXT) board/libboard$(LIBEXT) $(HEADOBJ) $(LINKOBJS) $(HOSTOBJS) nuttx-names.dat $(Q) echo "LD: nuttx$(EXEEXT)" - $(Q) $(LD) -r $(LDLINKFLAGS) $(RELPATHS) $(EXTRA_LIBPATHS) -o nuttx.rel $(REQUIREDOBJS) $(LDSTARTGROUP) $(RELLIBS) $(EXTRA_LIBS) $(LDENDGROUP) + $(Q) $(LD) -r $(LDLINKFLAGS) $(RELPATHS) $(EXTRA_LIBPATHS) $(EXTRALINKCMDS) \ + -o nuttx.rel $(REQUIREDOBJS) $(LDSTARTGROUP) $(RELLIBS) $(EXTRA_LIBS) $(LDENDGROUP) ifneq ($(CONFIG_HOST_MACOS),y) $(Q) $(OBJCOPY) --redefine-syms=nuttx-names.dat nuttx.rel $(Q) $(CC) $(CFLAGS) -Wl,-verbose 2>&1 | \