Wed Mar 25 13:59:24 1998 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>

* evax-alpha.c (evax_set_arch_mach): Only accept bfd_arch_alpha
	and call bfd_default_set_arch_mach to do the real work.

Wed Mar 25 13:59:05 1998  Ian Lance Taylor  <ian@cygnus.com>

	* evax-alpha.c (evax_close_and_cleanup): Remove unused local
	variables er and er1.

bfd/ChangeLog

@@ -1,3 +1,8 @@
+Wed Mar 25 13:59:24 1998  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+	* evax-alpha.c (evax_set_arch_mach): Only accept bfd_arch_alpha
+	and call bfd_default_set_arch_mach to do the real work.
+
 Wed Mar 25 10:41:35 1998  Richard Henderson  <rth@cygnus.com>
 
 	* bout.c (BALX): Include return register g14 as part of the insn.
@@ -6,6 +11,9 @@ Wed Mar 25 10:41:35 1998  Richard Henderson  <rth@cygnus.com>
 
 Wed Mar 25 11:19:28 1998  Ian Lance Taylor  <ian@cygnus.com>
 
+	* evax-alpha.c (evax_close_and_cleanup): Remove unused local
+	variables er and er1.
+
 	* cpu-v850.c: Include <ctype.h>.
 	(scan): Case isdigit argument to unsigned char.
 

bfd/evax-alpha.c

@@ -1,5 +1,5 @@
 /* evax-alpha.c -- BFD back-end for ALPHA EVAX (openVMS/Alpha) files.
-   Copyright 1996, 1997 Free Software Foundation, Inc.
+   Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
    Written by Klaus K"ampf (kkaempf@progis.de)
    of proGIS Softwareentwicklung, Aachen, Germany
 
@@ -513,7 +513,6 @@ evax_close_and_cleanup (abfd)
 {
   asection *sec;
   evax_section *es, *es1;
-  evax_reloc *er, *er1;
   int i;
 
 #if EVAX_DEBUG
@@ -1574,9 +1573,11 @@ evax_set_arch_mach (abfd, arch, mach)
 #if EVAX_DEBUG
   evax_debug (1, "evax_set_arch_mach(%p, %d, %ld)\n", abfd, arch, mach);
 #endif
-  abfd->arch_info = bfd_scan_arch("alpha");
+  if (arch != bfd_arch_alpha
+      && arch != bfd_arch_unknown)
+    return false;
 
-  return true;
+  return bfd_default_set_arch_mach (abfd, arch, mach);
 }