sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More ELF loader changes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5261 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-10-25 22:10:56 +00:00
parent a34472f4a8
commit 6eca82d4a6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sim/src/up_elf.c
View File

@ -40,7 +40,9 @@
#include <nuttx/config.h>
#include <stdlib.h>
#include <elf.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/binfmt/elf.h>
@ -113,7 +115,7 @@ int arch_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
{
FAR uint32_t *ptr = (FAR uint32_t *)addr;
switch (ELF_REL_TYPE(rel->r_info))
switch (ELF32_R_TYPE(rel->r_info))
{
case R_386_32:
*ptr += sym->st_value;

4
arch/x86/src/common/up_elf.c
View File

@ -40,7 +40,9 @@
#include <nuttx/config.h>
#include <stdlib.h>
#include <elf.h>
#include <errno.h>
#include <debug.h>
#include <nuttx/arch.h>
#include <nuttx/binfmt/elf.h>
@ -113,7 +115,7 @@ int arch_relocate(FAR const Elf32_Rel *rel, FAR const Elf32_Sym *sym,
{
FAR uint32_t *ptr = (FAR uint32_t *)addr;
switch (ELF_REL_TYPE(rel->r_info))
switch (ELF32_R_TYPE(rel->r_info))
{
case R_386_32:
*ptr += sym->st_value;