nuttx-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiaoxi...@apache.org
Subject [incubator-nuttx] branch master updated: include/elf.h: Appease nxstyle errors
Date Tue, 10 Mar 2020 06:48:08 GMT
This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 63395b2  include/elf.h: Appease nxstyle errors
63395b2 is described below

commit 63395b295f9820b4570e7327111f05a9683793e7
Author: YAMAMOTO Takashi <yamamoto@midokura.com>
AuthorDate: Tue Mar 10 15:04:01 2020 +0900

    include/elf.h: Appease nxstyle errors
---
 include/elf.h | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/include/elf.h b/include/elf.h
index d048b69..f931826 100644
--- a/include/elf.h
+++ b/include/elf.h
@@ -29,6 +29,16 @@
 
 #include <stdint.h>
 
+#define EI_NIDENT          16     /* Size of e_ident[] */
+
+/* NOTE: elf64.h and elf32.h refer EI_NIDENT defined above */
+
+#ifdef CONFIG_ELF_64BIT
+#  include <elf64.h>
+#else
+#  include <elf32.h>
+#endif
+
 /****************************************************************************
  * Pre-processor Definitions
  ****************************************************************************/
@@ -93,7 +103,8 @@
 #define EI_DATA            5      /* Data encoding */
 #define EI_VERSION         6      /* File version */
 #define EI_PAD             7      /* Start of padding bytes */
-#define EI_NIDENT          16     /* Size of e_ident[] */
+
+/* EI_NIDENT is defined in "Included Files" section */
 
 #define EI_MAGIC_SIZE      4
 #define EI_MAGIC           {0x7f, 'E', 'L', 'F'}
@@ -211,12 +222,4 @@
 #define DT_LOPROC          0x70000000 /* d_un=unspecified */
 #define DT_HIPROC          0x7fffffff /* d_un= unspecified */
 
-/* NOTE: elf64.h and elf32.h refer EI_NIDENT defined above */
-
-#ifdef CONFIG_ELF_64BIT
-#  include <elf64.h>
-#else
-#  include <elf32.h>
-#endif
-
 #endif /* __INCLUDE_ELF_H */


Mime
View raw message