Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-04 06:42:32 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

binfmt/, binfmt/libelf/, include/nuttx, libs/libc/machine, libs/libc/modlib, and others: Move elf related arch function to include/nuttx/elf.h because the implementation is located in libs/libc/machine and in order to avoid the conflict with the 3rd party libraries and clean up the file inclusion: (1) Remove redundant elf32.h, (2) Remove nuttx/binfmt/elf.h in libs/libc/machine, (2) Remove nuttx/binfmt/elf.h in modlib, and (4) Rmove nuttx/module.h in modlib.

Browse Source
This commit is contained in:
Xiang Xiao
2019-01-26 11:18:45 -06:00
committed by Gregory Nutt
parent 763ba51b78
commit 095e28d45e
37 changed files with 33 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libs/libc/machine/arm/arm/arch_elf.c
+1 -3
View File
@@ -40,13 +40,11 @@
#include <nuttx/config.h>
#include <stdlib.h>
#include <elf32.h>
#include <errno.h>
#include <debug.h>
#include <arch/elf.h>
#include <nuttx/arch.h>
#include <nuttx/binfmt/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
* Pre-processor Definitions
libs/libc/machine/arm/armv6-m/arch_elf.c
+1 -3
View File
@@ -40,13 +40,11 @@
#include <nuttx/config.h>
#include <stdlib.h>
#include <elf32.h>
#include <errno.h>
#include <debug.h>
#include <arch/elf.h>
#include <nuttx/arch.h>
#include <nuttx/binfmt/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
* Pre-processor Definitions
libs/libc/machine/arm/armv7-a/arch_elf.c
+1 -3
View File
@@ -40,13 +40,11 @@
#include <nuttx/config.h>
#include <stdlib.h>
#include <elf32.h>
#include <errno.h>
#include <debug.h>
#include <arch/elf.h>
#include <nuttx/arch.h>
#include <nuttx/binfmt/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
* Public Functions
libs/libc/machine/arm/armv7-m/arch_elf.c
+1 -3
View File
@@ -40,13 +40,11 @@
#include <nuttx/config.h>
#include <stdlib.h>
#include <elf32.h>
#include <errno.h>
#include <debug.h>
#include <arch/elf.h>
#include <nuttx/arch.h>
#include <nuttx/binfmt/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
* Public Function Prototypes
libs/libc/machine/arm/armv7-r/arch_elf.c
+1 -3
View File
@@ -40,13 +40,11 @@
#include <nuttx/config.h>
#include <stdlib.h>
#include <elf32.h>
#include <errno.h>
#include <debug.h>
#include <arch/elf.h>
#include <nuttx/arch.h>
#include <nuttx/binfmt/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
* Pre-processor Definitions
libs/libc/machine/sim/arch_elf.c
+1 -3
View File
@@ -40,12 +40,10 @@
#include <nuttx/config.h>
#include <stdlib.h>
#include <elf32.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/binfmt/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
* Pre-processor Definitions
libs/libc/machine/x86/arch_elf.c
+1 -3
View File
@@ -40,12 +40,10 @@
#include <nuttx/config.h>
#include <stdlib.h>
#include <elf32.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/binfmt/elf.h>
#include <nuttx/elf.h>
/****************************************************************************
* Pre-processor Definitions
libs/libc/modlib/modlib.h
+2 -3
View File
@@ -43,10 +43,9 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <elf32.h>
#include <nuttx/arch.h>
#include <nuttx/module.h>
#include <nuttx/lib/modlib.h>
/****************************************************************************
* Public Function Prototypes
@@ -85,7 +84,7 @@ int modlib_findsymtab(FAR struct mod_loadinfo_s *loadinfo);
* Name: modlib_readsym
*
* Description:
* Read the ELFT symbol structure at the specfied index into memory.
* Read the ELF symbol structure at the specified index into memory.
*
* Input Parameters:
* loadinfo - Load state information
libs/libc/modlib/modlib_bind.c
+1 -3
View File
@@ -41,14 +41,12 @@
#include <stdint.h>
#include <string.h>
#include <elf32.h>
#include <errno.h>
#include <assert.h>
#include <debug.h>
#include <nuttx/module.h>
#include <nuttx/elf.h>
#include <nuttx/lib/modlib.h>
#include <nuttx/binfmt/symtab.h>
#include "modlib/modlib.h"
libs/libc/modlib/modlib_depend.c
-1
View File
@@ -43,7 +43,6 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/module.h>
#include <nuttx/lib/modlib.h>
/****************************************************************************
libs/libc/modlib/modlib_init.c
-2
View File
@@ -44,11 +44,9 @@
#include <stdint.h>
#include <string.h>
#include <fcntl.h>
#include <elf32.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/module.h>
#include <nuttx/fs/fs.h>
#include <nuttx/lib/modlib.h>
libs/libc/modlib/modlib_iobuffer.c
-1
View File
@@ -42,7 +42,6 @@
#include <debug.h>
#include <errno.h>
#include <nuttx/module.h>
#include <nuttx/lib/modlib.h>
#include "libc.h"
libs/libc/modlib/modlib_load.c
-2
View File
@@ -45,12 +45,10 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <elf32.h>
#include <assert.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/module.h>
#include <nuttx/lib/modlib.h>
#include "libc.h"
libs/libc/modlib/modlib_read.c
-2
View File
@@ -43,11 +43,9 @@
#include <stdint.h>
#include <unistd.h>
#include <string.h>
#include <elf32.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/module.h>
#include <nuttx/fs/fs.h>
#include <nuttx/lib/modlib.h>
libs/libc/modlib/modlib_registry.c
+2 -3
View File
@@ -45,7 +45,6 @@
#include <errno.h>
#include <nuttx/semaphore.h>
#include <nuttx/module.h>
#include <nuttx/lib/modlib.h>
/****************************************************************************
@@ -72,7 +71,7 @@ struct mod_registrylock_s
static struct mod_registrylock_s g_modlock =
{
SEM_INITIALIZER(1), /* lock */
0, /* pid */
NO_HOLDER, /* pid */
0 /* count */
};
@@ -118,7 +117,7 @@ void modlib_registry_lock(void)
{
while ((ret = _SEM_WAIT(&g_modlock.lock)) < 0)
{
/* The only case that an error should occr here is if
/* The only case that an error should occur here is if
* the wait was awakened by a signal.
*/
libs/libc/modlib/modlib_sections.c
-1
View File
@@ -45,7 +45,6 @@
#include <errno.h>
#include <debug.h>
#include <nuttx/module.h>
#include <nuttx/lib/modlib.h>
#include "libc.h"
libs/libc/modlib/modlib_symbols.c
+2 -5
View File
@@ -41,13 +41,10 @@
#include <stdlib.h>
#include <string.h>
#include <elf32.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/module.h>
#include <nuttx/lib/modlib.h>
#include <nuttx/binfmt/symtab.h>
#include "modlib/modlib.h"
@@ -271,7 +268,7 @@ int modlib_findsymtab(FAR struct mod_loadinfo_s *loadinfo)
* Name: modlib_readsym
*
* Description:
* Read the ELFT symbol structure at the specfied index into memory.
* Read the ELF symbol structure at the specified index into memory.
*
* Input Parameters:
* loadinfo - Load state information
@@ -421,7 +418,7 @@ int modlib_symvalue(FAR struct module_s *modp,
/* Yes... add the exported symbol value to the ELF symbol table entry */
binfo("SHN_ABS: name=%s %08x+%08x=%08x\n",
binfo("SHN_UNDEF: name=%s %08x+%08x=%08x\n",
loadinfo->iobuffer, sym->st_value, symbol->sym_value,
sym->st_value + symbol->sym_value);
libs/libc/modlib/modlib_symtab.c
-1
View File
@@ -42,7 +42,6 @@
#include <assert.h>
#include <nuttx/symtab.h>
#include <nuttx/module.h>
#include <nuttx/lib/modlib.h>
/****************************************************************************
libs/libc/modlib/modlib_uninit.c
-2
View File
@@ -43,8 +43,6 @@
#include <debug.h>
#include <errno.h>
#include <nuttx/kmalloc.h>
#include <nuttx/module.h>
#include <nuttx/lib/modlib.h>
#include "libc.h"
libs/libc/modlib/modlib_unload.c
-1
View File
@@ -42,7 +42,6 @@
#include <stdlib.h>
#include <debug.h>
#include <nuttx/module.h>
#include <nuttx/lib/modlib.h>
#include "libc.h"
libs/libc/modlib/modlib_verify.c
+1 -1
View File
@@ -40,11 +40,11 @@
#include <nuttx/config.h>
#include <string.h>
#include <elf32.h>
#include <debug.h>
#include <errno.h>
#include <nuttx/arch.h>
#include <nuttx/elf.h>
#include <nuttx/lib/modlib.h>
/****************************************************************************