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

Merge c4cb87f3

Browse Source 
Change-Id: I4cc14eba43fde75a7702fdc7ad07d3d949e9c092
This commit is contained in:
Jean-Baptiste Queru
2012-02-01 09:46:08 -08:00
parent b118b9c5cd c4cb87f367
commit 25b7a16a6e
399 changed files with 33 additions and 16293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
linker/linker.h
View File

@@ -122,14 +122,6 @@ struct soinfo
Elf32_Rel *rel;
unsigned rel_count;
#ifdef ANDROID_SH_LINKER
Elf32_Rela *plt_rela;
unsigned plt_rela_count;
Elf32_Rela *rela;
unsigned rela_count;
#endif /* ANDROID_SH_LINKER */
unsigned *preinit_array;
unsigned preinit_array_count;
@@ -178,15 +170,7 @@ extern soinfo libdl_info;
#define R_386_JUMP_SLOT 7
#define R_386_RELATIVE 8
#elif defined(ANDROID_SH_LINKER)
#define R_SH_DIR32 1
#define R_SH_GLOB_DAT 163
#define R_SH_JUMP_SLOT 164
#define R_SH_RELATIVE 165
#endif /* ANDROID_*_LINKER */
#endif
#ifndef DT_INIT_ARRAY
#define DT_INIT_ARRAY 25
@@ -224,7 +208,7 @@ void call_constructors_recursive(soinfo *si);
#ifdef ANDROID_ARM_LINKER
typedef long unsigned int *_Unwind_Ptr;
_Unwind_Ptr dl_unwind_find_exidx(_Unwind_Ptr pc, int *pcount);
#elif defined(ANDROID_X86_LINKER) || defined(ANDROID_SH_LINKER)
#elif defined(ANDROID_X86_LINKER)
int dl_iterate_phdr(int (*cb)(struct dl_phdr_info *, size_t, void *), void *);
#endif