-extern void (*sparc_supply_fpregset) (struct regcache *, int , const void *);
-extern void (*sparc_collect_fpregset) (const struct regcache *, int , void *);
-extern int (*sparc_gregset_supplies_p) (int);
-extern int (*sparc_fpregset_supplies_p) (int);
+extern void (*sparc_supply_fpregset) (const struct sparc_fpregmap *,
+ struct regcache *, int , const void *);
+extern void (*sparc_collect_fpregset) (const struct sparc_fpregmap *,
+ const struct regcache *, int , void *);
+extern int (*sparc_gregset_supplies_p) (struct gdbarch *gdbarch, int);
+extern int (*sparc_fpregset_supplies_p) (struct gdbarch *gdbarch, int);