Help stupid cvs fixing basic conflicts.

1 files changed, 8 insertions, 7 deletions

diff --git a/gnu/usr.bin/binutils/bfd/sparclynx.c b/gnu/usr.bin/binutils/bfd/sparclynx.c
index 0885620283e..dbfcae55cbe 100644
--- a/gnu/usr.bin/binutils/bfd/sparclynx.c
+++ b/gnu/usr.bin/binutils/bfd/sparclynx.c
@@ -1,5 +1,6 @@
 /* BFD support for Sparc binaries under LynxOS.
-   Copyright (C) 1990, 1991, 1992, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1990, 91, 92, 93, 94, 95, 97, 1998
+   Free Software Foundation, Inc.
 
 This file is part of BFD, the Binary File Descriptor library.
 
@@ -91,19 +92,19 @@ NAME(lynx,set_arch_mach) (abfd, machtype)
       /* Some Sun3s make magic numbers without cpu types in them, so
 	 we'll default to the 68000. */
       arch = bfd_arch_m68k;
-      machine = 68000;
+      machine = bfd_mach_m68000;
       break;
 
     case M_68010:
     case M_HP200:
       arch = bfd_arch_m68k;
-      machine = 68010;
+      machine = bfd_mach_m68010;
       break;
 
     case M_68020:
     case M_HP300:
       arch = bfd_arch_m68k;
-      machine = 68020;
+      machine = bfd_mach_m68020;
       break;
 
     case M_SPARC:
@@ -173,11 +174,11 @@ NAME(aout,sparclynx_write_object_contents) (abfd)
     case bfd_arch_m68k:
       switch (bfd_get_mach (abfd))
 	{
-	case 68010:
+	case bfd_mach_m68010:
 	  N_SET_MACHTYPE (*execp, M_68010);
 	  break;
 	default:
-	case 68020:
+	case bfd_mach_m68020:
 	  N_SET_MACHTYPE (*execp, M_68020);
 	  break;
 	}
@@ -228,7 +229,7 @@ sparclynx_set_sizes (abfd)
 
 static CONST struct aout_backend_data sparclynx_aout_backend =
 {
-  0, 1, 1, 0, sparclynx_set_sizes, 0,
+  0, 1, 0, 1, 0, sparclynx_set_sizes, 0,
   0,				/* add_dynamic_symbols */
   0,				/* add_one_symbol */
   0,				/* link_dynamic_object */