Fix build with -DDEBUG=7

5 files changed, 24 insertions, 12 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c21a0f9..39a5c98 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,6 +1,18 @@
+2010-10-08  Pierre Muller  <muller@ics.u-strasbg.fr>
+	    Alan Modra  <amodra@gmail.com>
+
+	Fix build with -DDEBUG=7
+	* elf.c (_bfd_elf_symbol_from_bfd_symbol): Remove call
+	to deleted function elf_symbol_flags.  Add typecast to avoid warning.
+	* elf32-rx.c (dump_symbol) : Rename to..
+	(rx_dump_symbol): ..this to avoid link errors.
+	* elflink.c (elf_link_input_bfd): Add typecast to avoid warnings.
+	(bfd_elf_perform_complex_relocation): Likewise.
+	* elf32-xtensa.c (print_action_list): Likewise.
+
 2010-10-06  Nathan Sidwell  <nathan@codesourcery.com>
 
-	* elf32-arm.c (elf32_arm_stub_long_branch_any_arm_pic, 
+	* elf32-arm.c (elf32_arm_stub_long_branch_any_arm_pic,
 	elf32_arm_stub_long_branch_any_arm_pic): Use a consistent name for
 	ip/r12.
 	(arm_type_of_stub): Remove superfluous braces.
@@ -240,7 +252,6 @@
 
 2010-09-09  Bernd Schmidt  <bernds@codesourcery.com>
 
-	bfd/
 	* elflink.c (bfd_elf_final_link): Correct calculation of
 	max_external_reloc_size.
 
diff --git a/bfd/elf.c b/bfd/elf.c
index 85d4c18..4df0007 100644
--- a/bfd/elf.c
+++ b/bfd/elf.c
@@ -5217,9 +5217,8 @@ _bfd_elf_symbol_from_bfd_symbol (bfd *abfd, asymbol **asym_ptr_ptr)
 #if DEBUG & 4
   {
     fprintf (stderr,
-	     "elf_symbol_from_bfd_symbol 0x%.8lx, name = %s, sym num = %d, flags = 0x%.8lx%s\n",
-	     (long) asym_ptr, asym_ptr->name, idx, flags,
-	     elf_symbol_flags (flags));
+	     "elf_symbol_from_bfd_symbol 0x%.8lx, name = %s, sym num = %d, flags = 0x%.8lx\n",
+	     (long) asym_ptr, asym_ptr->name, idx, (long) flags);
     fflush (stderr);
   }
 #endif
diff --git a/bfd/elf32-rx.c b/bfd/elf32-rx.c
index 7d9dbc1..4b31a35 100644
--- a/bfd/elf32-rx.c
+++ b/bfd/elf32-rx.c
@@ -29,7 +29,7 @@
 
 #ifdef DEBUG
 char * rx_get_reloc (long);
-void dump_symtab (bfd *, void *, void *);
+void rx_dump_symtab (bfd *, void *, void *);
 #endif
 
 #define RXREL(n,sz,bit,shift,complain,pcrel)				     \
@@ -2962,7 +2962,7 @@ rx_elf_object_p (bfd * abfd)
 
 #ifdef DEBUG
 void
-dump_symtab (bfd * abfd, void * internal_syms, void * external_syms)
+rx_dump_symtab (bfd * abfd, void * internal_syms, void * external_syms)
 {
   size_t locsymcount;
   Elf_Internal_Sym * isymbuf;
diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c
index f9ecde5..6cd396a 100644
--- a/bfd/elf32-xtensa.c
+++ b/bfd/elf32-xtensa.c
@@ -5710,7 +5710,7 @@ print_action_list (FILE *fp, text_action_list *action_list)
 
       fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n",
 	       r->sec->owner->filename,
-	       r->sec->name, r->offset, t, r->removed_bytes);
+	       r->sec->name, (unsigned long) r->offset, t, r->removed_bytes);
     }
 }
 
diff --git a/bfd/elflink.c b/bfd/elflink.c
index 2c45649..cda897e 100644
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -7884,7 +7884,8 @@ bfd_elf_perform_complex_relocation (bfd *input_bfd,
 	  "chunksz %ld, start %ld, len %ld, oplen %ld\n"
 	  "    dest: %8.8lx, mask: %8.8lx, reloc: %8.8lx\n",
 	  lsb0_p, signed_p, trunc_p, wordsz, chunksz, start, len,
-	  oplen, x, mask,  relocation);
+	  oplen, (unsigned long) x, (unsigned long) mask,
+	  (unsigned long) relocation);
 #endif
 
   r = bfd_reloc_ok;
@@ -7904,8 +7905,8 @@ bfd_elf_perform_complex_relocation (bfd *input_bfd,
 	  "         shifted mask: %8.8lx\n"
 	  " shifted/masked reloc: %8.8lx\n"
 	  "               result: %8.8lx\n",
-	  relocation, (mask << shift),
-	  ((relocation & mask) << shift), x);
+	  (unsigned long) relocation, (unsigned long) (mask << shift),
+	  (unsigned long) ((relocation & mask) << shift), (unsigned long) x);
 #endif
   /* FIXME: octets_per_byte.  */
   put_value (wordsz, chunksz, input_bfd, x, contents + rel->r_offset);
@@ -9464,7 +9465,8 @@ elf_link_input_bfd (struct elf_final_link_info *finfo, bfd *input_bfd)
 #ifdef DEBUG
 		  printf ("Encountered a complex symbol!");
 		  printf (" (input_bfd %s, section %s, reloc %ld\n",
-			  input_bfd->filename, o->name, rel - internal_relocs);
+			  input_bfd->filename, o->name,
+			  (long) (rel - internal_relocs));
 		  printf (" symbol: idx  %8.8lx, name %s\n",
 			  r_symndx, sym_name);
 		  printf (" reloc : info %8.8lx, addr %8.8lx\n",