Changeset c4049e6 in mainline for uspace/lib/c/generic/elf

Timestamp:

2018-07-05T21:41:20Z (7 years ago)

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

9283830

Parents:

9396c52

git-author:

Dzejrou <dzejrou@…> (2018-03-15 10:40:53)

git-committer:

Dzejrou <dzejrou@…> (2018-07-05 21:41:20)

Message:

c+cpp: added support for global static constructors destructors

Location:

uspace/lib/c/generic/elf

Files:

• elf_load.c (modified) (1 diff)
• elf_mod.c (modified) (1 diff)

uspace/lib/c/generic/elf/elf_load.c

@@ -112 +112 @@
         pcb->dynamic = info->finfo.dynamic;
         pcb->rtld_runtime = info->env;
+        pcb->cpp_data = info->finfo.cpp_data;
 }
 

uspace/lib/c/generic/elf/elf_mod.c

@@ -198 +198 @@
         size_t phdr_len = header->e_phnum * header->e_phentsize;
 
+        elf->info->interp = NULL;
+        elf->info->dynamic = NULL;
+        elf->info->cpp_data.ctors_count = 0;
+        elf->info->cpp_data.dtors_count = 0;
+
         if (phdr_len > sizeof(phdr)) {
                 DPRINTF("more than %d program headers\n", phdr_cap);