resolve conflicts.

1 files changed, 17 insertions, 23 deletions

diff --git a/gnu/usr.bin/binutils/bfd/cpu-h8500.c b/gnu/usr.bin/binutils/bfd/cpu-h8500.c
index eae42e3abf2..7b526ef3389 100644
--- a/gnu/usr.bin/binutils/bfd/cpu-h8500.c
+++ b/gnu/usr.bin/binutils/bfd/cpu-h8500.c
@@ -1,5 +1,5 @@
 /* BFD library support routines for the H8/500 architecture.
-   Copyright (C) 1993, 1994, 1995, 1999 Free Software Foundation, Inc.
+   Copyright 1993, 1995, 2000 Free Software Foundation, Inc.
    Hacked by Steve Chamberlain of Cygnus Support.
 
 This file is part of BFD, the Binary File Descriptor library.
@@ -24,11 +24,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #if 0
 
-/* 
+/*
 Relocations for the Z8K
 
 */
-static bfd_reloc_status_type 
+static bfd_reloc_status_type
 howto16_callback (abfd, reloc_entry, symbol_in, data,
 		  ignore_input_section, ignore_bfd)
      bfd *abfd;
@@ -40,18 +40,17 @@ howto16_callback (abfd, reloc_entry, symbol_in, data,
 {
   long relocation = 0;
   bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_16(abfd, (bfd_byte *)data + addr);
+  long x = bfd_get_16 (abfd, (bfd_byte *)data + addr);
 
   HOWTO_PREPARE(relocation, symbol_in);
 
   x = (x + relocation + reloc_entry->addend);
 
-  bfd_put_16(abfd, x, (bfd_byte *)data + addr);
+  bfd_put_16 (abfd, x, (bfd_byte *)data + addr);
   return bfd_reloc_ok;
 }
 
-
-static bfd_reloc_status_type 
+static bfd_reloc_status_type
 howto8_callback (abfd, reloc_entry, symbol_in, data,
 		 ignore_input_section, ignore_bfd)
      bfd *abfd;
@@ -63,18 +62,17 @@ howto8_callback (abfd, reloc_entry, symbol_in, data,
 {
   long relocation = 0;
   bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_8(abfd, (bfd_byte *)data + addr);
+  long x = bfd_get_8 (abfd, (bfd_byte *)data + addr);
 
   HOWTO_PREPARE(relocation, symbol_in);
 
   x = (x + relocation + reloc_entry->addend);
 
-  bfd_put_8(abfd, x, (bfd_byte *)data + addr);
+  bfd_put_8 (abfd, x, (bfd_byte *)data + addr);
   return bfd_reloc_ok;
 }
 
-
-static bfd_reloc_status_type 
+static bfd_reloc_status_type
 howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data,
 		      ignore_input_section, ignore_bfd)
      bfd *abfd;
@@ -87,17 +85,17 @@ howto8_FFnn_callback (abfd, reloc_entry, symbol_in, data,
   long relocation = 0;
   bfd_vma addr = reloc_entry->address;
 
-  long x = bfd_get_8(abfd, (bfd_byte *)data + addr);
-  abort();
+  long x = bfd_get_8 (abfd, (bfd_byte *)data + addr);
+  abort ();
   HOWTO_PREPARE(relocation, symbol_in);
 
   x = (x + relocation + reloc_entry->addend);
 
-  bfd_put_8(abfd, x, (bfd_byte *)data + addr);
+  bfd_put_8 (abfd, x, (bfd_byte *)data + addr);
   return bfd_reloc_ok;
 }
 
-static bfd_reloc_status_type 
+static bfd_reloc_status_type
 howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data,
 		       ignore_input_section, ignore_bfd)
      bfd *abfd;
@@ -109,18 +107,16 @@ howto8_pcrel_callback (abfd, reloc_entry, symbol_in, data,
 {
   long relocation = 0;
   bfd_vma addr = reloc_entry->address;
-  long x = bfd_get_8(abfd, (bfd_byte *)data + addr);
-  abort();
+  long x = bfd_get_8 (abfd, (bfd_byte *)data + addr);
+  abort ();
   HOWTO_PREPARE(relocation, symbol_in);
 
   x = (x + relocation + reloc_entry->addend);
 
-  bfd_put_8(abfd, x, (bfd_byte *)data + addr);
+  bfd_put_8 (abfd, x, (bfd_byte *)data + addr);
   return bfd_reloc_ok;
 }
 
-
-
 static reloc_howto_type howto_16
   = NEWHOWTO(howto16_callback,"abs16",1,false,false);
 static reloc_howto_type howto_8
@@ -132,7 +128,6 @@ static reloc_howto_type howto_8_FFnn
 static reloc_howto_type howto_8_pcrel
   = NEWHOWTO(howto8_pcrel_callback,"pcrel8",0,false,true);
 
-
 static reloc_howto_type *
 local_bfd_reloc_type_lookup (arch, code)
      const struct bfd_arch_info *arch;
@@ -154,7 +149,7 @@ local_bfd_reloc_type_lookup (arch, code)
 
 int bfd_default_scan_num_mach();
 
-static boolean 
+static boolean
 scan_mach (info, string)
      const struct bfd_arch_info *info ATTRIBUTE_UNUSED;
      const char *string;
@@ -166,7 +161,6 @@ scan_mach (info, string)
   return false;
 }
 
-
 #if 0 /* not used currently */
 /* This routine is provided two arch_infos and returns whether
    they'd be compatible */