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.

11 files changed, 49 insertions, 36 deletions

diff --git a/backends/ChangeLog b/backends/ChangeLog
index 3915fd3e..b62ea6fd 100644
--- a/backends/ChangeLog
+++ b/backends/ChangeLog
@@ -1,3 +1,16 @@
+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.
+
 2005-11-17  Roland McGrath  <roland@redhat.com>
 
 	* Makefile.am (uninstall): Don't try to remove $(pkgincludedir).
diff --git a/backends/alpha_init.c b/backends/alpha_init.c
index 76a9bfb3..d8d93b8c 100644
--- a/backends/alpha_init.c
+++ b/backends/alpha_init.c
@@ -38,10 +38,10 @@ alpha_init (elf, machine, eh, ehlen)
   /* We handle it.  */
   eh->name = "Alpha";
   alpha_init_reloc (eh);
-  eh->dynamic_tag_name = alpha_dynamic_tag_name;
-  eh->dynamic_tag_check = alpha_dynamic_tag_check;
-  eh->reloc_simple_type = alpha_reloc_simple_type;
-  eh->return_value_location = alpha_return_value_location;
+  HOOK (eh, dynamic_tag_name);
+  HOOK (eh, dynamic_tag_check);
+  HOOK (eh, reloc_simple_type);
+  HOOK (eh, return_value_location);
 
   return MODVERSION;
 }
diff --git a/backends/arm_init.c b/backends/arm_init.c
index ee739078..2c9e31a9 100644
--- a/backends/arm_init.c
+++ b/backends/arm_init.c
@@ -38,7 +38,7 @@ arm_init (elf, machine, eh, ehlen)
   /* We handle it.  */
   eh->name = "ARM";
   arm_init_reloc (eh);
-  eh->reloc_simple_type = arm_reloc_simple_type;
+  HOOK (eh, reloc_simple_type);
 
   return MODVERSION;
 }
diff --git a/backends/i386_init.c b/backends/i386_init.c
index a1056e73..3c9bd371 100644
--- a/backends/i386_init.c
+++ b/backends/i386_init.c
@@ -37,12 +37,12 @@ i386_init (elf, machine, eh, ehlen)
   /* 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;
 }
diff --git a/backends/ia64_init.c b/backends/ia64_init.c
index 1431f2de..ddd4ec20 100644
--- a/backends/ia64_init.c
+++ b/backends/ia64_init.c
@@ -37,12 +37,12 @@ ia64_init (elf, machine, eh, ehlen)
   /* We handle it.  */
   eh->name = "Intel IA-64";
   ia64_init_reloc (eh);
-  eh->reloc_simple_type = ia64_reloc_simple_type;
-  eh->segment_type_name = ia64_segment_type_name;
-  eh->section_type_name = ia64_section_type_name;
-  eh->dynamic_tag_name = ia64_dynamic_tag_name;
-  eh->dynamic_tag_check = ia64_dynamic_tag_check;
-  eh->machine_flag_check = ia64_machine_flag_check;
+  HOOK (eh, reloc_simple_type);
+  HOOK (eh, segment_type_name);
+  HOOK (eh, section_type_name);
+  HOOK (eh, dynamic_tag_name);
+  HOOK (eh, dynamic_tag_check);
+  HOOK (eh, machine_flag_check);
 
   return MODVERSION;
 }
diff --git a/backends/ppc64_init.c b/backends/ppc64_init.c
index 9024eafa..c8e08380 100644
--- a/backends/ppc64_init.c
+++ b/backends/ppc64_init.c
@@ -38,13 +38,13 @@ ppc64_init (elf, machine, eh, ehlen)
   /* We handle it.  */
   eh->name = "PowerPC 64-bit";
   ppc64_init_reloc (eh);
-  eh->reloc_simple_type = ppc64_reloc_simple_type;
-  eh->dynamic_tag_name = ppc64_dynamic_tag_name;
-  eh->dynamic_tag_check = ppc64_dynamic_tag_check;
-  eh->copy_reloc_p = ppc64_copy_reloc_p;
-  eh->check_special_symbol = ppc64_check_special_symbol;
-  eh->bss_plt_p = ppc64_bss_plt_p;
-  eh->return_value_location = ppc64_return_value_location;
+  HOOK (eh, reloc_simple_type);
+  HOOK (eh, dynamic_tag_name);
+  HOOK (eh, dynamic_tag_check);
+  HOOK (eh, copy_reloc_p);
+  HOOK (eh, check_special_symbol);
+  HOOK (eh, bss_plt_p);
+  HOOK (eh, return_value_location);
 
   return MODVERSION;
 }
diff --git a/backends/ppc_init.c b/backends/ppc_init.c
index 36ca7a24..e2ad85c8 100644
--- a/backends/ppc_init.c
+++ b/backends/ppc_init.c
@@ -38,12 +38,12 @@ ppc_init (elf, machine, eh, ehlen)
   /* We handle it.  */
   eh->name = "PowerPC";
   ppc_init_reloc (eh);
-  eh->reloc_simple_type = ppc_reloc_simple_type;
-  eh->dynamic_tag_name = ppc_dynamic_tag_name;
-  eh->dynamic_tag_check = ppc_dynamic_tag_check;
-  eh->check_special_symbol = ppc_check_special_symbol;
-  eh->bss_plt_p = ppc_bss_plt_p;
-  eh->return_value_location = ppc_return_value_location;
+  HOOK (eh, reloc_simple_type);
+  HOOK (eh, dynamic_tag_name);
+  HOOK (eh, dynamic_tag_check);
+  HOOK (eh, check_special_symbol);
+  HOOK (eh, bss_plt_p);
+  HOOK (eh, return_value_location);
 
   return MODVERSION;
 }
diff --git a/backends/s390_init.c b/backends/s390_init.c
index 14578660..64b373b4 100644
--- a/backends/s390_init.c
+++ b/backends/s390_init.c
@@ -37,7 +37,7 @@ s390_init (elf, machine, eh, ehlen)
   /* We handle it.  */
   eh->name = "IBM S/390";
   s390_init_reloc (eh);
-  eh->reloc_simple_type = s390_reloc_simple_type;
+  HOOK (eh, reloc_simple_type);
 
   return MODVERSION;
 }
diff --git a/backends/sh_init.c b/backends/sh_init.c
index 4fadd9b4..975d031d 100644
--- a/backends/sh_init.c
+++ b/backends/sh_init.c
@@ -38,7 +38,7 @@ sh_init (elf, machine, eh, ehlen)
   /* We handle it.  */
   eh->name = "Hitachi SH";
   sh_init_reloc (eh);
-  eh->reloc_simple_type = sh_reloc_simple_type;
+  HOOK (eh, reloc_simple_type);
 
   return MODVERSION;
 }
diff --git a/backends/sparc_init.c b/backends/sparc_init.c
index 541df842..a287d1e4 100644
--- a/backends/sparc_init.c
+++ b/backends/sparc_init.c
@@ -42,8 +42,8 @@ sparc_init (elf, machine, eh, ehlen)
   else
     eh->name = "SPARC";
   sparc_init_reloc (eh);
-  eh->reloc_simple_type = sparc_reloc_simple_type;
-  //eh->core_note = sparc_core_note;
+  HOOK (eh, reloc_simple_type);
+  //HOOK (eh, core_note);
 
   return MODVERSION;
 }
diff --git a/backends/x86_64_init.c b/backends/x86_64_init.c
index 22147a1f..fe877575 100644
--- a/backends/x86_64_init.c
+++ b/backends/x86_64_init.c
@@ -39,9 +39,9 @@ x86_64_init (elf, machine, eh, ehlen)
   /* We handle it.  */
   eh->name = "AMD x86-64";
   x86_64_init_reloc (eh);
-  eh->reloc_simple_type = x86_64_reloc_simple_type;
-  eh->core_note = x86_64_core_note;
-  eh->return_value_location = x86_64_return_value_location;
+  HOOK (eh, reloc_simple_type);
+  HOOK (eh, core_note);
+  HOOK (eh, return_value_location);
 
   return MODVERSION;
 }