Minor linker cleanup, primarily to use Elf32_Dyn
Change-Id: Ifa9408e9859c6f79444715bed4808b7c13fdced5
diff --git a/linker/linker.h b/linker/linker.h
index cf6fff9..dac555a 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -50,10 +50,10 @@
struct link_map {
uintptr_t l_addr;
- char * l_name;
+ char* l_name;
uintptr_t l_ld;
- struct link_map * l_next;
- struct link_map * l_prev;
+ struct link_map* l_next;
+ struct link_map* l_prev;
};
// Values for r_debug->state
@@ -87,7 +87,7 @@
int unused; // DO NOT USE, maintained for compatibility.
- unsigned* dynamic;
+ Elf32_Dyn* dynamic;
unsigned unused2; // DO NOT USE, maintained for compatibility
unsigned unused3; // DO NOT USE, maintained for compatibility
@@ -167,14 +167,14 @@
soinfo* do_dlopen(const char* name, int flags);
int do_dlclose(soinfo* si);
-Elf32_Sym* lookup(const char* name, soinfo** found, soinfo* start);
+Elf32_Sym* dlsym_linear_lookup(const char* name, soinfo** found, soinfo* start);
soinfo* find_containing_library(const void* addr);
const char* linker_get_error();
-Elf32_Sym* soinfo_find_symbol(soinfo* si, const void* addr);
-Elf32_Sym* soinfo_lookup(soinfo* si, const char* name);
+Elf32_Sym* dladdr_find_symbol(soinfo* si, const void* addr);
+Elf32_Sym* dlsym_handle_lookup(soinfo* si, const char* name);
-void debugger_init();
+void debuggerd_init();
extern "C" void notify_gdb_of_libraries();
#endif