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

Fixes for compilation with ez80

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1898 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
2009-06-17 22:20:51 +00:00
parent 10fd1a67f5
commit 2afd39df07
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
binfmt/Makefile
+1 -1
View File
@@ -35,7 +35,7 @@
-include $(TOPDIR)/Make.defs -include $(TOPDIR)/Make.defs
CFLAGS += -I$(TOPDIR)/sched CFLAGS += ${shell $(TOPDIR)/tools/incdir.sh "$(CC)" $(TOPDIR)/sched}
ifeq ($(CONFIG_NXFLAT),y) ifeq ($(CONFIG_NXFLAT),y)
include libnxflat/Make.defs include libnxflat/Make.defs
binfmt/libnxflat/libnxflat_load.c
+6 -2
View File
@@ -75,6 +75,10 @@ static const char *g_segment[] =
g_bsssegment, g_bsssegment,
g_unksegment g_unksegment
}; };
# define SEGNAME(rl) g_segment[NXFLAT_RELOC_TYPE(rl)]
#else
# define SEGNAME(rl) "(no name)"
#endif #endif
/**************************************************************************** /****************************************************************************
@@ -124,7 +128,7 @@ static void nxflat_reloc(struct nxflat_loadinfo_s *loadinfo, uint32 rl)
bvdbg("Relocation of variable at DATASEG+0x%08x " bvdbg("Relocation of variable at DATASEG+0x%08x "
"(address 0x%p, currently 0x%08x) into segment %s\n", "(address 0x%p, currently 0x%08x) into segment %s\n",
NXFLAT_RELOC_OFFSET(rl), ptr, *ptr, g_segment[NXFLAT_RELOC_TYPE(rl)]); NXFLAT_RELOC_OFFSET(rl), ptr, *ptr, SEGNAME(rl));
switch (NXFLAT_RELOC_TYPE(rl)) switch (NXFLAT_RELOC_TYPE(rl))
{ {
@@ -182,7 +186,7 @@ int nxflat_load(struct nxflat_loadinfo_s *loadinfo)
off_t doffset; /* Offset to .data in the NXFLAT file */ off_t doffset; /* Offset to .data in the NXFLAT file */
uint32 *reloctab; /* Address of the relocation table */ uint32 *reloctab; /* Address of the relocation table */
uint32 dreadsize; /* Total number of bytes of .data to be read */ uint32 dreadsize; /* Total number of bytes of .data to be read */
uint32 ret; uint32 ret = OK;
int i; int i;
/* Calculate the extra space we need to allocate. This extra space will be /* Calculate the extra space we need to allocate. This extra space will be