summaryrefslogtreecommitdiff
path: root/nuttx/binfmt/libelf
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-08-24 12:57:02 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-08-24 12:57:02 -0600
commit65dcc20142c98e13e52ab7129c489059c4d64380 (patch)
tree6c39bd7aa847275b9ebb67236aaefb2b1533b216 /nuttx/binfmt/libelf
parent9f1f24faa04da13e1edc7534111fe4fdf6ab8621 (diff)
downloadpx4-nuttx-65dcc20142c98e13e52ab7129c489059c4d64380.tar.gz
px4-nuttx-65dcc20142c98e13e52ab7129c489059c4d64380.tar.bz2
px4-nuttx-65dcc20142c98e13e52ab7129c489059c4d64380.zip
Fix some compilation errors in ELF logic that were introduced in a recent commit
Diffstat (limited to 'nuttx/binfmt/libelf')
-rw-r--r--nuttx/binfmt/libelf/libelf_load.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/nuttx/binfmt/libelf/libelf_load.c b/nuttx/binfmt/libelf/libelf_load.c
index 9f33abb40..81016a908 100644
--- a/nuttx/binfmt/libelf/libelf_load.c
+++ b/nuttx/binfmt/libelf/libelf_load.c
@@ -177,25 +177,25 @@ static inline int elf_loadfile(FAR struct elf_loadinfo_s *loadinfo)
continue;
}
+ /* SHF_WRITE indicates that the section address space is write-
+ * able
+ */
+
+ if ((shdr->sh_flags & SHF_WRITE) != 0)
+ {
+ pptr = &data;
+ }
+ else
+ {
+ pptr = &text;
+ }
+
/* SHT_NOBITS indicates that there is no data in the file for the
* section.
*/
if (shdr->sh_type != SHT_NOBITS)
{
- /* SHF_WRITE indicates that the section address space is write-
- * able
- */
-
- if ((shdr->sh_flags & SHF_WRITE) != 0)
- {
- pptr = &data;
- }
- else
- {
- pptr = &text;
- }
-
/* If CONFIG_ARCH_ADDRENV=y, then 'text' lies in a virtual address
* space that may not be in place now. elf_addrenv_select() will
* temporarily instantiate that address space.