More dynamic linker cleanup.
I still want to break linker_format out into its own library so we can reuse
it for malloc debugging and so forth. (There are many similar pieces of code
in bionic, but the linker's one seems to be the most complete/functional.)
Change-Id: If3721853d28937c8e821ca1d23cf200e228a409a
diff --git a/linker/linker.h b/linker/linker.h
index 8ed433c..54563bb 100644
--- a/linker/linker.h
+++ b/linker/linker.h
@@ -34,9 +34,6 @@
#include <elf.h>
#include <sys/exec_elf.h>
-#ifdef __cplusplus
-extern "C" {
-#endif
#include <link.h>
#undef PAGE_MASK
@@ -89,8 +86,6 @@
uintptr_t r_ldbase;
};
-typedef struct soinfo soinfo;
-
#define FLAG_LINKED 0x00000001
#define FLAG_ERROR 0x00000002
#define FLAG_EXE 0x00000004 // The main executable
@@ -98,8 +93,7 @@
#define SOINFO_NAME_LEN 128
-struct soinfo
-{
+struct soinfo {
char name[SOINFO_NAME_LEN];
const Elf32_Phdr *phdr;
int phnum;
@@ -232,8 +226,6 @@
Elf32_Sym *soinfo_lookup(soinfo *si, const char *name);
void soinfo_call_constructors(soinfo *si);
-#ifdef __cplusplus
-};
-#endif
+extern "C" void notify_gdb_of_libraries();
#endif