---
 i386-linux-tdep.c |    2 ++
 i386-tdep.c       |    4 +---
 i386-tdep.h       |    3 +++
 3 files changed, 6 insertions(+), 3 deletions(-)

--- a/i386-linux-tdep.c
+++ b/i386-linux-tdep.c
@@ -613,6 +613,8 @@ i386_linux_init_abi (struct gdbarch_info
   tdep->sc_reg_offset = i386_linux_sc_reg_offset;
   tdep->sc_num_regs = ARRAY_SIZE (i386_linux_sc_reg_offset);
 
+  set_gdbarch_process_record (gdbarch, i386_process_record);
+
   /* Initialize the i386_linux_record_tdep.  */
   i386_linux_record_tdep.size__old_kernel_stat =
     I386_LINUX_RECORD_SIZE__old_kernel_stat;
--- a/i386-tdep.c
+++ b/i386-tdep.c
@@ -2982,7 +2982,7 @@ i386_record_lea_modrm (struct i386_recor
    memory that will be changed in current instruction to "record_arch_list".
    Return -1 if something wrong. */
 
-static int
+int
 i386_process_record (struct gdbarch *gdbarch, struct regcache *regcache,
 		     CORE_ADDR addr)
 {
@@ -5277,8 +5277,6 @@ i386_gdbarch_init (struct gdbarch_info i
   set_gdbarch_skip_permanent_breakpoint (gdbarch,
 					 i386_skip_permanent_breakpoint);
 
-  set_gdbarch_process_record (gdbarch, i386_process_record);
-
   return gdbarch;
 }
 
--- a/i386-tdep.h
+++ b/i386-tdep.h
@@ -220,6 +220,9 @@ extern void i386_elf_init_abi (struct gd
 
 /* Initialize a SVR4 architecture variant.  */
 extern void i386_svr4_init_abi (struct gdbarch_info, struct gdbarch *);
+
+extern int i386_process_record (struct gdbarch *gdbarch,
+                                struct regcache *regcache, CORE_ADDR addr);
 
 
 /* Functions and variables exported from i386bsd-tdep.c.  */