From 9240ef5536c439182b961d16798db04ba957b179 Mon Sep 17 00:00:00 2001 From: Masayuki Ishikawa Date: Tue, 17 Jul 2018 03:51:44 +0000 Subject: [PATCH] Merged in masayuki2009/nuttx.apps/fix_symtab_related (pull request #146) Fix symtab related * apps/tools: Add +x to mksymtab.sh Signed-off-by: Masayuki Ishikawa * apps/examples/nsh: Fix compile errors with CONFIG_EXAMPLES_NSH_SYMTAB=y Signed-off-by: Masayuki Ishikawa Approved-by: GregoryN --- examples/nsh/nsh_main.c | 4 ++-- tools/mksymtab.sh | 0 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 tools/mksymtab.sh diff --git a/examples/nsh/nsh_main.c b/examples/nsh/nsh_main.c index 1e8b9af6c..c45022019 100644 --- a/examples/nsh/nsh_main.c +++ b/examples/nsh/nsh_main.c @@ -194,8 +194,8 @@ int nsh_main(int argc, char *argv[]) symdesc.nsymbols = 0; #else /* if defined(CONFIG_EXAMPLES_NSH_SYMTAB) */ - symdesc.symtab = (FAR struct symtab_s *)g_exports; /* Discard 'const' */ - symdesc.nsymbols = g_nexports; + symdesc.symtab = (FAR struct symtab_s *)CONFIG_EXAMPLES_NSH_SYMTAB_ARRAYNAME; /* Discard 'const' */ + symdesc.nsymbols = CONFIG_EXAMPLES_NSH_SYMTAB_COUNTNAME; #endif (void)boardctl(BOARDIOC_APP_SYMTAB, (uintptr_t)&symdesc); diff --git a/tools/mksymtab.sh b/tools/mksymtab.sh old mode 100644 new mode 100755