* Many files: Changes to avoid gcc warnings: Remove unused local

	variables.  Add default case to enum switches.
	* coff-arm.c (bfd_arm_allocate_interworking_sections): Only
	compile if not COFF_IMAGE_WITH_PE.
	(record_arm_to_thumb_glue, record_thumb_to_arm_glue): Likewise.
	(bfd_arm_get_bfd_for_interworking): Likewise.
	(bfd_arm_process_before_allocation): Likewise.
	* epoc-pei-arm.c: Don't rename bfd_arm functions.
	* pei-arm.c: Likewise.
	* elf32-mips.c (mips_elf_link_hash_table_create): Don't declare.
	(MIPS_ELF_ADD_DYNAMIC_ENTRY): Correct last change.
	(mips_elf_got16_entry): Put parens around & in body of ==.
	(mips_elf_calculate_relocation): Correct test for empty string.
	* vms-gsd.c: Use _bfd_error_handler rather than fprintf to
	stderr.
	* vms-misc.c (_bfd_vms_length_hash_symbol): Correct sprintf
	format.

22 files changed, 84 insertions, 80 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index c3b0f7b..e6ccff9 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,23 @@
+1999-07-12  Ian Lance Taylor  <ian@zembu.com>
+
+	* Many files: Changes to avoid gcc warnings: Remove unused local
+	variables.  Add default case to enum switches.
+	* coff-arm.c (bfd_arm_allocate_interworking_sections): Only
+	compile if not COFF_IMAGE_WITH_PE.
+	(record_arm_to_thumb_glue, record_thumb_to_arm_glue): Likewise.
+	(bfd_arm_get_bfd_for_interworking): Likewise.
+	(bfd_arm_process_before_allocation): Likewise.
+	* epoc-pei-arm.c: Don't rename bfd_arm functions.
+	* pei-arm.c: Likewise.
+	* elf32-mips.c (mips_elf_link_hash_table_create): Don't declare.
+	(MIPS_ELF_ADD_DYNAMIC_ENTRY): Correct last change.
+	(mips_elf_got16_entry): Put parens around & in body of ==.
+	(mips_elf_calculate_relocation): Correct test for empty string.
+	* vms-gsd.c: Use _bfd_error_handler rather than fprintf to
+	stderr.
+	* vms-misc.c (_bfd_vms_length_hash_symbol): Correct sprintf
+	format.
+
 1999-07-11  Ian Lance Taylor  <ian@zembu.com>
 
 	* Many files: Changes to avoid gcc warnings: Add ATTRIBUTE_UNUSED
diff --git a/bfd/coff-arm.c b/bfd/coff-arm.c
index adc57fd..f5ecf95 100644
--- a/bfd/coff-arm.c
+++ b/bfd/coff-arm.c
@@ -89,10 +89,12 @@ static struct coff_link_hash_entry * find_thumb_glue
   PARAMS ((struct bfd_link_info *, CONST char *, bfd *));
 static struct coff_link_hash_entry * find_arm_glue
   PARAMS ((struct bfd_link_info *, CONST char *, bfd *));
+#ifndef COFF_IMAGE_WITH_PE
 static void record_arm_to_thumb_glue
   PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *));
 static void record_thumb_to_arm_glue
   PARAMS ((struct bfd_link_info *, struct coff_link_hash_entry *));
+#endif
 static boolean coff_arm_merge_private_bfd_data
   PARAMS ((bfd *, bfd *));
 static boolean coff_arm_print_private_bfd_data
@@ -1604,9 +1606,8 @@ coff_arm_relocate_section (output_bfd, info, input_bfd, input_section,
   return true;
 }
 
-#ifdef COFF_IMAGE_WITH_PE
-static
-#endif
+#ifndef COFF_IMAGE_WITH_PE
+
 boolean
 bfd_arm_allocate_interworking_sections (info) 
      struct bfd_link_info * info;
@@ -1793,9 +1794,7 @@ record_thumb_to_arm_glue (info, h)
 /* Select a BFD to be used to hold the sections used by the glue code.
    This function is called from the linker scripts in ld/emultempl/
    {armcoff/pe}.em  */
-#ifdef COFF_IMAGE_WITH_PE
-static
-#endif
+
 boolean
 bfd_arm_get_bfd_for_interworking (abfd, info)
      bfd * 		    abfd;
@@ -1851,9 +1850,6 @@ bfd_arm_get_bfd_for_interworking (abfd, info)
   return true;
 }
 
-#ifdef COFF_IMAGE_WITH_PE
-static
-#endif
 boolean
 bfd_arm_process_before_allocation (abfd, info, support_old_code)
      bfd *                   abfd;
@@ -1961,6 +1957,8 @@ bfd_arm_process_before_allocation (abfd, info, support_old_code)
   return true;
 }
 
+#endif /* ! defined (COFF_IMAGE_WITH_PE) */
+
 #define coff_bfd_reloc_type_lookup 		coff_arm_reloc_type_lookup
 #define coff_relocate_section 			coff_arm_relocate_section
 #define coff_bfd_is_local_label_name 		coff_arm_is_local_label_name
diff --git a/bfd/coff-mcore.c b/bfd/coff-mcore.c
index c0efebf..340542e 100644
--- a/bfd/coff-mcore.c
+++ b/bfd/coff-mcore.c
@@ -1,6 +1,5 @@
 /* BFD back-end for Motorolla MCore COFF/PE
-   Copyright 1999
-   Free Software Foundation, Inc.
+   Copyright 1999 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -397,8 +396,6 @@ coff_mcore_relocate_section (output_bfd, info, input_bfd, input_section,
   
   for (; rel < relend; rel++)
     {
-      asection *                     toc_section = NULL;
-      bfd_vma                        relocation;
       long                           symndx;
       struct internal_syment *       sym;
       bfd_vma                        val;
diff --git a/bfd/elf-m10300.c b/bfd/elf-m10300.c
index 9ba09a8..53092f6 100644
--- a/bfd/elf-m10300.c
+++ b/bfd/elf-m10300.c
@@ -1,5 +1,5 @@
 /* Matsushita 10300 specific support for 32-bit ELF
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -407,6 +407,9 @@ mn10300_elf_gc_mark_hook (abfd, info, rel, h, sym)
 
 	    case bfd_link_hash_common:
 	      return h->root.u.c.p->section;
+
+	    default:
+	      break;
 	    }
 	}
     }
@@ -849,7 +852,6 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 	      asection *sym_sec;
 	      const char *sym_name;
 	      char *new_name;
-	      Elf_Internal_Shdr *hdr;
 
 	      /* Get cached copy of section contents if it exists.  */
 	      if (elf_section_data (section)->this_hdr.contents != NULL)
@@ -1193,7 +1195,6 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 		  struct elf32_mn10300_link_hash_entry *sym_hash;
 		  asection *sym_sec;
 		  const char *sym_name;
-		  Elf_Internal_Shdr *hdr;
 		  char *new_name;
 
 		  bfd_elf32_swap_symbol_in (input_bfd, esym, &isym);
@@ -1461,7 +1462,6 @@ mn10300_elf_relax_section (abfd, sec, link_info, again)
 	{
 	  Elf_Internal_Sym isym;
 	  asection *sym_sec;
-	  Elf_Internal_Shdr *hdr;
 	  const char *sym_name;
 	  char *new_name;
 
@@ -2738,10 +2738,6 @@ _bfd_mn10300_elf_final_write_processing (abfd, linker)
      boolean linker;
 {
   unsigned long val;
-  unsigned int i;
-  Elf_Internal_Shdr **hdrpp;
-  const char *name;
-  asection *sec;
 
   switch (bfd_get_mach (abfd))
     {
diff --git a/bfd/elf32-arm.h b/bfd/elf32-arm.h
index ce2eea7..d83ae77 100644
--- a/bfd/elf32-arm.h
+++ b/bfd/elf32-arm.h
@@ -625,7 +625,6 @@ bfd_elf32_arm_process_before_allocation (abfd, link_info, no_pipeline_knowledge)
 	{
 	  long r_type;
 	  unsigned long r_index;
-	  unsigned char code;
 
 	  struct elf_link_hash_entry *h;
 
@@ -1301,7 +1300,6 @@ elf32_arm_final_link_relocate (howto, input_bfd, output_bfd,
 	boolean        overflow = false;
 	bfd_vma        upper_insn = bfd_get_16 (input_bfd, hit_data);
 	bfd_vma        lower_insn = bfd_get_16 (input_bfd, hit_data + 2);
-	bfd_vma        src_mask = 0x007FFFFE;
 	bfd_signed_vma reloc_signed_max = (1 << (howto->bitsize - 1)) - 1;
 	bfd_signed_vma reloc_signed_min = ~ reloc_signed_max;
 	bfd_vma        check;
@@ -2068,6 +2066,9 @@ elf32_arm_gc_mark_hook (abfd, info, rel, h, sym)
 
           case bfd_link_hash_common:
             return h->root.u.c.p->section;
+
+	  default:
+	    break;
           }
        }
      }
diff --git a/bfd/elf32-d10v.c b/bfd/elf32-d10v.c
index be80bae..07f120e 100644
--- a/bfd/elf32-d10v.c
+++ b/bfd/elf32-d10v.c
@@ -1,5 +1,5 @@
 /* D10V-specific support for 32-bit ELF
-   Copyright (C) 1996 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1998, 1999 Free Software Foundation, Inc.
    Contributed by Martin Hunt (hunt@cygnus.com).
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -267,6 +267,9 @@ elf32_d10v_gc_mark_hook (abfd, info, rel, h, sym)
 
           case bfd_link_hash_common:
             return h->root.u.c.p->section;
+
+	  default:
+	    break;
           }
        }
      }
diff --git a/bfd/elf32-fr30.c b/bfd/elf32-fr30.c
index 7c8725f..39bde5f 100644
--- a/bfd/elf32-fr30.c
+++ b/bfd/elf32-fr30.c
@@ -1,5 +1,5 @@
 /* FR30-specific support for 32-bit ELF.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -703,6 +703,9 @@ fr30_elf_gc_mark_hook (abfd, info, rel, h, sym)
 
 	    case bfd_link_hash_common:
 	      return h->root.u.c.p->section;
+
+	    default:
+	      break;
 	    }
 	}
     }
diff --git a/bfd/elf32-hppa.c b/bfd/elf32-hppa.c
index c8d20cd..1877008 100644
--- a/bfd/elf32-hppa.c
+++ b/bfd/elf32-hppa.c
@@ -1,5 +1,5 @@
 /* BFD back-end for HP PA-RISC ELF files.
-   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 1997
+   Copyright (C) 1990, 91, 92, 93, 94, 95, 96, 97, 98, 1999
    Free Software Foundation, Inc.
 
    Written by
@@ -636,7 +636,7 @@ elf32_hppa_bfd_final_link_relocate (howto, input_bfd, output_bfd,
     case R_PARISC_PCREL17F:
       {
 	bfd_vma location;
-	unsigned int len, caller_args, callee_args;
+	unsigned int len;
 	char *new_name, *stub_name;
 
 	/* Get the field selector right.  We'll need it in a minute.  */
@@ -986,8 +986,7 @@ elf32_hppa_size_stubs (stub_bfd, output_bfd, link_info)
   bfd *input_bfd;
   asection *section, *stub_sec = 0;
   Elf_Internal_Shdr *symtab_hdr;
-  Elf_Internal_Sym *local_syms, *isym, **all_local_syms;
-  Elf32_External_Sym *ext_syms, *esym;
+  Elf_Internal_Sym *local_syms, **all_local_syms;
   unsigned int i, index, bfd_count = 0;
   struct elf32_hppa_stub_hash_table *stub_hash_table = 0;
 
diff --git a/bfd/elf32-m32r.c b/bfd/elf32-m32r.c
index b2f8523..7a9f8eb 100644
--- a/bfd/elf32-m32r.c
+++ b/bfd/elf32-m32r.c
@@ -1958,6 +1958,9 @@ m32r_elf_gc_mark_hook (abfd, info, rel, h, sym)
  
           case bfd_link_hash_common:
             return h->root.u.c.p->section;
+
+	  default:
+	    break;
           }
        }
      }
diff --git a/bfd/elf32-m68k.c b/bfd/elf32-m68k.c
index 23ecf36..c7ca785 100644
--- a/bfd/elf32-m68k.c
+++ b/bfd/elf32-m68k.c
@@ -2087,7 +2087,6 @@ elf_m68k_finish_dynamic_sections (output_bfd, info)
   bfd *dynobj;
   asection *sgot;
   asection *sdyn;
-  int plt_entry0_size, plt_off1, plt_off2;
 
   dynobj = elf_hash_table (info)->dynobj;
 
diff --git a/bfd/elf32-mcore.c b/bfd/elf32-mcore.c
index fe0ddc5..b549743 100644
--- a/bfd/elf32-mcore.c
+++ b/bfd/elf32-mcore.c
@@ -320,7 +320,6 @@ mcore_elf_merge_private_bfd_data (ibfd, obfd)
 {
   flagword old_flags;
   flagword new_flags;
-  boolean error;
 
   /* Check if we have the same endianess */
   if (   ibfd->xvec->byteorder != obfd->xvec->byteorder
@@ -426,7 +425,6 @@ mcore_elf_relocate_section (output_bfd, info, input_bfd, input_section,
   Elf_Internal_Rela *           rel = relocs;
   Elf_Internal_Rela *           relend = relocs + input_section->reloc_count;
   boolean ret = true;
-  long insn;
 
 #ifdef DEBUG
   fprintf (stderr,
@@ -643,6 +641,9 @@ mcore_elf_gc_mark_hook (abfd, info, rel, h, sym)
 	      
 	    case bfd_link_hash_common:
 	      return h->root.u.c.p->section;
+
+	    default:
+	      break;
 	    }
 	}
     }
diff --git a/bfd/elf32-mips.c b/bfd/elf32-mips.c
index 99833b7..0917d83 100644
--- a/bfd/elf32-mips.c
+++ b/bfd/elf32-mips.c
@@ -118,8 +118,6 @@ static boolean mips_elf_is_local_label_name
   PARAMS ((bfd *, const char *));
 static struct bfd_hash_entry *mips_elf_link_hash_newfunc
   PARAMS ((struct bfd_hash_entry *, struct bfd_hash_table *, const char *));
-static struct bfd_link_hash_table *mips_elf_link_hash_table_create
-  PARAMS ((bfd *));
 static int gptab_compare PARAMS ((const void *, const void *));
 static void mips_elf_relocate_hi16
   PARAMS ((bfd *, Elf_Internal_Rela *, Elf_Internal_Rela *, bfd_byte *,
@@ -277,8 +275,8 @@ typedef enum {
 #else
 #define MIPS_ELF_ADD_DYNAMIC_ENTRY(info, tag, val) \
   (ABI_64_P (elf_hash_table (info)->dynobj)	   \
-   : (abort (), false)                             \
-   ? bfd_elf32_add_dynamic_entry (info, tag, val))
+   ? (abort (), false)                             \
+   : bfd_elf32_add_dynamic_entry (info, tag, val))
 #endif
 
 /* The number of local .got entries we reserve.  */
@@ -5227,7 +5225,6 @@ mips_elf_got_offset_from_index (dynobj, output_bfd, index)
 {
   asection *sgot;
   bfd_vma gp;
-  char *error_message;
 
   sgot = mips_elf_got_section (dynobj);
   gp = _bfd_get_gp_value (output_bfd);
@@ -5476,7 +5473,7 @@ mips_elf_got16_entry (abfd, info, value)
        entry += MIPS_ELF_GOT_SIZE (abfd))
     {
       address = MIPS_ELF_GET_WORD (abfd, entry);
-      if (address & 0xffff0000 == value)
+      if ((address & 0xffff0000) == value)
 	{
 	  /* This entry has the right high-order 16 bits.  */
 	  index = MIPS_ELF_GOT_SIZE (abfd) * (entry - sgot->contents);
@@ -5748,7 +5745,7 @@ mips_elf_calculate_relocation (abfd,
       *namep = bfd_elf_string_from_elf_section (input_bfd,
 						symtab_hdr->sh_link,
 						sym->st_name);
-      if (*namep = '\0')
+      if (*namep == '\0')
 	*namep = bfd_section_name (input_bfd, sec);
     }
   else
@@ -6168,7 +6165,6 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
   const Elf_Internal_Rela *relend;
   bfd_vma addend;
   bfd_vma last_hi16_addend;
-  boolean next_relocation_for_same_address_p = false;
   boolean use_saved_addend_p = false;
   boolean last_hi16_addend_valid_p = false;
   struct elf_backend_data *bed;
@@ -6179,7 +6175,6 @@ _bfd_mips_elf_relocate_section (output_bfd, info, input_bfd, input_section,
     {
       const char *name;
       bfd_vma value;
-      int result;
       reloc_howto_type *howto;
 
       /* Find the relocation howto for this relocation.  */
@@ -7630,7 +7625,6 @@ _bfd_mips_elf_size_dynamic_sections (output_bfd, info)
      other dynamic symbol.  */
   {
     unsigned int c, i;
-    struct mips_got_info *g;
 
     c = 0;
     if (elf_hash_table (info)->dynamic_sections_created)
diff --git a/bfd/elf32-sh.c b/bfd/elf32-sh.c
index 0779e8a..3491874 100644
--- a/bfd/elf32-sh.c
+++ b/bfd/elf32-sh.c
@@ -1,5 +1,5 @@
 /* Hitachi SH specific support for 32-bit ELF
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
    Contributed by Ian Lance Taylor, Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -1999,6 +1999,9 @@ sh_elf_gc_mark_hook (abfd, info, rel, h, sym)
 
           case bfd_link_hash_common:
             return h->root.u.c.p->section;
+
+	  default:
+	    break;
           }
        }
      }
diff --git a/bfd/elf32-sparc.c b/bfd/elf32-sparc.c
index f02702c..d089d13 100644
--- a/bfd/elf32-sparc.c
+++ b/bfd/elf32-sparc.c
@@ -631,6 +631,9 @@ elf32_sparc_gc_mark_hook (abfd, info, rel, h, sym)
 
           case bfd_link_hash_common:
             return h->root.u.c.p->section;
+
+	  default:
+	    break;
           }
        }
      }
diff --git a/bfd/elf32-v850.c b/bfd/elf32-v850.c
index 4ca60e8..9480b0a 100644
--- a/bfd/elf32-v850.c
+++ b/bfd/elf32-v850.c
@@ -1,5 +1,5 @@
 /* V850-specific support for 32-bit ELF
-   Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -797,7 +797,6 @@ find_remembered_hi16s_reloc (addend, already_found)
   hi16s_location * entry;
   hi16s_location * previous = NULL;
   hi16s_location * prev;
-  int              i;
   bfd_byte *       addr;
   
   /* Search the table.  Record the most recent entry that matches.  */
@@ -1751,6 +1750,9 @@ v850_elf_gc_mark_hook (abfd, info, rel, h, sym)
 
           case bfd_link_hash_common:
             return h->root.u.c.p->section;
+
+	  default:
+	    break;
           }
        }
      }
diff --git a/bfd/epoc-pei-arm.c b/bfd/epoc-pei-arm.c
index 69c4d8b..0f2548d 100644
--- a/bfd/epoc-pei-arm.c
+++ b/bfd/epoc-pei-arm.c
@@ -25,12 +25,5 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define TARGET_BIG_SYM       arm_epoc_pei_big_vec
 #define TARGET_BIG_NAME      "epoc-pei-arm-big"
 
-#define bfd_arm_allocate_interworking_sections \
-	bfd_arm_epoc_pe_allocate_interworking_sections
-#define bfd_arm_get_bfd_for_interworking \
-	bfd_arm_epoc_pe_get_bfd_for_interworking
-#define bfd_arm_process_before_allocation \
-	bfd_arm_epoc_pe_process_before_allocation
-
 #include "pei-arm.c"
 
diff --git a/bfd/pei-arm.c b/bfd/pei-arm.c
index b04214a..4ba5b3a 100644
--- a/bfd/pei-arm.c
+++ b/bfd/pei-arm.c
@@ -33,13 +33,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #define PCRELOFFSET        true
 #define COFF_LONG_SECTION_NAMES
 
-#ifndef bfd_arm_allocate_interworking_sections 
-#define bfd_arm_allocate_interworking_sections \
-	bfd_arm_pe_allocate_interworking_sections
-#define bfd_arm_get_bfd_for_interworking \
-	bfd_arm_pe_get_bfd_for_interworking
-#define bfd_arm_process_before_allocation \
-	bfd_arm_pe_process_before_allocation
-#endif
-	
 #include "coff-arm.c"
diff --git a/bfd/vms-gsd.c b/bfd/vms-gsd.c
index 6a52462..f5a2b1f 100644
--- a/bfd/vms-gsd.c
+++ b/bfd/vms-gsd.c
@@ -1,6 +1,6 @@
 /* vms-gsd.c -- BFD back-end for VAX (openVMS/VAX) and
    EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998 Free Software Foundation Inc.
+   Copyright 1996, 1997, 1998, 1999 Free Software Foundation Inc.
 
    go and read the openVMS linker manual (esp. appendix B)
    if you don't know what's going on here :-)
@@ -354,7 +354,8 @@ _bfd_vms_slurp_gsd (abfd, objtype)
 	      section = bfd_make_section (abfd, name);
 	      if (!section)
 		{
-		  fprintf (stderr, "bfd_make_section (%s) failed\n", name);
+		  (*_bfd_error_handler) (_("bfd_make_section (%s) failed"),
+					 name);
 		  return -1;
 		}
 	      old_flags = bfd_getl16 (vms_rec + 2);
@@ -366,7 +367,9 @@ _bfd_vms_slurp_gsd (abfd, objtype)
 		new_flags |= SEC_IS_COMMON;
 	      if (!bfd_set_section_flags (abfd, section, new_flags))
 		{
-		  fprintf (stderr, "bfd_set_section_flags (%s, %x) failed\n", name, new_flags);
+		  (*_bfd_error_handler)
+		    (_("bfd_set_section_flags (%s, %x) failed"),
+		     name, new_flags);
 		  return -1;
 		}
 	      section->alignment_power = vms_rec[1];
@@ -400,7 +403,12 @@ _bfd_vms_slurp_gsd (abfd, objtype)
 		  section->contents = old_section->contents;
 		  if (section->_raw_size < old_section->_raw_size)
 		    {
-		      fprintf (stderr, "Size mismatch section %s=%d, %s=%d\n", old_section->name, old_section->_raw_size, section->name, section->_raw_size);
+		      (*_bfd_error_handler)
+			(_("Size mismatch section %s=%lx, %s=%lx"),
+			 old_section->name,
+			 (unsigned long) old_section->_raw_size,
+			 section->name,
+			 (unsigned long) section->_raw_size);
 		      return -1;
 		    }
 		  else if (section->_raw_size > old_section->_raw_size)
@@ -725,7 +733,6 @@ _bfd_vms_write_gsd (abfd, objtype)
   char dummy_name[10];
   char *sname;
   flagword new_flags, old_flags;
-  char *nptr, *uptr;
 
 #if VMS_DEBUG
   vms_debug (2, "vms_write_gsd (%p, %d)\n", abfd, objtype);
diff --git a/bfd/vms-hdr.c b/bfd/vms-hdr.c
index 01d20aa..e4ee546 100644
--- a/bfd/vms-hdr.c
+++ b/bfd/vms-hdr.c
@@ -1,6 +1,6 @@
 /* vms-hdr.c -- BFD back-end for VMS/VAX (openVMS/VAX) and
    EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
    HDR record handling functions
    EMH record handling functions
@@ -334,8 +334,6 @@ _bfd_vms_write_hdr (abfd, objtype)
 
       if (symbol->flags & BSF_FILE)
 	{
-	  char *s;
-
 	  if (strncmp ((char *)symbol->name, "<CASE:", 6) == 0)
 	    {
 	      PRIV(flag_hash_long_names) = symbol->name[6] - '0';
diff --git a/bfd/vms-misc.c b/bfd/vms-misc.c
index 81b1fc8..94678da 100644
--- a/bfd/vms-misc.c
+++ b/bfd/vms-misc.c
@@ -1,6 +1,6 @@
 /* vms-misc.c -- Miscellaneous functions for VAX (openVMS/VAX) and
    EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
    Written by Klaus K"ampf (kkaempf@rmi.de)
 
@@ -1008,10 +1008,8 @@ _bfd_vms_length_hash_symbol (abfd, in, maxlen)
      const char *in;
      int maxlen;
 {
-  long int init;
   long int result;
   int in_len;
-  char *pnt = 0;
   char *new_name;
   const char *old_name;
   int i;
@@ -1055,7 +1053,7 @@ _bfd_vms_length_hash_symbol (abfd, in, maxlen)
 
   if ((in_len > maxlen)
       && PRIV(flag_hash_long_names))
-    sprintf (out, "_%08x", result);
+    sprintf (out, "_%08lx", result);
   else
     *out = 0;
 
diff --git a/bfd/vms-tir.c b/bfd/vms-tir.c
index 782f52b..6e5d97c 100644
--- a/bfd/vms-tir.c
+++ b/bfd/vms-tir.c
@@ -1,6 +1,6 @@
 /* vms-tir.c -- BFD back-end for VAX (openVMS/VAX) and
    EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
    TIR record handling functions
    ETIR record handling functions
@@ -949,8 +949,6 @@ alloc_section (abfd, idx)
      bfd *abfd;
      int idx;
 {
-  asection *section;
-
 #if VMS_DEBUG
   _bfd_vms_debug (4,  "alloc_section %d\n", idx);
 #endif
diff --git a/bfd/vms.c b/bfd/vms.c
index a5fc13a..2a009c9 100644
--- a/bfd/vms.c
+++ b/bfd/vms.c
@@ -1,6 +1,6 @@
 /* vms.c -- BFD back-end for VAX (openVMS/VAX) and
    EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
 
    Written by Klaus K"ampf (kkaempf@rmi.de)
 
@@ -357,8 +357,6 @@ static boolean
 vms_fixup_sections (abfd)
      bfd *abfd;
 {
-  asection *s;
-
   if (PRIV(fixup_done))
     return true;
 
@@ -646,7 +644,6 @@ vms_close_and_cleanup (abfd)
 {
   asection *sec;
   vms_section *es, *es1;
-  vms_reloc *er, *er1;
   int i;
 
 #if VMS_DEBUG