diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index e6fa3c11e5..9458a84211 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2015-01-12  Alan Modra  <amodra@gmail.com>
+
+	* prdbg.c (print_debugging_info): Don't use void* for function
+	pointer param.
+	* budbg.h (print_debugging_info): Update prototype.
+
 2015-01-08  Nick Clifton  <nickc@redhat.com>
 
 	PR binutils/17512
diff --git a/binutils/budbg.h b/binutils/budbg.h
index fc1ee2b57f..18c022deb6 100644
--- a/binutils/budbg.h
+++ b/binutils/budbg.h
@@ -29,7 +29,8 @@ extern void *read_debugging_info (bfd *, asymbol **, long, bfd_boolean);
 /* Routine used to print generic debugging information.  */
 
 extern bfd_boolean print_debugging_info
-  (FILE *, void *, bfd *, asymbol **, void *, bfd_boolean);
+  (FILE *, void *, bfd *, asymbol **,
+   char * (*) (struct bfd *, const char *, int), bfd_boolean);
 
 /* Routines used to read and write stabs information.  */
 
diff --git a/binutils/prdbg.c b/binutils/prdbg.c
index 4ef481cdde..6e2b2172e4 100644
--- a/binutils/prdbg.c
+++ b/binutils/prdbg.c
@@ -291,7 +291,8 @@ static const struct debug_write_fns tg_fns =
 
 bfd_boolean
 print_debugging_info (FILE *f, void *dhandle, bfd *abfd, asymbol **syms,
-		      void *demangler, bfd_boolean as_tags)
+		      char * (*demangler) (struct bfd *, const char *, int),
+		      bfd_boolean as_tags)
 {
   struct pr_handle info;
 
@@ -302,7 +303,7 @@ print_debugging_info (FILE *f, void *dhandle, bfd *abfd, asymbol **syms,
   info.filename = NULL;
   info.abfd = abfd;
   info.syms = syms;
-  info.demangler = (char * (*)(struct bfd *, const char *, int)) demangler;
+  info.demangler = demangler;
 
   if (as_tags)
     {
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 97422c1b54..a0deb6abc6 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-12  Alan Modra  <amodra@gmail.com>
+
+	* read.c (s_altmacro, s_reloc): Make definition static.
+
 2015-01-10  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* config/tc-avr.c (md_apply_fix): Update the contents of VALP for
diff --git a/gas/read.c b/gas/read.c
index 585d7efb89..7dfc20a737 100644
--- a/gas/read.c
+++ b/gas/read.c
@@ -1579,7 +1579,7 @@ s_align_ptwo (int arg)
 
 /* Switch in and out of alternate macro mode.  */
 
-void
+static void
 s_altmacro (int on)
 {
   demand_empty_rest_of_line ();
@@ -3984,7 +3984,7 @@ s_rva (int size)
 
 /* .reloc offset, reloc_name, symbol+addend.  */
 
-void
+static void
 s_reloc (int ignore ATTRIBUTE_UNUSED)
 {
   char *stop = NULL;