You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2022/03/07 15:58:57 UTC
[incubator-nuttx] branch master updated: sim/syscall: add syscall note support in the flat build
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new a14ed02 sim/syscall: add syscall note support in the flat build
a14ed02 is described below
commit a14ed025718949c487635b92558016d4954b6048
Author: chao.an <an...@xiaomi.com>
AuthorDate: Mon Mar 7 20:08:12 2022 +0800
sim/syscall: add syscall note support in the flat build
Signed-off-by: chao.an <an...@xiaomi.com>
---
arch/Kconfig | 1 +
arch/sim/include/syscall.h | 2 ++
arch/sim/src/Makefile | 10 +++++++++-
3 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/arch/Kconfig b/arch/Kconfig
index 89aeacc..3ecda33 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 931ddff..b043720 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 21c8715..e9bed7e 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 | \