From d6f761430c0b04891d04a0f8fbd542d341388c10 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Wed, 19 Dec 2012 21:16:03 +0000
Subject: [PATCH] Some minor fixes for CONFIG_ADDRENV=y

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5444 42af7a65-404d-4744-a932-0658087f49c3
---
 binfmt/binfmt_unloadmodule.c         | 2 +-
 binfmt/libnxflat/libnxflat_addrenv.c | 1 +
 binfmt/libnxflat/libnxflat_bind.c    | 9 ++++++++-
 binfmt/libnxflat/libnxflat_unload.c  | 1 -
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/binfmt/binfmt_unloadmodule.c b/binfmt/binfmt_unloadmodule.c
index a0050481c6..a03b98d6c7 100644
--- a/binfmt/binfmt_unloadmodule.c
+++ b/binfmt/binfmt_unloadmodule.c
@@ -183,7 +183,7 @@ int unload_module(FAR const struct binary_s *binp)
           if (binp->alloc[i])
             {
               bvdbg("Freeing alloc[%d]: %p\n", i, binp->alloc[i]);
-              free(binp->alloc[i]);
+              free((FAR void *)binp->alloc[i]);
             }
         }
 
diff --git a/binfmt/libnxflat/libnxflat_addrenv.c b/binfmt/libnxflat/libnxflat_addrenv.c
index c6b3fce341..233713ccd5 100644
--- a/binfmt/libnxflat/libnxflat_addrenv.c
+++ b/binfmt/libnxflat/libnxflat_addrenv.c
@@ -39,6 +39,7 @@
 
 #include <nuttx/config.h>
 
+#include <string.h>
 #include <errno.h>
 #include <debug.h>
 
diff --git a/binfmt/libnxflat/libnxflat_bind.c b/binfmt/libnxflat/libnxflat_bind.c
index 3a86d53558..816810a467 100644
--- a/binfmt/libnxflat/libnxflat_bind.c
+++ b/binfmt/libnxflat/libnxflat_bind.c
@@ -38,6 +38,7 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <nuttx/compiler.h>
 
 #include <stdint.h>
 #include <string.h>
@@ -248,7 +249,7 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo)
   DEBUGASSERT(offset + nrelocs * sizeof(struct nxflat_reloc_s)
               <= (loadinfo->isize + loadinfo->dsize));
 
-  relocs = (FAR struct nxflat_reloc_s*)
+  relocs = (FAR struct nxflat_reloc_s *)
         (offset - loadinfo->isize + loadinfo->dspace->region);
   bvdbg("isize: %08lx dpsace: %p relocs: %p\n", 
         (long)loadinfo->isize, loadinfo->dspace->region, relocs);
@@ -276,7 +277,13 @@ static inline int nxflat_gotrelocs(FAR struct nxflat_loadinfo_s *loadinfo)
     {
       /* Handle the relocation by the relocation type */
 
+#ifdef CONFIG_CAN_PASS_STRUCTS
       reloc = *relocs++;
+#else
+      memcpy(&reloc, relocs, sizeof(struct nxflat_reloc_s));
+      relocs++;
+#endif
+
       result = OK;
       switch (NXFLAT_RELOC_TYPE(reloc.r_info))
         {
diff --git a/binfmt/libnxflat/libnxflat_unload.c b/binfmt/libnxflat/libnxflat_unload.c
index 71d0c84993..eb1aa03434 100644
--- a/binfmt/libnxflat/libnxflat_unload.c
+++ b/binfmt/libnxflat/libnxflat_unload.c
@@ -95,4 +95,3 @@ int nxflat_unload(struct nxflat_loadinfo_s *loadinfo)
   nxflat_addrenv_free(loadinfo);
   return OK;
 }
-