Allow the prototype to be specified directly at the symbol

3 files changed, 9 insertions, 0 deletions

diff --git a/library.c b/library.c
index 5405474..1f425e0 100644
--- a/library.c
+++ b/library.c
@@ -159,6 +159,7 @@ private_library_symbol_init(struct library_symbol *libsym,
 	libsym->latent = latent;
 	libsym->delayed = delayed;
 	libsym->enter_addr = (void *)(uintptr_t)addr;
+	libsym->proto = NULL;
 }
 
 static void
diff --git a/library.h b/library.h
index 01c7689..9b687b1 100644
--- a/library.h
+++ b/library.h
@@ -50,6 +50,11 @@ struct library_symbol {
 	const char *name;
 	arch_addr_t enter_addr;
 	enum toplt plt_type;
+
+	/* If this is non-NULL, this prototype is used instead of
+	 * looking up one in LIB->protolib.  */
+	struct prototype *proto;
+
 	int own_name : 1;
 
 	/* This is relevant for PLT symbols.  Latent PLT symbols are
diff --git a/output.c b/output.c
index b2bb6dc..1778cd1 100644
--- a/output.c
+++ b/output.c
@@ -211,6 +211,9 @@ find_proto_cb(struct process *proc, struct library *lib, void *d)
 static struct prototype *
 lookup_symbol_prototype(struct process *proc, struct library_symbol *libsym)
 {
+	if (libsym->proto != NULL)
+		return libsym->proto;
+
 	struct library *lib = libsym->lib;
 	if (lib != NULL) {
 		struct find_proto_data data = { libsym->name };