2005-11-18  Roland McGrath  <roland@redhat.com>

	* alpha_init.c: Use HOOK macro.
	* arm_init.c: Likewise.
	* i386_init.c: Likewise.
	* ia64_init.c: Likewise.
	* ppc64_init.c: Likewise.
	* ppc_init.c: Likewise.
	* s390_init.c: Likewise.
	* sh_init.c: Likewise.
	* sparc_init.c: Likewise.
	* x86_64_init.c: Likewise.

diff --git a/backends/i386_init.c b/backends/i386_init.c
index a1056e7..3c9bd37 100644
--- a/backends/i386_init.c
+++ b/backends/i386_init.c
@@ -37,12 +37,12 @@
   /* We handle it.  */
   eh->name = "Intel 80386";
   i386_init_reloc (eh);
-  eh->reloc_simple_type = i386_reloc_simple_type;
-  eh->gotpc_reloc_check = i386_gotpc_reloc_check;
-  eh->core_note = i386_core_note;
+  HOOK (eh, reloc_simple_type);
+  HOOK (eh, gotpc_reloc_check);
+  HOOK (eh, core_note);
   generic_debugscn_p = eh->debugscn_p;
-  eh->debugscn_p = i386_debugscn_p;
-  eh->return_value_location = i386_return_value_location;
+  HOOK (eh, debugscn_p);
+  HOOK (eh, return_value_location);
 
   return MODVERSION;
 }