Changeset d3e938c in mainline for uspace/lib/c/include/rtld/elf_dyn.h

Timestamp:

2019-01-08T13:27:05Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

05cb995, 1567471, 1aa9eff, cdec2a1

Parents:

9c4df21

git-author:

Jiri Svoboda <jiri@…> (2018-01-07 22:27:02)

git-committer:

Jiri Svoboda <jiri@…> (2019-01-08 13:27:05)

Message:

Dynamic linking on amd64 (WIP)

After modifying HelenOS.config, it is possible to build with dynamic
linking support, but an attempt to load a shared library will fail.

File:

• uspace/lib/c/include/rtld/elf_dyn.h (modified) (3 diffs)

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_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 {
@@ -47 +50 @@
                 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;
 };
@@ -61 +72 @@
 };
 
+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