diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3217b8418f..c14161efb8 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,10 @@
 2005-04-21  Andreas Schwab  <schwab@suse.de>
 
+	* elfxx-sparc.h (struct _bfd_sparc_elf_link_hash_table): Remove
+	unsigned from type of dynamic_interpreter.
+	* elfxx-sparc.c (_bfd_sparc_elf_link_hash_table_create): Remove
+	casts again.
+
 	* elf.c (assign_section_numbers): Fix comment.
 
 2005-04-21  Jerome Guitton  <guitton@gnat.com>
diff --git a/bfd/elfxx-sparc.c b/bfd/elfxx-sparc.c
index 0dacd4fc6d..e224d96162 100644
--- a/bfd/elfxx-sparc.c
+++ b/bfd/elfxx-sparc.c
@@ -778,8 +778,7 @@ _bfd_sparc_elf_link_hash_table_create (bfd *abfd)
       ret->align_power_max = 4;
       ret->bytes_per_word = 8;
       ret->bytes_per_rela = sizeof (Elf64_External_Rela);
-      ret->dynamic_interpreter =
-	(const unsigned char *) ELF64_DYNAMIC_INTERPRETER;
+      ret->dynamic_interpreter = ELF64_DYNAMIC_INTERPRETER;
       ret->dynamic_interpreter_size = sizeof ELF64_DYNAMIC_INTERPRETER;
     }
   else
@@ -796,8 +795,7 @@ _bfd_sparc_elf_link_hash_table_create (bfd *abfd)
       ret->align_power_max = 3;
       ret->bytes_per_word = 4;
       ret->bytes_per_rela = sizeof (Elf32_External_Rela);
-      ret->dynamic_interpreter =
-	(const unsigned char *) ELF32_DYNAMIC_INTERPRETER;
+      ret->dynamic_interpreter = ELF32_DYNAMIC_INTERPRETER;
       ret->dynamic_interpreter_size = sizeof ELF32_DYNAMIC_INTERPRETER;
     }
 
diff --git a/bfd/elfxx-sparc.h b/bfd/elfxx-sparc.h
index 5223ae7e7b..2ec8f808bc 100644
--- a/bfd/elfxx-sparc.h
+++ b/bfd/elfxx-sparc.h
@@ -66,7 +66,7 @@ struct _bfd_sparc_elf_link_hash_table
   bfd_vma (*r_info) (Elf_Internal_Rela *, bfd_vma, bfd_vma);
   bfd_vma (*r_symndx) (bfd_vma);
   int (*build_plt_entry) (bfd *, asection *, bfd_vma, bfd_vma, bfd_vma *);
-  const unsigned char *dynamic_interpreter;
+  const char *dynamic_interpreter;
   int dynamic_interpreter_size;
   unsigned int word_align_power;
   unsigned int align_power_max;