* libelf.h (struct elf_size_info): Change type of last argument to

	swap_symbol_out from char * to PTR.
	(bfd_elf32_swap_symbol_out): Update declaration.
	(bfd_elf64_swap_symbol_out): Likewise.
	* elfcode.h (elf_swap_symbol_out): Change type of cdst from char *
	to PTR.
	* elf.c (swap_out_syms): Cast to PTR, not char *, when calling
	swap_symbol_out routine.
	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Likewise.
	(elf_link_output_sym): Likewise.
	(elf_link_output_extsym): Likewise.
	* elf32-sparc.c (elf32_sparc_finish_dynamic_sections): Likewise.

4 files changed, 25 insertions, 9 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 9168147..1edcab8 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,18 @@
+Tue Jul 11 15:19:53 1995  Ian Lance Taylor  <ian@cygnus.com>
+
+	* libelf.h (struct elf_size_info): Change type of last argument to
+	swap_symbol_out from char * to PTR.
+	(bfd_elf32_swap_symbol_out): Update declaration.
+	(bfd_elf64_swap_symbol_out): Likewise.
+	* elfcode.h (elf_swap_symbol_out): Change type of cdst from char *
+	to PTR.
+	* elf.c (swap_out_syms): Cast to PTR, not char *, when calling
+	swap_symbol_out routine.
+	* elflink.h (NAME(bfd_elf,size_dynamic_sections)): Likewise.
+	(elf_link_output_sym): Likewise.
+	(elf_link_output_extsym): Likewise.
+	* elf32-sparc.c (elf32_sparc_finish_dynamic_sections): Likewise.
+
 Tue Jul 11 12:29:49 1995  Rick Sladkey  <jrs@world.std.com>
 
 	* elf.c (_bfd_elf_find_nearest_line): Handle the simple case where
diff --git a/bfd/elf.c b/bfd/elf.c
index b49d9a3..f36d490 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -2323,7 +2323,7 @@ swap_out_syms (abfd, sttp)
       sym.st_info = 0;
       sym.st_other = 0;
       sym.st_shndx = SHN_UNDEF;
-      bed->s->swap_symbol_out (abfd, &sym, outbound_syms);
+      bed->s->swap_symbol_out (abfd, &sym, (PTR) outbound_syms);
       outbound_syms += bed->s->sizeof_sym;
     }
     for (idx = 0; idx < symcount; idx++)
@@ -2423,7 +2423,7 @@ swap_out_syms (abfd, sttp)
 	  }
 
 	sym.st_other = 0;
-	bed->s->swap_symbol_out (abfd, &sym, outbound_syms);
+	bed->s->swap_symbol_out (abfd, &sym, (PTR) outbound_syms);
 	outbound_syms += bed->s->sizeof_sym;
       }
 
diff --git a/bfd/elflink.h b/bfd/elflink.h
index b9cb000..3e7ef78 100644
--- a/bfd/elflink.h
+++ b/bfd/elflink.h
@@ -1364,7 +1364,7 @@ NAME(bfd_elf,size_dynamic_sections) (output_bfd, soname, rpath,
       isym.st_other = 0;
       isym.st_shndx = 0;
       elf_swap_symbol_out (output_bfd, &isym,
-			   (char *) (Elf_External_Sym *) s->contents);
+			   (PTR) (Elf_External_Sym *) s->contents);
 
       for (i = 0; elf_buckets[i] != 0; i++)
 	{
@@ -2289,7 +2289,7 @@ elf_link_output_sym (finfo, name, elfsym, input_sec)
     }
 
   elf_swap_symbol_out (finfo->output_bfd, elfsym,
-		       (char *) (finfo->symbuf + finfo->symbuf_count));
+		       (PTR) (finfo->symbuf + finfo->symbuf_count));
   ++finfo->symbuf_count;
 
   ++finfo->output_bfd->symcount;
@@ -2479,8 +2479,9 @@ elf_link_output_extsym (h, data)
 	}
 
       elf_swap_symbol_out (finfo->output_bfd, &sym,
-			   (char *) ((Elf_External_Sym *) finfo->dynsym_sec->contents
-				     + h->dynindx));
+			   (PTR) (((Elf_External_Sym *)
+				   finfo->dynsym_sec->contents)
+				  + h->dynindx));
 
       bucketcount = elf_hash_table (finfo->info)->bucketcount;
       bucket = (bfd_elf_hash ((const unsigned char *) h->root.root.string)
diff --git a/bfd/libelf.h b/bfd/libelf.h
index 463619c..52a60ba 100644
--- a/bfd/libelf.h
+++ b/bfd/libelf.h
@@ -179,7 +179,7 @@ struct elf_size_info {
   int (*write_out_phdrs) PARAMS ((bfd *, Elf_Internal_Phdr *, int));
   boolean (*write_shdrs_and_ehdr) PARAMS ((bfd *));
   void (*write_relocs) PARAMS ((bfd *, asection *, PTR));
-  void (*swap_symbol_out) PARAMS ((bfd *, Elf_Internal_Sym *, char *));
+  void (*swap_symbol_out) PARAMS ((bfd *, Elf_Internal_Sym *, PTR));
   boolean (*slurp_reloc_table) PARAMS ((bfd *, asection *, asymbol **));
   long (*slurp_symbol_table) PARAMS ((bfd *, asymbol **, boolean));
 };
@@ -643,7 +643,7 @@ extern boolean bfd_elf32_bfd_final_link
 extern void bfd_elf32_swap_symbol_in
   PARAMS ((bfd *, Elf32_External_Sym *, Elf_Internal_Sym *));
 extern void bfd_elf32_swap_symbol_out
-  PARAMS ((bfd *, Elf_Internal_Sym *, char *));
+  PARAMS ((bfd *, Elf_Internal_Sym *, PTR));
 extern void bfd_elf32_swap_reloc_in
   PARAMS ((bfd *, Elf32_External_Rel *, Elf_Internal_Rel *));
 extern void bfd_elf32_swap_reloc_out
@@ -675,7 +675,7 @@ extern boolean bfd_elf64_bfd_final_link
 extern void bfd_elf64_swap_symbol_in
   PARAMS ((bfd *, Elf64_External_Sym *, Elf_Internal_Sym *));
 extern void bfd_elf64_swap_symbol_out
-  PARAMS ((bfd *, Elf_Internal_Sym *, Elf64_External_Sym *));
+  PARAMS ((bfd *, Elf_Internal_Sym *, PTR));
 extern void bfd_elf64_swap_reloc_in
   PARAMS ((bfd *, Elf64_External_Rel *, Elf_Internal_Rel *));
 extern void bfd_elf64_swap_reloc_out