Changeset c735afb in mainline for uspace/lib/c

Timestamp:

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

Author:

Dzejrou <dzejrou@…>

Branches:

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

Children:

199b6d8

Parents:

b57a3ee

git-author:

Dzejrou <dzejrou@…> (2018-06-25 18:54:33)

git-committer:

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

Message:

cpp: fix problems caused by new HelenOS changes (and leftowers from rebase)

Location:

uspace/lib/c

Files:

• generic/elf/elf_load.c (modified) (1 diff)
• generic/elf/elf_mod.c (modified) (1 diff)
• include/loader/pcb.h (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

@@ -200 +200 @@
         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)) {

uspace/lib/c/include/loader/pcb.h

@@ -75 +75 @@
         /** Pointer to dynamic linker state structure (rtld_t). */
         void *rtld_runtime;
-        /** C++ related data. */
-        cpp_data_t cpp_data;
 } pcb_t;