mirror of
https://github.com/apache/nuttx.git
synced 2026-06-05 07:12:54 +08:00
Squashed commit of the following:
binfmt/, libs/libc/unistd, and others: Rename CONFIG_EXECFUNCS_SYMTAB to CONFIG_EXECFUNCS_SYMTAB_ARRAY. Rename CONFIG_EXECFUNCS_NSYMBOLS to CONFIG_EXECFUNCS_NSYMBOLS_VAR. Unlike CONFIG_EXECFUNCS_NSYMBOLS, CONFIG_EXECFUNCS_NSYMBOLS_VAR holds the name of an 'int' variable that contains the number of symbols in the symbol table.
configs/sama5d4-ek: Partial update to knsh build instructions.
This commit is contained in:
@@ -57,14 +57,14 @@
|
||||
#ifdef CONFIG_EXECFUNCS_HAVE_SYMTAB
|
||||
/* Symbol table used by exec[l|v] */
|
||||
|
||||
# ifndef CONFIG_EXECFUNCS_SYMTAB
|
||||
# error "CONFIG_EXECFUNCS_SYMTAB must be defined"
|
||||
# ifndef CONFIG_EXECFUNCS_SYMTAB_ARRAY
|
||||
# error "CONFIG_EXECFUNCS_SYMTAB_ARRAY must be defined"
|
||||
# endif
|
||||
|
||||
/* Number of Symbols in the Table */
|
||||
|
||||
# ifndef CONFIG_EXECFUNCS_NSYMBOLS
|
||||
# error "CONFIG_EXECFUNCS_NSYMBOLS must be defined"
|
||||
# ifndef CONFIG_EXECFUNCS_NSYBOLS_VAR
|
||||
# error "CONFIG_EXECFUNCS_NSYBOLS_VAR must be defined"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
@@ -73,7 +73,8 @@
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef CONFIG_EXECFUNCS_HAVE_SYMTAB
|
||||
extern const struct symtab_s CONFIG_EXECFUNCS_SYMTAB;
|
||||
extern const struct symtab_s CONFIG_EXECFUNCS_SYMTAB_ARRAY[];
|
||||
extern int CONFIG_EXECFUNCS_NSYBOLS_VAR;
|
||||
#endif
|
||||
|
||||
/****************************************************************************
|
||||
@@ -81,8 +82,8 @@ extern const struct symtab_s CONFIG_EXECFUNCS_SYMTAB;
|
||||
****************************************************************************/
|
||||
|
||||
#ifdef CONFIG_EXECFUNCS_HAVE_SYMTAB
|
||||
static FAR const struct symtab_s *g_exec_symtab = &CONFIG_EXECFUNCS_SYMTAB;
|
||||
static int g_exec_nsymbols = CONFIG_EXECFUNCS_NSYMBOLS;
|
||||
static FAR const struct symtab_s *g_exec_symtab = CONFIG_EXECFUNCS_SYMTAB_ARRAY;
|
||||
static int g_exec_nsymbols = CONFIG_EXECFUNCS_NSYBOLS_VAR;
|
||||
#else
|
||||
static FAR const struct symtab_s *g_exec_symtab;
|
||||
static int g_exec_nsymbols;
|
||||
|
||||
Reference in New Issue
Block a user