Rename bfd_elf_get_arch_size to bfd_get_arch_size().

3 files changed, 21 insertions, 13 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index c21f3912610..d5f75562600 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+2000-08-30  Kevin Buettner  <kevinb@redhat.com>
+
+	* solib.c (solib_extract_address, LM_ADDR, LM_NEXT, LM_NAME,
+	LM_ADDR, IGNORE_FIRST_LINK_MAP_ENTRY, first_link_map_member,
+	open_symbol_file_object, current_sos): Rename
+	bfd_elf_get_arch_size to bfd_get_arch_size().
+	* sol-thread.c (rw_common, ps_pdmodel): Likewise.
+
 2000-08-30  David Edelsohn  <dje@watson.ibm.com>
 
 	Patch applied by Kevin Buettner <kevinb@redhat.com>:
diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index 3e5014e4acd..dc90979d15c 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -1048,7 +1048,7 @@ rw_common (int dowrite, const struct ps_prochandle *ph, gdb_ps_addr_t addr,
 #if defined (__sparcv9)
   /* For Sparc64 cross Sparc32, make sure the address has not been
      accidentally sign-extended (or whatever) to beyond 32 bits.  */
-  if (bfd_elf_get_arch_size (exec_bfd) == 32)
+  if (bfd_get_arch_size (exec_bfd) == 32)
     addr &= 0xffffffff;
 #endif
 
@@ -1320,7 +1320,7 @@ ps_pdmodel (gdb_ps_prochandle_t ph, int *data_model)
   if (exec_bfd == 0)
     return PS_ERR;
 
-  if (bfd_elf_get_arch_size (exec_bfd) == 32)
+  if (bfd_get_arch_size (exec_bfd) == 32)
     *data_model = PR_MODEL_ILP32;
   else
     *data_model = PR_MODEL_LP64;
diff --git a/gdb/solib.c b/gdb/solib.c
index 1a725a54297..843a73c7b4c 100644
--- a/gdb/solib.c
+++ b/gdb/solib.c
@@ -120,7 +120,7 @@ static CORE_ADDR
 solib_extract_address (void *memberp)
 {
   return extract_address (memberp, 
-			  bfd_elf_get_arch_size (exec_bfd) / 8);
+			  bfd_get_arch_size (exec_bfd) / 8);
 }
 
 #define SOLIB_EXTRACT_ADDRESS(MEMBER) \
@@ -199,7 +199,7 @@ LM_ADDR (so)
      struct so_list *so;
 {
 #if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_elf_get_arch_size (exec_bfd) == 32)
+  if (bfd_get_arch_size (exec_bfd) == 32)
     return extract_address (&so->lm32.lm_addr, sizeof (so->lm32.lm_addr));
   else
 #endif
@@ -211,7 +211,7 @@ LM_NEXT (so)
      struct so_list *so;
 {
 #if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_elf_get_arch_size (exec_bfd) == 32)
+  if (bfd_get_arch_size (exec_bfd) == 32)
     return extract_address (&so->lm32.lm_next, sizeof (so->lm32.lm_next));
   else
 #endif
@@ -223,7 +223,7 @@ LM_NAME (so)
      struct so_list *so;
 {
 #if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_elf_get_arch_size (exec_bfd) == 32)
+  if (bfd_get_arch_size (exec_bfd) == 32)
     return extract_address (&so->lm32.lm_name, sizeof (so->lm32.lm_name));
   else
 #endif
@@ -244,7 +244,7 @@ LM_ADDR (so)
      struct so_list *so;
 {
 #if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_elf_get_arch_size (exec_bfd) == 32)
+  if (bfd_get_arch_size (exec_bfd) == 32)
     return extract_address (&so->lm32.l_addr, sizeof (so->lm32.l_addr));
   else
 #endif
@@ -256,7 +256,7 @@ LM_NEXT (so)
      struct so_list *so;
 {
 #if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_elf_get_arch_size (exec_bfd) == 32)
+  if (bfd_get_arch_size (exec_bfd) == 32)
     return extract_address (&so->lm32.l_next, sizeof (so->lm32.l_next));
   else
 #endif
@@ -268,7 +268,7 @@ LM_NAME (so)
      struct so_list *so;
 {
 #if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_elf_get_arch_size (exec_bfd) == 32)
+  if (bfd_get_arch_size (exec_bfd) == 32)
     return extract_address (&so->lm32.l_name, sizeof (so->lm32.l_name));
   else
 #endif
@@ -280,7 +280,7 @@ IGNORE_FIRST_LINK_MAP_ENTRY (so)
      struct so_list *so;
 {
 #if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_elf_get_arch_size (exec_bfd) == 32)
+  if (bfd_get_arch_size (exec_bfd) == 32)
     return (solib_extract_address (&(so) -> lm32.l_prev) == 0);
   else
 #endif
@@ -1037,7 +1037,7 @@ first_link_map_member (void)
 
 #else /* SVR4_SHARED_LIBS */
 #if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_elf_get_arch_size (exec_bfd) == 32)
+  if (bfd_get_arch_size (exec_bfd) == 32)
     {
       read_memory (debug_base, (char *) &debug32_copy, 
 		   sizeof (struct r_debug32));
@@ -1099,7 +1099,7 @@ open_symbol_file_object (from_ttyp)
     return 0;	/* failed somehow... */
 
 #if defined (HAVE_STRUCT_LINK_MAP32)
-  if (bfd_elf_get_arch_size (exec_bfd) == 32)
+  if (bfd_get_arch_size (exec_bfd) == 32)
     {
       struct link_map32 lmcopy;
       /* Read from target memory to GDB.  */
@@ -1257,7 +1257,7 @@ current_sos (void)
       new->lmaddr = lm;
 
 #if defined (HAVE_STRUCT_LINK_MAP32)
-      if (bfd_elf_get_arch_size (exec_bfd) == 32)
+      if (bfd_get_arch_size (exec_bfd) == 32)
 	read_memory (lm, (char *) &(new->lm32), sizeof (struct link_map32));
       else
 #endif