Changeset b58728f in mainline

Timestamp:

2019-04-10T15:04:17Z (6 years ago)

Author:

Jakub Jermář <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

84176f3

Parents:

b1478ff

git-author:

Petr Pavlu <setup@…> (2019-03-31 13:00:13)

git-committer:

Jakub Jermář <jakub@…> (2019-04-10 15:04:17)

Message:

Move dynamic-linking related ELF definitions to ABI includes

Move dynamic-linking related ELF definitions from
uspace/lib/c/include/rtld/elf_dyn.h to abi/include/abi/elf.h. This
allows their use by the AArch64 boot code.

Files:

• abi/include/abi/elf.h (modified) (4 diffs)
• uspace/lib/c/include/rtld/elf_dyn.h (modified) (1 diff)

abi/include/abi/elf.h

@@ -245 +245 @@
 
 /**
+ * Dynamic array tags
+ */
+enum elf_dynamic_tag {
+        DT_NULL     = 0,
+        DT_NEEDED   = 1,
+        DT_PLTRELSZ = 2,
+        DT_PLTGOT   = 3,
+        DT_HASH     = 4,
+        DT_STRTAB   = 5,
+        DT_SYMTAB   = 6,
+        DT_RELA     = 7,
+        DT_RELASZ   = 8,
+        DT_RELAENT  = 9,
+        DT_STRSZ    = 10,
+        DT_SYMENT   = 11,
+        DT_INIT     = 12,
+        DT_FINI     = 13,
+        DT_SONAME   = 14,
+        DT_RPATH    = 15,
+        DT_SYMBOLIC = 16,
+        DT_REL      = 17,
+        DT_RELSZ    = 18,
+        DT_RELENT   = 19,
+        DT_PLTREL   = 20,
+        DT_DEBUG    = 21,
+        DT_TEXTREL  = 22,
+        DT_JMPREL   = 23,
+        DT_BIND_NOW = 24,
+        DT_LOPROC   = 0x70000000,
+        DT_HIPROC   = 0x7fffffff,
+};
+
+/**
+ * Special section indexes
+ */
+enum {
+        SHN_UNDEF     = 0,
+        SHN_LORESERVE = 0xff00,
+        SHN_LOPROC    = 0xff00,
+        SHN_HIPROC    = 0xff1f,
+        SHN_ABS       = 0xfff1,
+        SHN_COMMON    = 0xfff2,
+        SHN_HIRESERVE = 0xffff,
+};
+
+/**
+ * Special symbol table index
+ */
+enum {
+        STN_UNDEF = 0,
+};
+
+/**
  * ELF data types
  *
@@ -406 +459 @@
 };
 
+/**
+ * Dynamic structure
+ */
+struct elf32_dyn {
+        elf_sword d_tag;
+        union {
+                elf_word d_val;
+                elf32_addr d_ptr;
+        } d_un;
+};
+
+struct elf64_dyn {
+        elf_sxword d_tag;
+        union {
+                elf_xword d_val;
+                elf64_addr d_ptr;
+        } d_un;
+};
+
+struct elf32_rel {
+        elf32_addr r_offset;
+        elf_word r_info;
+};
+
+struct elf32_rela {
+        elf32_addr r_offset;
+        elf_word r_info;
+        elf_sword r_addend;
+};
+
+struct elf64_rel {
+        elf64_addr r_offset;
+        elf_xword r_info;
+};
+
+struct elf64_rela {
+        elf64_addr r_offset;
+        elf_xword r_info;
+        elf_sxword r_addend;
+};
+
+#define ELF32_R_SYM(i) ((i) >> 8)
+#define ELF32_R_TYPE(i) ((unsigned char)(i))
+
+#define ELF64_R_SYM(i) ((i) >> 32)
+#define ELF64_R_TYPE(i) ((i) & 0xffffffffL)
+
 #ifdef __32_BITS__
 typedef struct elf32_header elf_header_t;
@@ -412 +512 @@
 typedef struct elf32_symbol elf_symbol_t;
 typedef struct elf32_note elf_note_t;
+typedef struct elf32_dyn elf_dyn_t;
+typedef struct elf32_rel elf_rel_t;
+typedef struct elf32_rela elf_rela_t;
 #endif
 
@@ -420 +523 @@
 typedef struct elf64_symbol elf_symbol_t;
 typedef struct elf64_note elf_note_t;
+typedef struct elf64_dyn elf_dyn_t;
+typedef struct elf64_rel elf_rel_t;
+typedef struct elf64_rela elf_rela_t;
 #endif
 

uspace/lib/c/include/rtld/elf_dyn.h

@@ -39 +39 @@
 #include <libarch/rtld/elf_dyn.h>
 
-#define ELF32_R_SYM(i) ((i) >> 8)
-#define ELF32_R_TYPE(i) ((unsigned char)(i))
-
-#define ELF64_R_SYM(i) ((i) >> 32)
-#define ELF64_R_TYPE(i) ((i) & 0xffffffffL)
-
-struct elf32_dyn {
-        elf_sword d_tag;
-        union {
-                elf_word d_val;
-                elf32_addr d_ptr;
-        } d_un;
-};
-
-struct elf64_dyn {
-        elf_sxword d_tag;
-        union {
-                elf_xword d_val;
-                elf64_addr d_ptr;
-        } d_un;
-};
-
-struct elf32_rel {
-        elf32_addr r_offset;
-        elf_word r_info;
-};
-
-struct elf32_rela {
-        elf32_addr r_offset;
-        elf_word r_info;
-        elf_sword r_addend;
-};
-
-struct elf64_rel {
-        elf64_addr r_offset;
-        elf_xword r_info;
-};
-
-struct elf64_rela {
-        elf64_addr r_offset;
-        elf_xword r_info;
-        elf_sxword r_addend;
-};
-
-#ifdef __32_BITS__
-typedef struct elf32_dyn elf_dyn_t;
-typedef struct elf32_rel elf_rel_t;
-typedef struct elf32_rela elf_rela_t;
-#endif
-
-#ifdef __64_BITS__
-typedef struct elf64_dyn elf_dyn_t;
-typedef struct elf64_rel elf_rel_t;
-typedef struct elf64_rela elf_rela_t;
-#endif
-
-/*
- * Dynamic array tags
- */
-#define DT_NULL         0
-#define DT_NEEDED       1
-#define DT_PLTRELSZ     2
-#define DT_PLTGOT       3
-#define DT_HASH         4
-#define DT_STRTAB       5
-#define DT_SYMTAB       6
-#define DT_RELA         7
-#define DT_RELASZ       8
-#define DT_RELAENT      9
-#define DT_STRSZ        10
-#define DT_SYMENT       11
-#define DT_INIT         12
-#define DT_FINI         13
-#define DT_SONAME       14
-#define DT_RPATH        15
-#define DT_SYMBOLIC     16
-#define DT_REL          17
-#define DT_RELSZ        18
-#define DT_RELENT       19
-#define DT_PLTREL       20
-#define DT_DEBUG        21
-#define DT_TEXTREL      22
-#define DT_JMPREL       23
-#define DT_BIND_NOW     24
-#define DT_LOPROC       0x70000000
-#define DT_HIPROC       0x7fffffff
-
-/*
- * Special section indexes
- */
-#define SHN_UNDEF       0
-#define SHN_LORESERVE   0xff00
-#define SHN_LOPROC      0xff00
-#define SHN_HIPROC      0xff1f
-#define SHN_ABS         0xfff1
-#define SHN_COMMON      0xfff2
-#define SHN_HIRESERVE   0xffff
-
-/*
- * Special symbol table index
- */
-#define STN_UNDEF       0
-
 #endif