generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am 33c3e8d3: Merge "Add NT_PRSTATUS to <elf.h>."

Browse Source 
* commit '33c3e8d3b2312be3a3eb9d2632c4a570969e1624':
  Add NT_PRSTATUS to <elf.h>.
This commit is contained in:
Elliott Hughes 2014-01-09 15:58:59 -08:00 committed by Android Git Automerger
commit 2872e74298
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libc/include/elf.h
View File

@ -30,6 +30,8 @@
#include <stdint.h> #include <stdint.h>
#include <linux/auxvec.h> #include <linux/auxvec.h>
/* TODO: can we switch to <linux/elf.h> instead? http://b/12476126. */
#include <sys/exec_elf.h> #include <sys/exec_elf.h>
typedef struct { typedef struct {
@ -52,4 +54,7 @@ typedef struct {
# define Elf_auxv_t Elf32_auxv_t # define Elf_auxv_t Elf32_auxv_t
#endif #endif
/* <sys/exec_elf.h> doesn't contain any NT_ constants. aarch64 strace needs this one. */
#define NT_PRSTATUS 1
#endif /* _ELF_H */ #endif /* _ELF_H */

5
linker/linker.h
View File

@ -29,12 +29,9 @@
#ifndef _LINKER_H_ #ifndef _LINKER_H_
#define _LINKER_H_ #define _LINKER_H_
#include <unistd.h>
#include <sys/types.h>
#include <elf.h> #include <elf.h>
#include <sys/exec_elf.h>
#include <link.h> #include <link.h>
#include <unistd.h>
#include "private/libc_logging.h" #include "private/libc_logging.h"