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

am 020bcdae: Merge "Update <sys/exec_elf.h> to get the DF_* flags."

Browse Source 
* commit '020bcdaef349b6bd82302a0656fdf9aaff30bdb3':
  Update <sys/exec_elf.h> to get the DF_* flags.
This commit is contained in:
Elliott Hughes 2013-10-28 15:05:49 -07:00 committed by Android Git Automerger
commit 6ec070a015
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libc/include/sys/exec_elf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: exec_elf.h,v 1.129 2013/09/10 16:24:02 matt Exp $ */
/* $NetBSD: exec_elf.h,v 1.130 2013/10/28 21:36:43 matt Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@ -693,6 +693,13 @@ typedef struct {
#define DT_LOPROC 0x70000000 /* Processor-specific range */
#define DT_HIPROC 0x7fffffff
/* Flag values for DT_FLAGS */
#define DF_ORIGIN 0x00000001 /* uses $ORIGIN */
#define DF_SYMBOLIC 0x00000002 /* */
#define DF_TEXTREL 0x00000004 /* */
#define DF_BIND_NOW 0x00000008 /* */
#define DF_STATICT_LS 0x00000010 /* */
/* Flag values for DT_FLAGS_1 (incomplete) */
#define DF_1_BIND_NOW 0x00000001 /* Same as DF_BIND_NOW */
#define DF_1_NODELETE 0x00000008 /* Set the RTLD_NODELETE for object */

9
linker/linker.h
View File

@ -197,15 +197,6 @@ struct soinfo {
void CallFunction(const char* function_name, linker_function_t function);
};
// The possible DT_FLAGS bits are in
// http://www.sco.com/developers/gabi/latest/ch5.dynamic.html#dynamic_section
// but not in the upstream NetBSD <sys/exec_elf.h> header file ours is based on.
#define DF_ORIGIN 0x1
#define DF_SYMBOLIC 0x2
#define DF_TEXTREL 0x4
#define DF_BIND_NOW 0x8
#define DF_STATIC_TLS 0x10
extern soinfo libdl_info;
void do_android_update_LD_LIBRARY_PATH(const char* ld_library_path);