apache/nuttx-apps
1
0
Fork 0
mirror of https://github.com/apache/nuttx-apps.git synced 2025-10-17 07:12:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Squashed commit of the following:"

Browse Source 
This reverts commit 25b92edd9f.
This commit is contained in:
Gregory Nutt
2018-08-22 12:06:32 -06:00
parent cd62ab5398
commit 2f982e9c77
326 changed files with 569 additions and 561 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/module/Kconfig
View File

@@ -128,7 +128,7 @@ config EXAMPLES_MODULE_NOSTRIP
config EXAMPLES_MODULE_LIBC
bool "Link with LIBC"
default n
depends on !BUILD_LOADABLE && EXPERIMENTAL
depends on !BUILD_KERNEL && EXPERIMENTAL
---help---
Link with the C library (and also math library if it was built).
By default, all undefined symbols must be provided via a symbol
@@ -147,6 +147,6 @@ config EXAMPLES_MODULE_LIBC
config EXAMPLES_MODULE_LIBGCC
bool "Link with LIBGCC"
default n
depends on !BUILD_LOADABLE && EXPERIMENTAL
depends on !BUILD_KERNEL && EXPERIMENTAL
endif

6
examples/module/Makefile
View File

@@ -64,7 +64,7 @@ MAINOBJ = $(MAINSRC:.c=$(OBJEXT))
SRCS = $(ASRCS) $(CSRCS) $(MAINSRC)
OBJS = $(AOBJS) $(COBJS)
ifneq ($(CONFIG_BUILD_LOADABLE),y)
ifneq ($(CONFIG_BUILD_KERNEL),y)
OBJS += $(MAINOBJ)
endif
@@ -116,7 +116,7 @@ really_build: $(OBJS)
@$(MAKE) -C drivers TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" CROSSDEV=$(CROSSDEV)
@$(MAKE) TOPDIR="$(TOPDIR)" APPDIR="$(APPDIR)" really_build
ifeq ($(CONFIG_BUILD_LOADABLE),y)
ifeq ($(CONFIG_BUILD_KERNEL),y)
$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ)
@echo "LD: $(PROGNAME)"
$(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS)
@@ -131,7 +131,7 @@ endif
ifeq ($(CONFIG_NSH_BUILTIN_APPS),y)
$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(if $(CONFIG_BUILD_LOADABLE),,$(APPNAME)_main))
$(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main)
context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat
else

2
examples/module/module_main.c
View File

@@ -147,7 +147,7 @@ extern const int g_mod_nexports;
* Name: module_main
****************************************************************************/
#ifdef CONFIG_BUILD_LOADABLE
#ifdef CONFIG_BUILD_KERNEL
int main(int argc, FAR char *argv[])
#else
int module_main(int argc, char *argv[])