diff options
author | Ryan Prichard <rprichard@google.com> | 2018-11-30 02:06:52 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-11-30 02:06:52 +0000 |
commit | 6b70fda682419b1cb41b33bfd84c66c037b7390e (patch) | |
tree | bfa841808df6ed69eef493dfda2eb4e94812bce0 /libc/private/KernelArgumentBlock.h | |
parent | c7cbef4f2dca7de4fb6186df05e0208d7d7fbfa5 (diff) | |
parent | 48b1159bb82b12bdd75be9228bd43db45168bdba (diff) |
Merge changes I376d7695,Ied443375,I614d25e7
* changes:
Use shared globals to init __progname + environ
Move the abort message to libc_shared_globals
Expose libc_shared_globals to libc.so with symbol
Diffstat (limited to 'libc/private/KernelArgumentBlock.h')
-rw-r--r-- | libc/private/KernelArgumentBlock.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/libc/private/KernelArgumentBlock.h b/libc/private/KernelArgumentBlock.h index 886dd32a0..c8ce8411f 100644 --- a/libc/private/KernelArgumentBlock.h +++ b/libc/private/KernelArgumentBlock.h @@ -23,9 +23,6 @@ #include "private/bionic_macros.h" -struct abort_msg_t; -struct libc_shared_globals; - // When the kernel starts the dynamic linker, it passes a pointer to a block // of memory containing argc, the argv array, the environment variable array, // and the array of ELF aux vectors. This class breaks that block up into its @@ -65,10 +62,6 @@ class KernelArgumentBlock { char** envp; ElfW(auxv_t)* auxv; - // Other data that we want to pass from the dynamic linker to libc.so. - abort_msg_t** abort_message_ptr; - libc_shared_globals* shared_globals; - private: BIONIC_DISALLOW_COPY_AND_ASSIGN(KernelArgumentBlock); }; |