2000-12-14 Kazu Hirata <kazu@hxi.com>

	* peigen.c: Fix formatting.
	* som.c: Likewise.
	* som.h: Likewise.

4 files changed, 453 insertions, 439 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index f4cf802..7eed9d2 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2000-12-14  Kazu Hirata  <kazu@hxi.com>
+
+	* peigen.c: Fix formatting.
+	* som.c: Likewise.
+	* som.h: Likewise.
+
 2000-12-13  Kazu Hirata  <kazu@hxi.com>
 
 	* peigen.c: Fix formatting.
diff --git a/bfd/peigen.c b/bfd/peigen.c
index 068566f..094920c 100644
--- a/bfd/peigen.c
+++ b/bfd/peigen.c
@@ -18,12 +18,10 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-/*
-Most of this hacked by  Steve Chamberlain,
-			sac@cygnus.com
+/* Most of this hacked by Steve Chamberlain <sac@cygnus.com>.
 
-PE/PEI rearrangement (and code added): Donn Terry
-				       Softway Systems, Inc.
+   PE/PEI rearrangement (and code added): Donn Terry
+					  Softway Systems, Inc.
 */
 
 /* Hey look, some documentation [and in a place you expect to find it]!
@@ -91,30 +89,35 @@ _bfd_pei_swap_sym_in (abfd, ext1, in1)
      PTR ext1;
      PTR in1;
 {
-  SYMENT *ext = (SYMENT *)ext1;
-  struct internal_syment      *in = (struct internal_syment *)in1;
+  SYMENT *ext = (SYMENT *) ext1;
+  struct internal_syment *in = (struct internal_syment *) in1;
 
-  if( ext->e.e_name[0] == 0) {
-    in->_n._n_n._n_zeroes = 0;
-    in->_n._n_n._n_offset = bfd_h_get_32 (abfd, (bfd_byte *) ext->e.e.e_offset);
-  }
-  else {
-    memcpy(in->_n._n_name, ext->e.e_name, SYMNMLEN);
-  }
+  if (ext->e.e_name[0] == 0)
+    {
+      in->_n._n_n._n_zeroes = 0;
+      in->_n._n_n._n_offset =
+	bfd_h_get_32 (abfd, (bfd_byte *) ext->e.e.e_offset);
+    }
+  else
+    {
+      memcpy (in->_n._n_name, ext->e.e_name, SYMNMLEN);
+    }
 
   in->n_value = bfd_h_get_32 (abfd, (bfd_byte *) ext->e_value);
   in->n_scnum = bfd_h_get_16 (abfd, (bfd_byte *) ext->e_scnum);
-  if (sizeof (ext->e_type) == 2){
-    in->n_type = bfd_h_get_16 (abfd, (bfd_byte *) ext->e_type);
-  }
-  else {
-    in->n_type = bfd_h_get_32 (abfd, (bfd_byte *) ext->e_type);
-  }
+  if (sizeof (ext->e_type) == 2)
+    {
+      in->n_type = bfd_h_get_16 (abfd, (bfd_byte *) ext->e_type);
+    }
+  else
+    {
+      in->n_type = bfd_h_get_32 (abfd, (bfd_byte *) ext->e_type);
+    }
   in->n_sclass = bfd_h_get_8 (abfd, ext->e_sclass);
   in->n_numaux = bfd_h_get_8 (abfd, ext->e_numaux);
 
 #ifndef STRICT_PE_FORMAT
-  /* This is for Gnu-created DLLs */
+  /* This is for Gnu-created DLLs.  */
 
   /* The section symbols for the .idata$ sections have class 0x68
      (C_SECTION), which MS documentation indicates is a section
@@ -136,17 +139,19 @@ _bfd_pei_swap_sym_in (abfd, ext1, in1)
       /* I have tried setting the class to 3 and using the following
 	 to set the section number.  This will put the address of the
 	 pointer to the string kernel32.dll at addresses 0 and 0x10
-	 off start of idata section which is not correct */
-      /*    if (strcmp (in->_n._n_name, ".idata$4") == 0) */
-      /*      in->n_scnum = 3; */
-      /*    else */
-      /*      in->n_scnum = 2; */
+	 off start of idata section which is not correct.  */
+#if 0
+      if (strcmp (in->_n._n_name, ".idata$4") == 0)
+	in->n_scnum = 3;
+      else
+	in->n_scnum = 2;
+#endif
 #else
       /* Create synthetic empty sections as needed.  DJ */
       if (in->n_scnum == 0)
 	{
 	  asection *sec;
-	  for (sec=abfd->sections; sec; sec=sec->next)
+	  for (sec = abfd->sections; sec; sec = sec->next)
 	    {
 	      if (strcmp (sec->name, in->n_name) == 0)
 		{
@@ -160,9 +165,9 @@ _bfd_pei_swap_sym_in (abfd, ext1, in1)
 	  int unused_section_number = 0;
 	  asection *sec;
 	  char *name;
-	  for (sec=abfd->sections; sec; sec=sec->next)
+	  for (sec = abfd->sections; sec; sec = sec->next)
 	    if (unused_section_number <= sec->target_index)
-	      unused_section_number = sec->target_index+1;
+	      unused_section_number = sec->target_index + 1;
 
 	  name = bfd_alloc (abfd, strlen (in->n_name) + 10);
 	  if (name == NULL)
@@ -197,7 +202,7 @@ _bfd_pei_swap_sym_in (abfd, ext1, in1)
 #ifdef coff_swap_sym_in_hook
   /* This won't work in peigen.c, but since it's for PPC PE, it's not
      worth fixing.  */
-  coff_swap_sym_in_hook(abfd, ext1, in1);
+  coff_swap_sym_in_hook (abfd, ext1, in1);
 #endif
 }
 
@@ -207,15 +212,17 @@ _bfd_pei_swap_sym_out (abfd, inp, extp)
      PTR	inp;
      PTR	extp;
 {
-  struct internal_syment *in = (struct internal_syment *)inp;
-  SYMENT *ext =(SYMENT *)extp;
-  if(in->_n._n_name[0] == 0) {
-    bfd_h_put_32 (abfd, 0, (bfd_byte *) ext->e.e.e_zeroes);
-    bfd_h_put_32 (abfd, in->_n._n_n._n_offset, (bfd_byte *)  ext->e.e.e_offset);
-  }
-  else {
-    memcpy(ext->e.e_name, in->_n._n_name, SYMNMLEN);
-  }
+  struct internal_syment *in = (struct internal_syment *) inp;
+  SYMENT *ext = (SYMENT *) extp;
+  if (in->_n._n_name[0] == 0)
+    {
+      bfd_h_put_32 (abfd, 0, (bfd_byte *) ext->e.e.e_zeroes);
+      bfd_h_put_32 (abfd, in->_n._n_n._n_offset, (bfd_byte *) ext->e.e.e_offset);
+    }
+  else
+    {
+      memcpy (ext->e.e_name, in->_n._n_name, SYMNMLEN);
+    }
 
   bfd_h_put_32 (abfd, in->n_value, (bfd_byte *) ext->e_value);
   bfd_h_put_16 (abfd, in->n_scnum, (bfd_byte *) ext->e_scnum);
@@ -243,37 +250,42 @@ _bfd_pei_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1)
      int	     numaux ATTRIBUTE_UNUSED;
      PTR 	     in1;
 {
-  AUXENT    *ext = (AUXENT *)ext1;
-  union internal_auxent *in = (union internal_auxent *)in1;
-
-  switch (class) {
-  case C_FILE:
-    if (ext->x_file.x_fname[0] == 0) {
-      in->x_file.x_n.x_zeroes = 0;
-      in->x_file.x_n.x_offset =
-	bfd_h_get_32 (abfd, (bfd_byte *) ext->x_file.x_n.x_offset);
-    } else {
-      memcpy (in->x_file.x_fname, ext->x_file.x_fname, FILNMLEN);
-    }
-    return;
-
-  case C_STAT:
-  case C_LEAFSTAT:
-  case C_HIDDEN:
-    if (type == T_NULL) {
-      in->x_scn.x_scnlen = GET_SCN_SCNLEN(abfd, ext);
-      in->x_scn.x_nreloc = GET_SCN_NRELOC(abfd, ext);
-      in->x_scn.x_nlinno = GET_SCN_NLINNO(abfd, ext);
-      in->x_scn.x_checksum = bfd_h_get_32 (abfd,
-					   (bfd_byte *) ext->x_scn.x_checksum);
-      in->x_scn.x_associated =
-	bfd_h_get_16 (abfd, (bfd_byte *) ext->x_scn.x_associated);
-      in->x_scn.x_comdat = bfd_h_get_8 (abfd,
-					(bfd_byte *) ext->x_scn.x_comdat);
+  AUXENT *ext = (AUXENT *) ext1;
+  union internal_auxent *in = (union internal_auxent *) in1;
+
+  switch (class)
+    {
+    case C_FILE:
+      if (ext->x_file.x_fname[0] == 0)
+	{
+	  in->x_file.x_n.x_zeroes = 0;
+	  in->x_file.x_n.x_offset =
+	    bfd_h_get_32 (abfd, (bfd_byte *) ext->x_file.x_n.x_offset);
+	}
+      else
+	{
+	  memcpy (in->x_file.x_fname, ext->x_file.x_fname, FILNMLEN);
+	}
       return;
+
+    case C_STAT:
+    case C_LEAFSTAT:
+    case C_HIDDEN:
+      if (type == T_NULL)
+	{
+	  in->x_scn.x_scnlen = GET_SCN_SCNLEN (abfd, ext);
+	  in->x_scn.x_nreloc = GET_SCN_NRELOC (abfd, ext);
+	  in->x_scn.x_nlinno = GET_SCN_NLINNO (abfd, ext);
+	  in->x_scn.x_checksum =
+	    bfd_h_get_32 (abfd, (bfd_byte *) ext->x_scn.x_checksum);
+	  in->x_scn.x_associated =
+	    bfd_h_get_16 (abfd, (bfd_byte *) ext->x_scn.x_associated);
+	  in->x_scn.x_comdat =
+	    bfd_h_get_8 (abfd, (bfd_byte *) ext->x_scn.x_comdat);
+	  return;
+	}
+      break;
     }
-    break;
-  }
 
   in->x_sym.x_tagndx.l = bfd_h_get_32 (abfd, (bfd_byte *) ext->x_sym.x_tagndx);
   in->x_sym.x_tvndx = bfd_h_get_16 (abfd, (bfd_byte *) ext->x_sym.x_tvndx);
@@ -295,13 +307,16 @@ _bfd_pei_swap_aux_in (abfd, ext1, type, class, indx, numaux, in1)
 	bfd_h_get_16 (abfd, (bfd_byte *) ext->x_sym.x_fcnary.x_ary.x_dimen[3]);
     }
 
-  if (ISFCN(type)) {
-    in->x_sym.x_misc.x_fsize = bfd_h_get_32 (abfd, (bfd_byte *) ext->x_sym.x_misc.x_fsize);
-  }
-  else {
-    in->x_sym.x_misc.x_lnsz.x_lnno = GET_LNSZ_LNNO(abfd, ext);
-    in->x_sym.x_misc.x_lnsz.x_size = GET_LNSZ_SIZE(abfd, ext);
-  }
+  if (ISFCN (type))
+    {
+      in->x_sym.x_misc.x_fsize =
+	bfd_h_get_32 (abfd, (bfd_byte *) ext->x_sym.x_misc.x_fsize);
+    }
+  else
+    {
+      in->x_sym.x_misc.x_lnsz.x_lnno = GET_LNSZ_LNNO (abfd, ext);
+      in->x_sym.x_misc.x_lnsz.x_size = GET_LNSZ_SIZE (abfd, ext);
+    }
 }
 
 unsigned int
@@ -314,48 +329,52 @@ _bfd_pei_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
      int   numaux ATTRIBUTE_UNUSED;
      PTR   extp;
 {
-  union internal_auxent *in = (union internal_auxent *)inp;
-  AUXENT *ext = (AUXENT *)extp;
-
-  memset((PTR)ext, 0, AUXESZ);
-  switch (class) {
-  case C_FILE:
-    if (in->x_file.x_fname[0] == 0) {
-      bfd_h_put_32 (abfd, 0, (bfd_byte *) ext->x_file.x_n.x_zeroes);
-      bfd_h_put_32 (abfd,
-	      in->x_file.x_n.x_offset,
-	      (bfd_byte *) ext->x_file.x_n.x_offset);
-    }
-    else {
-      memcpy (ext->x_file.x_fname, in->x_file.x_fname, FILNMLEN);
-    }
-    return AUXESZ;
-
-  case C_STAT:
-  case C_LEAFSTAT:
-  case C_HIDDEN:
-    if (type == T_NULL) {
-      PUT_SCN_SCNLEN(abfd, in->x_scn.x_scnlen, ext);
-      PUT_SCN_NRELOC(abfd, in->x_scn.x_nreloc, ext);
-      PUT_SCN_NLINNO(abfd, in->x_scn.x_nlinno, ext);
-      bfd_h_put_32 (abfd, in->x_scn.x_checksum,
-		    (bfd_byte *) ext->x_scn.x_checksum);
-      bfd_h_put_16 (abfd, in->x_scn.x_associated,
-		    (bfd_byte *) ext->x_scn.x_associated);
-      bfd_h_put_8 (abfd, in->x_scn.x_comdat,
-		   (bfd_byte *) ext->x_scn.x_comdat);
+  union internal_auxent *in = (union internal_auxent *) inp;
+  AUXENT *ext = (AUXENT *) extp;
+
+  memset ((PTR) ext, 0, AUXESZ);
+  switch (class)
+    {
+    case C_FILE:
+      if (in->x_file.x_fname[0] == 0)
+	{
+	  bfd_h_put_32 (abfd, 0, (bfd_byte *) ext->x_file.x_n.x_zeroes);
+	  bfd_h_put_32 (abfd,
+			in->x_file.x_n.x_offset,
+			(bfd_byte *) ext->x_file.x_n.x_offset);
+	}
+      else
+	{
+	  memcpy (ext->x_file.x_fname, in->x_file.x_fname, FILNMLEN);
+	}
       return AUXESZ;
+
+    case C_STAT:
+    case C_LEAFSTAT:
+    case C_HIDDEN:
+      if (type == T_NULL)
+	{
+	  PUT_SCN_SCNLEN (abfd, in->x_scn.x_scnlen, ext);
+	  PUT_SCN_NRELOC (abfd, in->x_scn.x_nreloc, ext);
+	  PUT_SCN_NLINNO (abfd, in->x_scn.x_nlinno, ext);
+	  bfd_h_put_32 (abfd, in->x_scn.x_checksum,
+			(bfd_byte *) ext->x_scn.x_checksum);
+	  bfd_h_put_16 (abfd, in->x_scn.x_associated,
+			(bfd_byte *) ext->x_scn.x_associated);
+	  bfd_h_put_8 (abfd, in->x_scn.x_comdat,
+		       (bfd_byte *) ext->x_scn.x_comdat);
+	  return AUXESZ;
+	}
+      break;
     }
-    break;
-  }
 
   bfd_h_put_32 (abfd, in->x_sym.x_tagndx.l, (bfd_byte *) ext->x_sym.x_tagndx);
   bfd_h_put_16 (abfd, in->x_sym.x_tvndx, (bfd_byte *) ext->x_sym.x_tvndx);
 
   if (class == C_BLOCK || class == C_FCN || ISFCN (type) || ISTAG (class))
     {
-      PUT_FCN_LNNOPTR(abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr, ext);
-      PUT_FCN_ENDNDX(abfd, in->x_sym.x_fcnary.x_fcn.x_endndx.l, ext);
+      PUT_FCN_LNNOPTR (abfd, in->x_sym.x_fcnary.x_fcn.x_lnnoptr,  ext);
+      PUT_FCN_ENDNDX  (abfd, in->x_sym.x_fcnary.x_fcn.x_endndx.l, ext);
     }
   else
     {
@@ -371,7 +390,7 @@ _bfd_pei_swap_aux_out (abfd, inp, type, class, indx, numaux, extp)
 
   if (ISFCN (type))
     bfd_h_put_32 (abfd, in->x_sym.x_misc.x_fsize,
-	     (bfd_byte *)  ext->x_sym.x_misc.x_fsize);
+		  (bfd_byte *) ext->x_sym.x_misc.x_fsize);
   else
     {
       PUT_LNSZ_LNNO (abfd, in->x_sym.x_misc.x_lnsz.x_lnno, ext);
@@ -387,11 +406,11 @@ _bfd_pei_swap_lineno_in (abfd, ext1, in1)
      PTR ext1;
      PTR in1;
 {
-  LINENO *ext = (LINENO *)ext1;
-  struct internal_lineno      *in = (struct internal_lineno *)in1;
+  LINENO *ext = (LINENO *) ext1;
+  struct internal_lineno *in = (struct internal_lineno *) in1;
 
   in->l_addr.l_symndx = bfd_h_get_32 (abfd, (bfd_byte *) ext->l_addr.l_symndx);
-  in->l_lnno = GET_LINENO_LNNO(abfd, ext);
+  in->l_lnno = GET_LINENO_LNNO (abfd, ext);
 }
 
 unsigned int
@@ -400,8 +419,8 @@ _bfd_pei_swap_lineno_out (abfd, inp, outp)
      PTR	inp;
      PTR	outp;
 {
-  struct internal_lineno *in = (struct internal_lineno *)inp;
-  struct external_lineno *ext = (struct external_lineno *)outp;
+  struct internal_lineno *in = (struct internal_lineno *) inp;
+  struct external_lineno *ext = (struct external_lineno *) outp;
   bfd_h_put_32 (abfd, in->l_addr.l_symndx, (bfd_byte *)
 	  ext->l_addr.l_symndx);
 
@@ -439,44 +458,45 @@ _bfd_pei_swap_aouthdr_in (abfd, aouthdr_ext1, aouthdr_int1)
 #endif
 
   a = &aouthdr_int->pe;
-  a->ImageBase = GET_OPTHDR_IMAGE_BASE (abfd, (bfd_byte *)src->ImageBase);
-  a->SectionAlignment = bfd_h_get_32 (abfd, (bfd_byte *)src->SectionAlignment);
-  a->FileAlignment = bfd_h_get_32 (abfd, (bfd_byte *)src->FileAlignment);
+  a->ImageBase = GET_OPTHDR_IMAGE_BASE (abfd, (bfd_byte *) src->ImageBase);
+  a->SectionAlignment = bfd_h_get_32 (abfd, (bfd_byte *) src->SectionAlignment);
+  a->FileAlignment = bfd_h_get_32 (abfd, (bfd_byte *) src->FileAlignment);
   a->MajorOperatingSystemVersion =
-    bfd_h_get_16 (abfd, (bfd_byte *)src->MajorOperatingSystemVersion);
+    bfd_h_get_16 (abfd, (bfd_byte *) src->MajorOperatingSystemVersion);
   a->MinorOperatingSystemVersion =
-    bfd_h_get_16 (abfd, (bfd_byte *)src->MinorOperatingSystemVersion);
-  a->MajorImageVersion = bfd_h_get_16 (abfd, (bfd_byte *)src->MajorImageVersion);
-  a->MinorImageVersion = bfd_h_get_16 (abfd, (bfd_byte *)src->MinorImageVersion);
-  a->MajorSubsystemVersion = bfd_h_get_16 (abfd, (bfd_byte *)src->MajorSubsystemVersion);
-  a->MinorSubsystemVersion = bfd_h_get_16 (abfd, (bfd_byte *)src->MinorSubsystemVersion);
-  a->Reserved1 = bfd_h_get_32 (abfd, (bfd_byte *)src->Reserved1);
-  a->SizeOfImage = bfd_h_get_32 (abfd, (bfd_byte *)src->SizeOfImage);
-  a->SizeOfHeaders = bfd_h_get_32 (abfd, (bfd_byte *)src->SizeOfHeaders);
-  a->CheckSum = bfd_h_get_32 (abfd, (bfd_byte *)src->CheckSum);
-  a->Subsystem = bfd_h_get_16 (abfd, (bfd_byte *)src->Subsystem);
-  a->DllCharacteristics = bfd_h_get_16 (abfd, (bfd_byte *)src->DllCharacteristics);
-  a->SizeOfStackReserve = GET_OPTHDR_SIZE_OF_STACK_RESERVE (abfd, (bfd_byte *)src->SizeOfStackReserve);
-  a->SizeOfStackCommit = GET_OPTHDR_SIZE_OF_STACK_COMMIT (abfd, (bfd_byte *)src->SizeOfStackCommit);
-  a->SizeOfHeapReserve = GET_OPTHDR_SIZE_OF_HEAP_RESERVE (abfd, (bfd_byte *)src->SizeOfHeapReserve);
-  a->SizeOfHeapCommit = GET_OPTHDR_SIZE_OF_HEAP_COMMIT (abfd, (bfd_byte *)src->SizeOfHeapCommit);
-  a->LoaderFlags = bfd_h_get_32 (abfd, (bfd_byte *)src->LoaderFlags);
-  a->NumberOfRvaAndSizes = bfd_h_get_32 (abfd, (bfd_byte *)src->NumberOfRvaAndSizes);
+    bfd_h_get_16 (abfd, (bfd_byte *) src->MinorOperatingSystemVersion);
+  a->MajorImageVersion = bfd_h_get_16 (abfd, (bfd_byte *) src->MajorImageVersion);
+  a->MinorImageVersion = bfd_h_get_16 (abfd, (bfd_byte *) src->MinorImageVersion);
+  a->MajorSubsystemVersion = bfd_h_get_16 (abfd, (bfd_byte *) src->MajorSubsystemVersion);
+  a->MinorSubsystemVersion = bfd_h_get_16 (abfd, (bfd_byte *) src->MinorSubsystemVersion);
+  a->Reserved1 = bfd_h_get_32 (abfd, (bfd_byte *) src->Reserved1);
+  a->SizeOfImage = bfd_h_get_32 (abfd, (bfd_byte *) src->SizeOfImage);
+  a->SizeOfHeaders = bfd_h_get_32 (abfd, (bfd_byte *) src->SizeOfHeaders);
+  a->CheckSum = bfd_h_get_32 (abfd, (bfd_byte *) src->CheckSum);
+  a->Subsystem = bfd_h_get_16 (abfd, (bfd_byte *) src->Subsystem);
+  a->DllCharacteristics = bfd_h_get_16 (abfd, (bfd_byte *) src->DllCharacteristics);
+  a->SizeOfStackReserve = GET_OPTHDR_SIZE_OF_STACK_RESERVE (abfd, (bfd_byte *) src->SizeOfStackReserve);
+  a->SizeOfStackCommit = GET_OPTHDR_SIZE_OF_STACK_COMMIT (abfd, (bfd_byte *) src->SizeOfStackCommit);
+  a->SizeOfHeapReserve = GET_OPTHDR_SIZE_OF_HEAP_RESERVE (abfd, (bfd_byte *) src->SizeOfHeapReserve);
+  a->SizeOfHeapCommit = GET_OPTHDR_SIZE_OF_HEAP_COMMIT (abfd, (bfd_byte *) src->SizeOfHeapCommit);
+  a->LoaderFlags = bfd_h_get_32 (abfd, (bfd_byte *) src->LoaderFlags);
+  a->NumberOfRvaAndSizes = bfd_h_get_32 (abfd, (bfd_byte *) src->NumberOfRvaAndSizes);
 
   {
     int idx;
-    for (idx=0; idx < 16; idx++)
+    for (idx = 0; idx < 16; idx++)
       {
-        /* If data directory is empty, rva also should be 0 */
-	int size = bfd_h_get_32 (abfd, (bfd_byte *) src->DataDirectory[idx][1]);
+        /* If data directory is empty, rva also should be 0.  */
+	int size =
+	  bfd_h_get_32 (abfd, (bfd_byte *) src->DataDirectory[idx][1]);
 	a->DataDirectory[idx].Size = size;
 
 	if (size)
-          {
-  	    a->DataDirectory[idx].VirtualAddress =
-  	      bfd_h_get_32 (abfd, (bfd_byte *) src->DataDirectory[idx][0]);
-          }
-        else
+	  {
+	    a->DataDirectory[idx].VirtualAddress =
+	      bfd_h_get_32 (abfd, (bfd_byte *) src->DataDirectory[idx][0]);
+	  }
+	else
 	  a->DataDirectory[idx].VirtualAddress = 0;
       }
   }
@@ -508,7 +528,7 @@ _bfd_pei_swap_aouthdr_in (abfd, aouthdr_ext1, aouthdr_int1)
   /* These three fields are normally set up by ppc_relocate_section.
      In the case of reading a file in, we can pick them up from the
      DataDirectory.  */
-  first_thunk_address = a->DataDirectory[12].VirtualAddress ;
+  first_thunk_address = a->DataDirectory[12].VirtualAddress;
   thunk_size = a->DataDirectory[12].Size;
   import_table_size = a->DataDirectory[1].Size;
 #endif
@@ -537,11 +557,11 @@ add_data_entry (abfd, aout, idx, name, base)
       aout->DataDirectory[idx].Size = size;
 
       if (size)
-        {
-          aout->DataDirectory[idx].VirtualAddress =
-          			(sec->vma - base) & 0xffffffff;
-          sec->flags |= SEC_DATA;
-        }
+	{
+	  aout->DataDirectory[idx].VirtualAddress =
+	    (sec->vma - base) & 0xffffffff;
+	  sec->flags |= SEC_DATA;
+	}
     }
 }
 
@@ -551,9 +571,9 @@ _bfd_pei_swap_aouthdr_out (abfd, in, out)
      PTR	in;
      PTR	out;
 {
-  struct internal_aouthdr *aouthdr_in = (struct internal_aouthdr *)in;
+  struct internal_aouthdr *aouthdr_in = (struct internal_aouthdr *) in;
   struct internal_extra_pe_aouthdr *extra = &pe_data (abfd)->pe_opthdr;
-  PEAOUTHDR *aouthdr_out = (PEAOUTHDR *)out;
+  PEAOUTHDR *aouthdr_out = (PEAOUTHDR *) out;
   bfd_vma sa, fa, ib;
 
   /* The following definitely is required for EFI applications.
@@ -593,10 +613,10 @@ _bfd_pei_swap_aouthdr_out (abfd, in, out)
       aouthdr_in->entry &= 0xffffffff;
     }
 
-#define FA(x)  (((x) + fa -1 ) & (- fa))
-#define SA(x)  (((x) + sa -1 ) & (- sa))
+#define FA(x) (((x) + fa -1 ) & (- fa))
+#define SA(x) (((x) + sa -1 ) & (- sa))
 
-  /* We like to have the sizes aligned */
+  /* We like to have the sizes aligned.  */
 
   aouthdr_in->bsize = FA (aouthdr_in->bsize);
 
@@ -629,9 +649,9 @@ _bfd_pei_swap_aouthdr_out (abfd, in, out)
 
   {
     asection *sec;
-    bfd_vma dsize= 0;
+    bfd_vma dsize = 0;
     bfd_vma isize = SA(abfd->sections->filepos);
-    bfd_vma tsize= 0;
+    bfd_vma tsize = 0;
 
     for (sec = abfd->sections; sec; sec = sec->next)
       {
@@ -722,7 +742,7 @@ _bfd_pei_swap_aouthdr_out (abfd, in, out)
 		(bfd_byte *) aouthdr_out->NumberOfRvaAndSizes);
   {
     int idx;
-    for (idx=0; idx < 16; idx++)
+    for (idx = 0; idx < 16; idx++)
       {
 	bfd_h_put_32 (abfd, extra->DataDirectory[idx].VirtualAddress,
 		      (bfd_byte *) aouthdr_out->DataDirectory[idx][0]);
@@ -741,8 +761,8 @@ _bfd_pei_only_swap_filehdr_out (abfd, in, out)
      PTR	out;
 {
   int idx;
-  struct internal_filehdr *filehdr_in = (struct internal_filehdr *)in;
-  struct external_PEI_filehdr *filehdr_out = (struct external_PEI_filehdr *)out;
+  struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
+  struct external_PEI_filehdr *filehdr_out = (struct external_PEI_filehdr *) out;
 
   if (pe_data (abfd)->has_reloc_section)
     filehdr_in->f_flags &= ~F_RELFLG;
@@ -765,19 +785,19 @@ _bfd_pei_only_swap_filehdr_out (abfd, in, out)
   filehdr_in->pe.e_lfarlc   = 0x40;
   filehdr_in->pe.e_ovno     = 0x0;
 
-  for (idx=0; idx < 4; idx++)
+  for (idx = 0; idx < 4; idx++)
     filehdr_in->pe.e_res[idx] = 0x0;
 
   filehdr_in->pe.e_oemid   = 0x0;
   filehdr_in->pe.e_oeminfo = 0x0;
 
-  for (idx=0; idx < 10; idx++)
+  for (idx = 0; idx < 10; idx++)
     filehdr_in->pe.e_res2[idx] = 0x0;
 
   filehdr_in->pe.e_lfanew = 0x80;
 
-  /* this next collection of data are mostly just characters.  It appears
-     to be constant within the headers put on NT exes */
+  /* This next collection of data are mostly just characters.  It
+     appears to be constant within the headers put on NT exes.  */
   filehdr_in->pe.dos_message[0]  = 0x0eba1f0e;
   filehdr_in->pe.dos_message[1]  = 0xcd09b400;
   filehdr_in->pe.dos_message[2]  = 0x4c01b821;
@@ -828,31 +848,31 @@ _bfd_pei_only_swap_filehdr_out (abfd, in, out)
   bfd_h_put_16 (abfd, filehdr_in->pe.e_ovno, (bfd_byte *) filehdr_out->e_ovno);
   {
     int idx;
-    for (idx=0; idx < 4; idx++)
+    for (idx = 0; idx < 4; idx++)
       bfd_h_put_16 (abfd, filehdr_in->pe.e_res[idx],
-		   (bfd_byte *) filehdr_out->e_res[idx]);
+		    (bfd_byte *) filehdr_out->e_res[idx]);
   }
   bfd_h_put_16 (abfd, filehdr_in->pe.e_oemid, (bfd_byte *) filehdr_out->e_oemid);
   bfd_h_put_16 (abfd, filehdr_in->pe.e_oeminfo,
-	       (bfd_byte *) filehdr_out->e_oeminfo);
+		(bfd_byte *) filehdr_out->e_oeminfo);
   {
     int idx;
-    for (idx=0; idx < 10; idx++)
+    for (idx = 0; idx < 10; idx++)
       bfd_h_put_16 (abfd, filehdr_in->pe.e_res2[idx],
-		   (bfd_byte *) filehdr_out->e_res2[idx]);
+		    (bfd_byte *) filehdr_out->e_res2[idx]);
   }
   bfd_h_put_32 (abfd, filehdr_in->pe.e_lfanew, (bfd_byte *) filehdr_out->e_lfanew);
 
   {
     int idx;
-    for (idx=0; idx < 16; idx++)
+    for (idx = 0; idx < 16; idx++)
       bfd_h_put_32 (abfd, filehdr_in->pe.dos_message[idx],
-		   (bfd_byte *) filehdr_out->dos_message[idx]);
+		    (bfd_byte *) filehdr_out->dos_message[idx]);
   }
 
-  /* also put in the NT signature */
+  /* Also put in the NT signature.  */
   bfd_h_put_32 (abfd, filehdr_in->pe.nt_signature,
-	       (bfd_byte *) filehdr_out->nt_signature);
+		(bfd_byte *) filehdr_out->nt_signature);
 
   return FILHSZ;
 }
@@ -863,8 +883,8 @@ _bfd_pe_only_swap_filehdr_out (abfd, in, out)
      PTR	in;
      PTR	out;
 {
-  struct internal_filehdr *filehdr_in = (struct internal_filehdr *)in;
-  FILHDR *filehdr_out = (FILHDR *)out;
+  struct internal_filehdr *filehdr_in = (struct internal_filehdr *) in;
+  FILHDR *filehdr_out = (FILHDR *) out;
 
   bfd_h_put_16 (abfd, filehdr_in->f_magic, (bfd_byte *) filehdr_out->f_magic);
   bfd_h_put_16 (abfd, filehdr_in->f_nscns, (bfd_byte *) filehdr_out->f_nscns);
@@ -884,17 +904,17 @@ _bfd_pei_swap_scnhdr_out (abfd, in, out)
      PTR	in;
      PTR	out;
 {
-  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *)in;
-  SCNHDR *scnhdr_ext = (SCNHDR *)out;
+  struct internal_scnhdr *scnhdr_int = (struct internal_scnhdr *) in;
+  SCNHDR *scnhdr_ext = (SCNHDR *) out;
   unsigned int ret = SCNHSZ;
   bfd_vma ps;
   bfd_vma ss;
 
-  memcpy(scnhdr_ext->s_name, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
+  memcpy (scnhdr_ext->s_name, scnhdr_int->s_name, sizeof (scnhdr_int->s_name));
 
   PUT_SCNHDR_VADDR (abfd,
 		    ((scnhdr_int->s_vaddr
-		      - pe_data(abfd)->pe_opthdr.ImageBase)
+		      - pe_data (abfd)->pe_opthdr.ImageBase)
 		     & 0xffffffff),
 		    (bfd_byte *) scnhdr_ext->s_vaddr);
 
@@ -986,7 +1006,7 @@ _bfd_pei_swap_scnhdr_out (abfd, in, out)
 	  bfd_h_put_16 (abfd, 0xffff, (bfd_byte *) scnhdr_ext->s_nreloc);
 	  scnhdr_int->s_flags |= IMAGE_SCN_LNK_NRELOC_OVFL;
 	  bfd_h_put_32 (abfd, scnhdr_int->s_flags,
-		       (bfd_byte *) scnhdr_ext->s_flags);
+			(bfd_byte *) scnhdr_ext->s_flags);
 #if 0
 	  (*_bfd_error_handler) (_("%s: reloc overflow 1: 0x%lx > 0xffff"),
 				 bfd_get_filename (abfd),
@@ -1000,8 +1020,7 @@ _bfd_pei_swap_scnhdr_out (abfd, in, out)
   return ret;
 }
 
-static char * dir_names[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] =
-{
+static char * dir_names[IMAGE_NUMBEROF_DIRECTORY_ENTRIES] = {
   N_("Export Directory [.edata (or where ever we found it)]"),
   N_("Import Directory [parts of .idata]"),
   N_("Resource Directory [.rsrc]"),
@@ -1125,8 +1144,8 @@ pe_print_idata (abfd, vfile)
       toc_address = loadable_toc_address - 32768;
 
       fprintf (file,
-	      _("\nFunction descriptor located at the start address: %04lx\n"),
-	      (unsigned long int) (abfd->start_address));
+	       _("\nFunction descriptor located at the start address: %04lx\n"),
+	       (unsigned long int) (abfd->start_address));
       fprintf (file,
 	       _("\tcode-base %08lx toc (loadable/actual) %08lx/%08lx\n"),
 	       start_address, loadable_toc_address, toc_address);
@@ -1134,17 +1153,17 @@ pe_print_idata (abfd, vfile)
   else
     {
       fprintf (file,
-	      _("\nNo reldata section! Function descriptor not decoded.\n"));
+	       _("\nNo reldata section! Function descriptor not decoded.\n"));
     }
 #endif
 
   fprintf (file,
-	  _("\nThe Import Tables (interpreted %s section contents)\n"),
-	  section->name);
+	   _("\nThe Import Tables (interpreted %s section contents)\n"),
+	   section->name);
   fprintf (file,
-	  _(" vma:            Hint    Time      Forward  DLL       First\n"));
+	   _(" vma:            Hint    Time      Forward  DLL       First\n"));
   fprintf (file,
-	  _("                 Table   Stamp     Chain    Name      Thunk\n"));
+	   _("                 Table   Stamp     Chain    Name      Thunk\n"));
 
   data = (bfd_byte *) bfd_malloc (dataoff + datasize);
   if (data == NULL)
@@ -1173,7 +1192,7 @@ pe_print_idata (abfd, vfile)
 
       if (i + 20 > datasize)
 	{
-	  /* check stuff */
+	  /* Check stuff.  */
 	  ;
 	}
 
@@ -1313,20 +1332,19 @@ pe_print_edata (abfd, vfile)
   bfd_size_type i;
 
   bfd_signed_vma adj;
-  struct EDT_type
-    {
-      long export_flags;             /* reserved - should be zero */
-      long time_stamp;
-      short major_ver;
-      short minor_ver;
-      bfd_vma name;                  /* rva - relative to image base */
-      long base;                     /* ordinal base */
-      unsigned long num_functions;   /* Number in the export address table */
-      unsigned long num_names;       /* Number in the name pointer table */
-      bfd_vma eat_addr;    /* rva to the export address table */
-      bfd_vma npt_addr;        /* rva to the Export Name Pointer Table */
-      bfd_vma ot_addr; /* rva to the Ordinal Table */
-    } edt;
+  struct EDT_type {
+    long export_flags;             /* reserved - should be zero */
+    long time_stamp;
+    short major_ver;
+    short minor_ver;
+    bfd_vma name;                  /* rva - relative to image base */
+    long base;                     /* ordinal base */
+    unsigned long num_functions;   /* Number in the export address table */
+    unsigned long num_names;       /* Number in the name pointer table */
+    bfd_vma eat_addr;    /* rva to the export address table */
+    bfd_vma npt_addr;        /* rva to the Export Name Pointer Table */
+    bfd_vma ot_addr; /* rva to the Ordinal Table */
+  } edt;
 
   pe_data_type *pe = pe_data (abfd);
   struct internal_extra_pe_aouthdr *extra = &pe->pe_opthdr;
@@ -1379,34 +1397,34 @@ pe_print_edata (abfd, vfile)
 				  datasize))
     return false;
 
-  /* Go get Export Directory Table */
-  edt.export_flags   = bfd_get_32 (abfd, data+0);
-  edt.time_stamp     = bfd_get_32 (abfd, data+4);
-  edt.major_ver      = bfd_get_16 (abfd, data+8);
-  edt.minor_ver      = bfd_get_16 (abfd, data+10);
-  edt.name           = bfd_get_32 (abfd, data+12);
-  edt.base           = bfd_get_32 (abfd, data+16);
-  edt.num_functions  = bfd_get_32 (abfd, data+20);
-  edt.num_names      = bfd_get_32 (abfd, data+24);
-  edt.eat_addr       = bfd_get_32 (abfd, data+28);
-  edt.npt_addr       = bfd_get_32 (abfd, data+32);
-  edt.ot_addr        = bfd_get_32 (abfd, data+36);
+  /* Go get Export Directory Table.  */
+  edt.export_flags   = bfd_get_32 (abfd, data +  0);
+  edt.time_stamp     = bfd_get_32 (abfd, data +  4);
+  edt.major_ver      = bfd_get_16 (abfd, data +  8);
+  edt.minor_ver      = bfd_get_16 (abfd, data + 10);
+  edt.name           = bfd_get_32 (abfd, data + 12);
+  edt.base           = bfd_get_32 (abfd, data + 16);
+  edt.num_functions  = bfd_get_32 (abfd, data + 20);
+  edt.num_names      = bfd_get_32 (abfd, data + 24);
+  edt.eat_addr       = bfd_get_32 (abfd, data + 28);
+  edt.npt_addr       = bfd_get_32 (abfd, data + 32);
+  edt.ot_addr        = bfd_get_32 (abfd, data + 36);
 
   adj = section->vma - extra->ImageBase + dataoff;
 
   /* Dump the EDT first first */
   fprintf (file,
-	  _("\nThe Export Tables (interpreted %s section contents)\n\n"),
-	  section->name);
+	   _("\nThe Export Tables (interpreted %s section contents)\n\n"),
+	   section->name);
 
   fprintf (file,
-	  _("Export Flags \t\t\t%lx\n"), (unsigned long) edt.export_flags);
+	   _("Export Flags \t\t\t%lx\n"), (unsigned long) edt.export_flags);
 
   fprintf (file,
-	  _("Time/Date stamp \t\t%lx\n"), (unsigned long) edt.time_stamp);
+	   _("Time/Date stamp \t\t%lx\n"), (unsigned long) edt.time_stamp);
 
   fprintf (file,
-	  _("Major/Minor \t\t\t%d/%d\n"), edt.major_ver, edt.minor_ver);
+	   _("Major/Minor \t\t\t%d/%d\n"), edt.major_ver, edt.minor_ver);
 
   fprintf (file,
 	   _("Name \t\t\t\t"));
@@ -1415,20 +1433,20 @@ pe_print_edata (abfd, vfile)
 	   " %s\n", data + edt.name - adj);
 
   fprintf (file,
-	  _("Ordinal Base \t\t\t%ld\n"), edt.base);
+	   _("Ordinal Base \t\t\t%ld\n"), edt.base);
 
   fprintf (file,
-	  _("Number in:\n"));
+	   _("Number in:\n"));
 
   fprintf (file,
-	  _("\tExport Address Table \t\t%08lx\n"),
-	  edt.num_functions);
+	   _("\tExport Address Table \t\t%08lx\n"),
+	   edt.num_functions);
 
   fprintf (file,
-	  _("\t[Name Pointer/Ordinal] Table\t%08lx\n"), edt.num_names);
+	   _("\t[Name Pointer/Ordinal] Table\t%08lx\n"), edt.num_names);
 
   fprintf (file,
-	  _("Table Addresses\n"));
+	   _("Table Addresses\n"));
 
   fprintf (file,
 	   _("\tExport Address Table \t\t"));
@@ -1436,7 +1454,7 @@ pe_print_edata (abfd, vfile)
   fprintf (file, "\n");
 
   fprintf (file,
-	  _("\tName Pointer Table \t\t"));
+	   _("\tName Pointer Table \t\t"));
   fprintf_vma (file, edt.npt_addr);
   fprintf (file, "\n");
 
@@ -1448,8 +1466,7 @@ pe_print_edata (abfd, vfile)
   /* The next table to find is the Export Address Table. It's basically
      a list of pointers that either locate a function in this dll, or
      forward the call to another dll. Something like:
-      typedef union
-      {
+      typedef union {
         long export_rva;
         long forwarder_rva;
       } export_address_table_entry;
@@ -1469,7 +1486,7 @@ pe_print_edata (abfd, vfile)
       if (eat_member - adj <= datasize)
 	{
 	  /* This rva is to a name (forwarding function) in our section.  */
-	  /* Should locate a function descriptor */
+	  /* Should locate a function descriptor.  */
 	  fprintf (file,
 		   "\t[%4ld] +base[%4ld] %04lx %s -- %s\n",
 		   (long) i,
@@ -1480,7 +1497,7 @@ pe_print_edata (abfd, vfile)
 	}
       else
 	{
-	  /* Should locate a function descriptor in the reldata section */
+	  /* Should locate a function descriptor in the reldata section.  */
 	  fprintf (file,
 		   "\t[%4ld] +base[%4ld] %04lx %s\n",
 		   (long) i,
@@ -1490,10 +1507,10 @@ pe_print_edata (abfd, vfile)
 	}
     }
 
-  /* The Export Name Pointer Table is paired with the Export Ordinal Table */
-  /* Dump them in parallel for clarity */
+  /* The Export Name Pointer Table is paired with the Export Ordinal Table.  */
+  /* Dump them in parallel for clarity.  */
   fprintf (file,
-	  _("\n[Ordinal/Name Pointer] Table\n"));
+	   _("\n[Ordinal/Name Pointer] Table\n"));
 
   for (i = 0; i < edt.num_names; ++i)
     {
@@ -1510,7 +1527,6 @@ pe_print_edata (abfd, vfile)
 				    + (i*2) - adj);
       fprintf (file,
 	      "\t[%4ld] %s\n", (long) ord, name);
-
     }
 
   free (data);
@@ -1522,9 +1538,10 @@ pe_print_edata (abfd, vfile)
    consists of three dwords containing relative virtual addresses that
    specify the start and end address of the code range the entry
    covers and the address of the corresponding unwind info data.  */
+
 static boolean
 pe_print_pdata (abfd, vfile)
-     bfd  *abfd;
+     bfd *abfd;
      PTR vfile;
 {
 #ifdef COFF_WITH_PEP64
@@ -1543,18 +1560,19 @@ pe_print_pdata (abfd, vfile)
   if (section == NULL
       || coff_section_data (abfd, section) == NULL
       || pei_section_data (abfd, section) == NULL)
-     return true;
+    return true;
 
   stop = pei_section_data (abfd, section)->virt_size;
   if ((stop % onaline) != 0)
-    fprintf (file, _("Warning, .pdata section size (%ld) is not a multiple of %d\n"),
-	     (long)stop, onaline);
+    fprintf (file,
+	     _("Warning, .pdata section size (%ld) is not a multiple of %d\n"),
+	     (long) stop, onaline);
 
   fprintf (file,
 	   _("\nThe Function Table (interpreted .pdata section contents)\n"));
 #ifdef COFF_WITH_PEP64
   fprintf (file,
-	  _(" vma:\t\t\tBegin Address    End Address      Unwind Info\n"));
+	   _(" vma:\t\t\tBegin Address    End Address      Unwind Info\n"));
 #else
   fprintf (file,
 	   _(" vma:\t\tBegin    End      EH       EH       PrologEnd  Exception\n"));
@@ -1589,11 +1607,11 @@ pe_print_pdata (abfd, vfile)
       if (i + PDATA_ROW_SIZE > stop)
 	break;
 
-      begin_addr = GET_PDATA_ENTRY(abfd, data+i);
-      end_addr = GET_PDATA_ENTRY(abfd, data+i+4);
-      eh_handler = GET_PDATA_ENTRY(abfd, data+i+8);
-      eh_data = GET_PDATA_ENTRY(abfd, data+i+12);
-      prolog_end_addr = GET_PDATA_ENTRY(abfd, data+i+16);
+      begin_addr      = GET_PDATA_ENTRY (abfd, data + i     );
+      end_addr        = GET_PDATA_ENTRY (abfd, data + i +  4);
+      eh_handler      = GET_PDATA_ENTRY (abfd, data + i +  8);
+      eh_data         = GET_PDATA_ENTRY (abfd, data + i + 12);
+      prolog_end_addr = GET_PDATA_ENTRY (abfd, data + i + 16);
 
       if (begin_addr == 0 && end_addr == 0 && eh_handler == 0
 	  && eh_data == 0 && prolog_end_addr == 0)
@@ -1603,8 +1621,8 @@ pe_print_pdata (abfd, vfile)
 	}
 
       em_data = ((eh_handler & 0x1) << 2) | (prolog_end_addr & 0x3);
-      eh_handler &= ~ (bfd_vma) 0x3;
-      prolog_end_addr &= ~ (bfd_vma) 0x3;
+      eh_handler &= ~(bfd_vma) 0x3;
+      prolog_end_addr &= ~(bfd_vma) 0x3;
 
       fputc (' ', file);
       fprintf_vma (file, i + section->vma); fputc ('\t', file);
@@ -1621,9 +1639,8 @@ pe_print_pdata (abfd, vfile)
 #ifdef POWERPC_LE_PE
       if (eh_handler == 0 && eh_data != 0)
 	{
-	  /* Special bits here, although the meaning may */
-	  /* be a little mysterious. The only one I know */
-	  /* for sure is 0x03.                           */
+	  /* Special bits here, although the meaning may be a little
+	     mysterious. The only one I know for sure is 0x03.  */
 	  /* Code Significance                           */
 	  /* 0x00 None                                   */
 	  /* 0x01 Register Save Millicode                */
@@ -1654,21 +1671,20 @@ pe_print_pdata (abfd, vfile)
 }
 
 #define IMAGE_REL_BASED_HIGHADJ 4
-static const char * const tbl[] =
-{
-"ABSOLUTE",
-"HIGH",
-"LOW",
-"HIGHLOW",
-"HIGHADJ",
-"MIPS_JMPADDR",
-"SECTION",
-"REL32",
-"RESERVED1",
-"MIPS_JMPADDR16",
-"DIR64",
-"HIGH3ADJ"
-"UNKNOWN",   /* MUST be last */
+static const char * const tbl[] = {
+  "ABSOLUTE",
+  "HIGH",
+  "LOW",
+  "HIGHLOW",
+  "HIGHADJ",
+  "MIPS_JMPADDR",
+  "SECTION",
+  "REL32",
+  "RESERVED1",
+  "MIPS_JMPADDR16",
+  "DIR64",
+  "HIGH3ADJ"
+  "UNKNOWN",   /* MUST be last */
 };
 
 static boolean
@@ -1745,10 +1761,10 @@ pe_print_reloc (abfd, vfile)
 	     low 16 bits of addend.  */
 	  if (t == IMAGE_REL_BASED_HIGHADJ)
 	    {
-	       fprintf (file, " (%4x)",
-			((unsigned int)
-			 bfd_get_16 (abfd, data + i + 8 + j * 2 + 2)));
-	       j++;
+	      fprintf (file, " (%4x)",
+		       ((unsigned int)
+			bfd_get_16 (abfd, data + i + 8 + j * 2 + 2)));
+	      j++;
 	    }
 
 	  fprintf (file, "\n");
@@ -1779,7 +1795,7 @@ _bfd_pe_print_private_bfd_data_common (abfd, vfile)
      emulate it here.  */
   fprintf (file, _("\nCharacteristics 0x%x\n"), pe->real_flags);
 #undef PF
-#define PF(x, y)    if (pe->real_flags & x) { fprintf (file, "\t%s\n", y); }
+#define PF(x, y) if (pe->real_flags & x) { fprintf (file, "\t%s\n", y); }
   PF (F_RELFLG, "relocations stripped");
   PF (F_EXEC, "executable");
   PF (F_LNNO, "line numbers stripped");
@@ -1891,8 +1907,8 @@ _bfd_pe_bfd_copy_private_bfd_data_common (ibfd, obfd)
      if we don't remove this entry as well.  */
   if (! pe_data (obfd)->has_reloc_section)
     {
-      pe_data(obfd)->pe_opthdr.DataDirectory[5].VirtualAddress = 0;
-      pe_data(obfd)->pe_opthdr.DataDirectory[5].Size = 0;
+      pe_data (obfd)->pe_opthdr.DataDirectory[5].VirtualAddress = 0;
+      pe_data (obfd)->pe_opthdr.DataDirectory[5].Size = 0;
     }
   return true;
 }
@@ -1929,7 +1945,7 @@ _bfd_pe_bfd_copy_private_section_data (ibfd, isec, obfd, osec)
       pei_section_data (obfd, osec)->virt_size =
 	pei_section_data (ibfd, isec)->virt_size;
       pei_section_data (obfd, osec)->pe_flags =
-        pei_section_data (ibfd, isec)->pe_flags;
+	pei_section_data (ibfd, isec)->pe_flags;
     }
 
   return true;
@@ -1973,7 +1989,7 @@ _bfd_pei_final_link_postscript (abfd, pfinfo)
 			      ".idata$2", false, false, true);
   if (h1 != NULL)
     {
-      pe_data(abfd)->pe_opthdr.DataDirectory[1].VirtualAddress =
+      pe_data (abfd)->pe_opthdr.DataDirectory[1].VirtualAddress =
 	(h1->root.u.def.value
 	 + h1->root.u.def.section->output_section->vma
 	 + h1->root.u.def.section->output_offset);
@@ -1983,7 +1999,7 @@ _bfd_pei_final_link_postscript (abfd, pfinfo)
 	((h1->root.u.def.value
 	  + h1->root.u.def.section->output_section->vma
 	  + h1->root.u.def.section->output_offset)
-	 - pe_data(abfd)->pe_opthdr.DataDirectory[1].VirtualAddress);
+	 - pe_data (abfd)->pe_opthdr.DataDirectory[1].VirtualAddress);
 
       /* The import address table.  This is the size/address of
          .idata$5.  */
@@ -1999,7 +2015,7 @@ _bfd_pei_final_link_postscript (abfd, pfinfo)
 	((h1->root.u.def.value
 	  + h1->root.u.def.section->output_section->vma
 	  + h1->root.u.def.section->output_offset)
-	 - pe_data(abfd)->pe_opthdr.DataDirectory[12].VirtualAddress);
+	 - pe_data (abfd)->pe_opthdr.DataDirectory[12].VirtualAddress);
     }
 
   /* If we couldn't find idata$2, we either have an excessively
diff --git a/bfd/som.c b/bfd/som.c
index 3bde283..93344e8 100644
--- a/bfd/som.c
+++ b/bfd/som.c
@@ -73,7 +73,6 @@
      ((__m_num) >= _PA_RISC1_1_ID && (__m_num) <= _PA_RISC_MAXID))
 #endif /* _PA_RISC_ID */
 
-
 /* HIUX in it's infinite stupidity changed the names for several "well
    known" constants.  Work around such braindamage.  Try the HPUX version
    first, then the HIUX version, and finally provide a default.  */
@@ -91,7 +90,7 @@
 
 /* Size (in chars) of the temporary buffers used during fixup and string
    table writes.   */
-   
+
 #define SOM_TMP_BUFSIZE 8192
 
 /* Size of the hash table in archives.  */
@@ -107,7 +106,7 @@
 /* SOM allows any one of the four previous relocations to be reused
    with a "R_PREV_FIXUP" relocation entry.  Since R_PREV_FIXUP
    relocations are always a single byte, using a R_PREV_FIXUP instead
-   of some multi-byte relocation makes object files smaller. 
+   of some multi-byte relocation makes object files smaller.
 
    Note one side effect of using a R_PREV_FIXUP is the relocation that
    is being repeated moves to the front of the queue.  */
@@ -198,7 +197,7 @@ static boolean som_find_nearest_line PARAMS ((bfd *, asection *,
 					      CONST char **,
 					      unsigned int *));
 static void som_get_symbol_info PARAMS ((bfd *, asymbol *, symbol_info *));
-static asection * bfd_section_from_som_symbol PARAMS ((bfd *, 
+static asection * bfd_section_from_som_symbol PARAMS ((bfd *,
 					struct symbol_dictionary_record *));
 static int log2 PARAMS ((unsigned int));
 static bfd_reloc_status_type hppa_som_reloc PARAMS ((bfd *, arelent *,
@@ -269,11 +268,11 @@ static boolean som_is_subspace PARAMS ((asection *));
 static boolean som_is_container PARAMS ((asection *, asection *));
 static boolean som_bfd_free_cached_info PARAMS ((bfd *));
 static boolean som_bfd_link_split_section PARAMS ((bfd *, asection *));
-	
+
 /* Map SOM section names to POSIX/BSD single-character symbol types.
 
-   This table includes all the standard subspaces as defined in the 
-   current "PRO ABI for PA-RISC Systems", $UNWIND$ which for 
+   This table includes all the standard subspaces as defined in the
+   current "PRO ABI for PA-RISC Systems", $UNWIND$ which for
    some reason was left out, and sections specific to embedded stabs.  */
 
 static const struct section_to_type stt[] = {
@@ -307,7 +306,7 @@ static const struct section_to_type stt[] = {
 
    Right now this table is only used to count and perform minimal
    processing on relocation streams so that they can be internalized
-   into BFD and symbolically printed by utilities.  To make actual use 
+   into BFD and symbolically printed by utilities.  To make actual use
    of them would be much more difficult, BFD's concept of relocations
    is far too simple to handle SOM relocations.  The basic assumption
    that a relocation can be completely processed independent of other
@@ -315,7 +314,7 @@ static const struct section_to_type stt[] = {
 
    The SOM relocations are meant to be processed as a stream, they
    specify copying of data from the input section to the output section
-   while possibly modifying the data in some manner.  They also can 
+   while possibly modifying the data in some manner.  They also can
    specify that a variable number of zeros or uninitialized data be
    inserted on in the output segment at the current offset.  Some
    relocations specify that some previous relocation be re-applied at
@@ -325,7 +324,7 @@ static const struct section_to_type stt[] = {
    in the BFD relocation data structure to store enough information to
    perform all the relocations.
 
-   Each entry in the table has three fields. 
+   Each entry in the table has three fields.
 
    The first entry is an index into this "class" of relocations.  This
    index can then be used as a variable within the relocation itself.
@@ -333,14 +332,14 @@ static const struct section_to_type stt[] = {
    The second field is a format string which actually controls processing
    of the relocation.  It uses a simple postfix machine to do calculations
    based on variables/constants found in the string and the relocation
-   stream.  
+   stream.
 
-   The third field specifys whether or not this relocation may use 
+   The third field specifys whether or not this relocation may use
    a constant (V) from the previous R_DATA_OVERRIDE rather than a constant
    stored in the instruction.
 
-   Variables:  
-  
+   Variables:
+
    L = input space byte count
    D = index into class of relocations
    M = output space byte count
@@ -352,25 +351,25 @@ static const struct section_to_type stt[] = {
    U = second 32 bits of stack unwind information
    V = a literal constant (usually used in the next relocation)
    P = a previous relocation
-  
-   Lower case letters (starting with 'b') refer to following 
+
+   Lower case letters (starting with 'b') refer to following
    bytes in the relocation stream.  'b' is the next 1 byte,
-   c is the next 2 bytes, d is the next 3 bytes, etc...  
+   c is the next 2 bytes, d is the next 3 bytes, etc...
    This is the variable part of the relocation entries that
    makes our life a living hell.
 
    numerical constants are also used in the format string.  Note
-   the constants are represented in decimal. 
+   the constants are represented in decimal.
 
    '+', "*" and "=" represents the obvious postfix operators.
-   '<' represents a left shift. 
+   '<' represents a left shift.
 
    Stack Operations:
 
    Parameter Relocation Bits:
 
-   Unwind Entries:  
-   
+   Unwind Entries:
+
    Previous Relocations:  The index field represents which in the queue
    of 4 previous fixups should be re-applied.
 
@@ -1046,10 +1045,10 @@ static reloc_howto_type som_hppa_howto_table[] =
   SOM_HOWTO (R_RESERVED, "R_RESERVED"),
   SOM_HOWTO (R_RESERVED, "R_RESERVED"),
   SOM_HOWTO (R_RESERVED, "R_RESERVED")};
-  
+
 /* Initialize the SOM relocation queue.  By definition the queue holds
    the last four multibyte fixups.  */
-  
+
 static void
 som_initialize_reloc_queue (queue)
      struct reloc_queue *queue;
@@ -1131,7 +1130,7 @@ som_reloc_queue_fix (queue, index)
       queue[1].size = tmp2;
       return;
     }
-  abort();
+  abort ();
 }
 
 /* Search for a particular relocation in the relocation queue.  */
@@ -1170,7 +1169,7 @@ try_prev_fixup (abfd, subspace_reloc_sizep, p, size, queue)
   if (queue_index != -1)
     {
       /* Found this in a previous fixup.  Undo the fixup we
-	 just built and use R_PREV_FIXUP instead.  We saved 
+	 just built and use R_PREV_FIXUP instead.  We saved
 	 a total of size - 1 bytes in the fixup stream.  */
       bfd_put_8 (abfd, R_PREV_FIXUP + queue_index, p);
       p += 1;
@@ -1188,7 +1187,7 @@ try_prev_fixup (abfd, subspace_reloc_sizep, p, size, queue)
 
 /* Emit the proper R_NO_RELOCATION fixups to map the next SKIP
    bytes without any relocation.  Update the size of the subspace
-   relocation stream via SUBSPACE_RELOC_SIZE_P; also return the 
+   relocation stream via SUBSPACE_RELOC_SIZE_P; also return the
    current pointer into the relocation stream.  */
 
 static unsigned char *
@@ -1219,8 +1218,8 @@ som_reloc_skip (abfd, skip, p, subspace_reloc_sizep, queue)
 	     most recent fixup.  */
 	}
     }
-  
-  /* The difference must be less than 0x1000000.  Use one 
+
+  /* The difference must be less than 0x1000000.  Use one
      more R_NO_RELOCATION entry to get to the right difference.  */
   if ((skip & 3) == 0 && skip <= 0xc0000 && skip > 0)
     {
@@ -1271,11 +1270,11 @@ som_reloc_addend (abfd, addend, p, subspace_reloc_sizep, queue)
      unsigned int *subspace_reloc_sizep;
      struct reloc_queue *queue;
 {
-  if ((unsigned)(addend) + 0x80 < 0x100)
+  if ((unsigned) (addend) + 0x80 < 0x100)
     {
       bfd_put_8 (abfd, R_DATA_OVERRIDE + 1, p);
       bfd_put_8 (abfd, addend, p + 1);
-      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 2, queue); 
+      p = try_prev_fixup (abfd, subspace_reloc_sizep, p, 2, queue);
     }
   else if ((unsigned) (addend) + 0x8000 < 0x10000)
     {
@@ -1313,11 +1312,11 @@ som_reloc_call (abfd, p, subspace_reloc_sizep, bfd_reloc, sym_num, queue)
   int arg_bits = HPPA_R_ARG_RELOC (bfd_reloc->addend);
   int rtn_bits = arg_bits & 0x3;
   int type, done = 0;
-  
+
   /* You'll never believe all this is necessary to handle relocations
      for function calls.  Having to compute and pack the argument
      relocation bits is the real nightmare.
-     
+
      If you're interested in how this works, just forget it.  You really
      do not want to know about this braindamage.  */
 
@@ -1369,7 +1368,7 @@ som_reloc_call (abfd, p, subspace_reloc_sizep, bfd_reloc, sym_num, queue)
 	  done = 1;
 	}
     }
-  
+
   /* If this could not be handled with a simple relocation, then do a hard
      one.  Hard relocations occur if the symbol number was too high or if
      the encoding of argument relocation bits is too complex.  */
@@ -1386,14 +1385,14 @@ som_reloc_call (abfd, p, subspace_reloc_sizep, bfd_reloc, sym_num, queue)
 	type += 9 * 4;
       else
 	type += (3 * (arg_bits >> 4 & 3) + (arg_bits >> 2 & 3)) * 4;
-      
+
       /* Output the first two bytes of the relocation.  These describe
 	 the length of the relocation and encoding style.  */
       bfd_put_8 (abfd, bfd_reloc->howto->type + 10
 		 + 2 * (sym_num >= 0x100) + (type >= 0x100),
 		 p);
       bfd_put_8 (abfd, type, p + 1);
-      
+
       /* Now output the symbol index and see if this bizarre relocation
 	 just happened to be in the relocation queue.  */
       if (sym_num < 0x100)
@@ -1411,8 +1410,7 @@ som_reloc_call (abfd, p, subspace_reloc_sizep, bfd_reloc, sym_num, queue)
   return p;
 }
 
-
-/* Return the logarithm of X, base 2, considering X unsigned. 
+/* Return the logarithm of X, base 2, considering X unsigned.
    Abort -1 if X is not a power or two or is zero.  */
 
 static int
@@ -1468,7 +1466,7 @@ hppa_som_gen_reloc_type (abfd, base_type, format, field, sym_diff, sym)
   if (!final_types || !final_type)
     return NULL;
 
-  /* The field selector may require additional relocations to be 
+  /* The field selector may require additional relocations to be
      generated.  It's impossible to know at this moment if additional
      relocations will be needed, so we make them.  The code to actually
      write the relocation/fixup stream is responsible for removing
@@ -1574,7 +1572,7 @@ hppa_som_gen_reloc_type (abfd, base_type, format, field, sym_diff, sym)
 	*final_type = base_type;
 	break;
     }
-  
+
   switch (base_type)
     {
     case R_HPPA:
@@ -1649,7 +1647,6 @@ hppa_som_gen_reloc_type (abfd, base_type, format, field, sym_diff, sym)
 	}
       break;
 
-
     case R_HPPA_GOTOFF:
       /* More PLABEL special cases.  */
       if (field == e_psel
@@ -1796,7 +1793,7 @@ som_object_setup (abfd, file_hdrp, aux_hdrp, current_offset)
 
      It's about time, OSF has used the new id since at least 1992;
      HPUX didn't start till nearly 1995!.
-    
+
      The new approach examines the entry field.  If it's zero or not 4
      byte aligned then it's not a proper code address and we guess it's
      really the executable flags.  */
@@ -1825,7 +1822,7 @@ som_object_setup (abfd, file_hdrp, aux_hdrp, current_offset)
   bfd_default_set_arch_mach (abfd, bfd_arch_hppa, pa10);
   bfd_get_symcount (abfd) = file_hdrp->symbol_total;
 
-  /* Initialize the saved symbol table and string table to NULL.  
+  /* Initialize the saved symbol table and string table to NULL.
      Save important offsets and sizes from the SOM header into
      the BFD.  */
   obj_som_stringtab (abfd) = (char  *) NULL;
@@ -1865,7 +1862,7 @@ setup_sections (abfd, file_hdr, current_offset)
   if (!space_strings && file_hdr->space_strings_size != 0)
     goto error_return;
 
-  if (bfd_seek (abfd, current_offset + file_hdr->space_strings_location, 
+  if (bfd_seek (abfd, current_offset + file_hdr->space_strings_location,
   		SEEK_SET) < 0)
     goto error_return;
   if (bfd_read (space_strings, 1, file_hdr->space_strings_size, abfd)
@@ -1898,7 +1895,7 @@ setup_sections (abfd, file_hdr, current_offset)
       if (!newname)
 	goto error_return;
       strcpy (newname, space.name.n_name);
-			   
+
       space_asect = bfd_make_section_anyway (abfd, newname);
       if (!space_asect)
 	goto error_return;
@@ -1973,7 +1970,7 @@ setup_sections (abfd, file_hdr, current_offset)
 						 subspace.quadrant) == false)
 	    goto error_return;
 
-	  /* Keep an easy mapping between subspaces and sections. 
+	  /* Keep an easy mapping between subspaces and sections.
 	     Note we do not necessarily read the subspaces in the
 	     same order in which they appear in the object file.
 
@@ -1989,12 +1986,12 @@ setup_sections (abfd, file_hdr, current_offset)
 	     by the access_control_bits in the subspace header.  */
 	  switch (subspace.access_control_bits >> 4)
 	    {
-	    /* Readonly data.  */  
+	    /* Readonly data.  */
 	    case 0x0:
 	      subspace_asect->flags |= SEC_DATA | SEC_READONLY;
 	      break;
 
-	    /* Normal data.  */  
+	    /* Normal data.  */
 	    case 0x1:
 	      subspace_asect->flags |= SEC_DATA;
 	      break;
@@ -2015,8 +2012,8 @@ setup_sections (abfd, file_hdr, current_offset)
 	      subspace_asect->flags |= SEC_CODE;
 	      break;
 	    }
-	  
-	  if (subspace.dup_common || subspace.is_common) 
+
+	  if (subspace.dup_common || subspace.is_common)
 	    subspace_asect->flags |= SEC_IS_COMMON;
 	  else if (subspace.subspace_length > 0)
 	    subspace_asect->flags |= SEC_HAS_CONTENTS;
@@ -2045,7 +2042,7 @@ setup_sections (abfd, file_hdr, current_offset)
 	      subspace_asect->rel_filepos = subspace.fixup_request_index;
 	      som_section_data (subspace_asect)->reloc_size
 		= subspace.fixup_request_quantity;
-	      /* We can not determine this yet.  When we read in the 
+	      /* We can not determine this yet.  When we read in the
 		 relocation table the correct value will be filled in.  */
 	      subspace_asect->reloc_count = -1;
 	    }
@@ -2100,7 +2097,7 @@ setup_sections (abfd, file_hdr, current_offset)
     }
   qsort (subspace_sections, total_subspaces,
 	 sizeof (asection *), compare_subspaces);
-  
+
   /* subspace_sections is now sorted in the order in which the subspaces
      appear in the object file.  Assign an index to each one now.  */
   for (i = 0; i < total_subspaces; i++)
@@ -2134,7 +2131,7 @@ som_object_p (abfd)
   unsigned long current_offset = 0;
   struct lst_header lst_header;
   struct som_entry som_entry;
-#define ENTRY_SIZE sizeof(struct som_entry)
+#define ENTRY_SIZE sizeof (struct som_entry)
 
   if (bfd_read ((PTR) & file_hdr, 1, FILE_HDR_SIZE, abfd) != FILE_HDR_SIZE)
     {
@@ -2321,7 +2318,7 @@ som_prep_headers (abfd)
      a wise thing to do, it makes comparing objects during a multi-stage
      bootstrap difficult.  */
   file_hdr->file_time.secs = 0;
-  file_hdr->file_time.nanosecs = 0; 
+  file_hdr->file_time.nanosecs = 0;
 
   file_hdr->entry_space = 0;
   file_hdr->entry_subspace = 0;
@@ -2337,7 +2334,7 @@ som_prep_headers (abfd)
 	 subspace.  */
       if (!som_is_space (section) && !som_is_subspace (section))
 	continue;
-      
+
       if (som_is_space (section))
 	{
 	  /* Allocate space for the space dictionary.  */
@@ -2352,11 +2349,11 @@ som_prep_headers (abfd)
 	  som_section_data (section)->space_dict->init_pointer_index = -1;
 
 	  /* Set more attributes that were stuffed away in private data.  */
-	  som_section_data (section)->space_dict->sort_key = 
+	  som_section_data (section)->space_dict->sort_key =
 	    som_section_data (section)->copy_data->sort_key;
-	  som_section_data (section)->space_dict->is_defined = 
+	  som_section_data (section)->space_dict->is_defined =
 	    som_section_data (section)->copy_data->is_defined;
-	  som_section_data (section)->space_dict->is_private = 
+	  som_section_data (section)->space_dict->is_private =
 	    som_section_data (section)->copy_data->is_private;
 	  som_section_data (section)->space_dict->space_number =
 	    som_section_data (section)->copy_data->space_number;
@@ -2385,13 +2382,13 @@ som_prep_headers (abfd)
 	  if (section->flags & SEC_CODE)
 	    som_section_data (section)->subspace_dict->code_only = 1;
 
-	  som_section_data (section)->subspace_dict->subspace_start = 
+	  som_section_data (section)->subspace_dict->subspace_start =
 	    section->vma;
 	  som_section_data (section)->subspace_dict->subspace_length =
 	    bfd_section_size (abfd, section);
 	  som_section_data (section)->subspace_dict->initialization_length =
 	    bfd_section_size (abfd, section);
-	  som_section_data (section)->subspace_dict->alignment = 
+	  som_section_data (section)->subspace_dict->alignment =
 	    1 << section->alignment_power;
 
 	  /* Set more attributes that were stuffed away in private data.  */
@@ -2508,7 +2505,7 @@ compare_syms (arg1, arg2)
   asymbol **sym1 = (asymbol **) arg1;
   asymbol **sym2 = (asymbol **) arg2;
   unsigned int count1, count2;
-  
+
   /* Get relocation count for each symbol.  Note that the count
      is stored in the udata pointer for section symbols!  */
   if ((*sym1)->flags & BSF_SECTION_SYM)
@@ -2540,7 +2537,7 @@ compare_subspaces (arg1, arg2)
 {
   asection **subspace1 = (asection **) arg1;
   asection **subspace2 = (asection **) arg2;
-  
+
   if ((*subspace1)->target_index < (*subspace2)->target_index)
     return -1;
   else if ((*subspace2)->target_index < (*subspace1)->target_index)
@@ -2604,7 +2601,7 @@ som_prep_for_fixups (abfd, syms, num_syms)
 	      || bfd_is_abs_section ((*reloc->sym_ptr_ptr)->section))
 	    continue;
 
-	  /* Scaling to encourage symbols involved in R_DP_RELATIVE 
+	  /* Scaling to encourage symbols involved in R_DP_RELATIVE
 	     and R_CODE_ONE_SYMBOL relocations to come first.  These
 	     two relocations have single byte versions if the symbol
 	     index is very small.  */
@@ -2712,7 +2709,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 	  som_section_data (subsection)->subspace_dict->fixup_request_index
 	    = total_reloc_size;
 
-	  /* To make life easier start over with a clean slate for 
+	  /* To make life easier start over with a clean slate for
 	     each subspace.  Seek to the start of the relocation stream
 	     for this subspace in preparation for writing out its fixup
 	     stream.  */
@@ -2730,7 +2727,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 	  current_call_mode = R_SHORT_PCREL_MODE;
 #endif
 
-	  /* Translate each BFD relocation into one or more SOM 
+	  /* Translate each BFD relocation into one or more SOM
 	     relocations.  */
 	  for (j = 0; j < subsection->reloc_count; j++)
 	    {
@@ -2738,16 +2735,16 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 	      unsigned int skip;
 	      int sym_num;
 
-	      /* Get the symbol number.  Remember it's stored in a 
+	      /* Get the symbol number.  Remember it's stored in a
 		 special place for section symbols.  */
 	      if ((*bfd_reloc->sym_ptr_ptr)->flags & BSF_SECTION_SYM)
 		sym_num = (*bfd_reloc->sym_ptr_ptr)->udata.i;
 	      else
 		sym_num = som_symbol_data (*bfd_reloc->sym_ptr_ptr)->index;
-	      
+
 	      /* If there is not enough room for the next couple relocations,
 		 then dump the current buffer contents now.  Also reinitialize
-		 the relocation queue. 
+		 the relocation queue.
 
 		 No single BFD relocation could ever translate into more
 		 than 100 bytes of SOM relocations (20bytes is probably the
@@ -2818,7 +2815,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 		case R_DP_RELATIVE:
 		  /* Account for any addend.  */
 		  if (bfd_reloc->addend)
-		    p = som_reloc_addend (abfd, bfd_reloc->addend, p, 
+		    p = som_reloc_addend (abfd, bfd_reloc->addend, p,
 					  &subspace_reloc_size, reloc_queue);
 
 		  if (sym_num < 0x20)
@@ -2838,7 +2835,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 		    {
 		      bfd_put_8 (abfd, bfd_reloc->howto->type + 33, p);
 		      bfd_put_8 (abfd, sym_num >> 16, p + 1);
-		      bfd_put_16 (abfd, sym_num, p + 2); 
+		      bfd_put_16 (abfd, sym_num, p + 2);
 		      p = try_prev_fixup (abfd, &subspace_reloc_size,
 					  p, 4, reloc_queue);
 		    }
@@ -2853,7 +2850,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 		  /* Account for any addend using R_DATA_OVERRIDE.  */
 		  if (bfd_reloc->howto->type != R_DATA_ONE_SYMBOL
 		      && bfd_reloc->addend)
-		    p = som_reloc_addend (abfd, bfd_reloc->addend, p, 
+		    p = som_reloc_addend (abfd, bfd_reloc->addend, p,
 					  &subspace_reloc_size, reloc_queue);
 
 		  if (sym_num < 0x100)
@@ -2867,7 +2864,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 		    {
 		      bfd_put_8 (abfd, bfd_reloc->howto->type + 1, p);
 		      bfd_put_8 (abfd, sym_num >> 16, p + 1);
-		      bfd_put_16 (abfd, sym_num, p + 2); 
+		      bfd_put_16 (abfd, sym_num, p + 2);
 		      p = try_prev_fixup (abfd, &subspace_reloc_size,
 					  p, 4, reloc_queue);
 		    }
@@ -2888,7 +2885,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 		       the R_ENTRY relocation, and the rest in the R_EXIT
 		       relocation.  */
 		    bfd_put_32 (abfd, bfd_reloc->addend, p + 1);
-		
+
 		    /* Find the next R_EXIT relocation.  */
 		    for (tmp = j; tmp < subsection->reloc_count; tmp++)
 		      {
@@ -2905,7 +2902,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 					p, 9, reloc_queue);
 		    break;
 		  }
-		  
+
 		case R_N_MODE:
 		case R_S_MODE:
 		case R_D_MODE:
@@ -2971,9 +2968,9 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 					  p, 4, reloc_queue);
 		    }
 		  break;
-		      
+
 		case R_COMP1:
-		  /* The only time we generate R_COMP1, R_COMP2 and 
+		  /* The only time we generate R_COMP1, R_COMP2 and
 		     R_CODE_EXPR relocs is for the difference of two
 		     symbols.  Hence we can cheat here.  */
 		  bfd_put_8 (abfd, bfd_reloc->howto->type, p);
@@ -2983,7 +2980,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 		  break;
 
 		case R_COMP2:
-		  /* The only time we generate R_COMP1, R_COMP2 and 
+		  /* The only time we generate R_COMP1, R_COMP2 and
 		     R_CODE_EXPR relocs is for the difference of two
 		     symbols.  Hence we can cheat here.  */
 		  bfd_put_8 (abfd, bfd_reloc->howto->type, p);
@@ -2996,7 +2993,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 
 		case R_CODE_EXPR:
 		case R_DATA_EXPR:
-		  /* The only time we generate R_COMP1, R_COMP2 and 
+		  /* The only time we generate R_COMP1, R_COMP2 and
 		     R_CODE_EXPR relocs is for the difference of two
 		     symbols.  Hence we can cheat here.  */
 		  bfd_put_8 (abfd, bfd_reloc->howto->type, p);
@@ -3017,7 +3014,7 @@ som_write_fixups (abfd, current_offset, total_reloc_sizep)
 
 	  /* Last BFD relocation for a subspace has been processed.
 	     Map the rest of the subspace with R_NO_RELOCATION fixups.  */
-	  p = som_reloc_skip (abfd, bfd_section_size (abfd, subsection) 
+	  p = som_reloc_skip (abfd, bfd_section_size (abfd, subsection)
 			              - reloc_offset,
 			      p, &subspace_reloc_size, reloc_queue);
 
@@ -3080,7 +3077,7 @@ som_write_space_strings (abfd, current_offset, string_sizep)
 	{
 	  /* Flush buffer before refilling or reallocating.  */
 	  if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd)
-	      != p - tmp_space) 
+	      != p - tmp_space)
 	    return false;
 
 	  /* Reallocate if now empty buffer still too small.  */
@@ -3149,7 +3146,7 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
      COMPUNIT *compilation_unit;
 {
   unsigned int i;
-  
+
   /* Chunk of memory that we can use as buffer space, then throw
      away.  */
   size_t tmp_space_size = SOM_TMP_BUFSIZE;
@@ -3189,7 +3186,7 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
 	     larger buffer.  */
 	  if (p - tmp_space + 5 + length > tmp_space_size)
 	    {
-	      /* Flush buffer before refilling or reallocating. */
+	      /* Flush buffer before refilling or reallocating.  */
 	      if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd)
 		  != p - tmp_space)
 		return false;
@@ -3220,19 +3217,19 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
 
 	  switch (i)
 	    {
-	    case 0:	
+	    case 0:
 	      obj_som_compilation_unit (abfd)->name.n_strx = strings_size;
 	      break;
 	    case 1:
-	      obj_som_compilation_unit (abfd)->language_name.n_strx = 
+	      obj_som_compilation_unit (abfd)->language_name.n_strx =
 		strings_size;
 	      break;
 	    case 2:
-	      obj_som_compilation_unit (abfd)->product_id.n_strx = 
+	      obj_som_compilation_unit (abfd)->product_id.n_strx =
 		strings_size;
 	      break;
 	    case 3:
-	      obj_som_compilation_unit (abfd)->version_id.n_strx = 
+	      obj_som_compilation_unit (abfd)->version_id.n_strx =
 		strings_size;
 	      break;
 	    }
@@ -3258,7 +3255,7 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
 	 current buffer contents now and maybe allocate a larger buffer.  */
      if (p - tmp_space + 5 + length > tmp_space_size)
 	{
-	  /* Flush buffer before refilling or reallocating. */
+	  /* Flush buffer before refilling or reallocating.  */
 	  if (bfd_write ((PTR) &tmp_space[0], p - tmp_space, 1, abfd)
 	      != p - tmp_space)
 	    return false;
@@ -3307,11 +3304,11 @@ som_write_symbol_strings (abfd, current_offset, syms, num_syms, string_sizep,
   return true;
 }
 
-/* Compute variable information to be placed in the SOM headers, 
+/* Compute variable information to be placed in the SOM headers,
    space/subspace dictionaries, relocation streams, etc.  Begin
    writing parts of the object file.  */
 
-static boolean 
+static boolean
 som_begin_writing (abfd)
      bfd *abfd;
 {
@@ -3322,7 +3319,7 @@ som_begin_writing (abfd)
   unsigned int total_subspaces = 0;
   struct som_exec_auxhdr *exec_header = NULL;
 
-  /* The file header will always be first in an object file, 
+  /* The file header will always be first in an object file,
      everything else can be in random locations.  To keep things
      "simple" BFD will lay out the object file in the manner suggested
      by the PRO ABI for PA-RISC Systems.  */
@@ -3334,7 +3331,7 @@ som_begin_writing (abfd)
 
   /* Make room for the file header, it's contents are not complete
      yet, so it can not be written at this time.  */
-  current_offset += sizeof (struct header);  
+  current_offset += sizeof (struct header);
 
   /* Any auxiliary headers will follow the file header.  Right now
      we support only the copyright and version headers.  */
@@ -3437,7 +3434,7 @@ som_begin_writing (abfd)
   if (current_offset % 4)
     current_offset += (4 - (current_offset % 4));
 
-  /* Mark the offset of the space/subspace string table in the 
+  /* Mark the offset of the space/subspace string table in the
      file header.  */
   obj_som_file_hdr (abfd)->space_strings_location = current_offset;
 
@@ -3450,13 +3447,13 @@ som_begin_writing (abfd)
   obj_som_file_hdr (abfd)->space_strings_size = strings_size;
   current_offset += strings_size;
 
-  /* Next is the compilation unit. */
+  /* Next is the compilation unit.  */
   obj_som_file_hdr (abfd)->compiler_location = current_offset;
   obj_som_file_hdr (abfd)->compiler_total = 0;
-  if (obj_som_compilation_unit (abfd)) 
+  if (obj_som_compilation_unit (abfd))
     {
       obj_som_file_hdr (abfd)->compiler_total = 1;
-      current_offset += COMPUNITSZ; 
+      current_offset += COMPUNITSZ;
     }
 
   /* Now compute the file positions for the loadable subspaces, taking
@@ -3518,7 +3515,7 @@ som_begin_writing (abfd)
 
 	      /* Keep track of exactly where we are within a particular
 		 space.  This is necessary as the braindamaged HPUX
-		 loader will create holes between subspaces *and* 
+		 loader will create holes between subspaces *and*
 		 subspace alignments are *NOT* preserved.  What a crock.  */
 	      subspace_offset = subsection->vma;
 
@@ -3547,7 +3544,6 @@ som_begin_writing (abfd)
 	      subspace_offset += subsection->vma - subspace_offset;
 	    }
 
-
 	  subsection->target_index = total_subspaces++;
 	  /* This is real data to be loaded from the file.  */
 	  if (subsection->flags & SEC_LOAD)
@@ -3562,7 +3558,7 @@ som_begin_writing (abfd)
 	      som_section_data (subsection)->subspace_dict->file_loc_init_value
 		= current_offset;
 	      subsection->filepos = current_offset;
-	      current_offset += bfd_section_size (abfd, subsection); 
+	      current_offset += bfd_section_size (abfd, subsection);
 	      subspace_offset += bfd_section_size (abfd, subsection);
 	    }
 	  /* Looks like uninitialized data.  */
@@ -3579,7 +3575,7 @@ som_begin_writing (abfd)
 	    }
 	}
       /* Goto the next section.  */
-      section = section->next; 
+      section = section->next;
     }
 
   /* Finally compute the file positions for unloadable subspaces.
@@ -3607,7 +3603,7 @@ som_begin_writing (abfd)
 	   subsection != NULL;
 	   subsection = subsection->next)
 	{
-	  
+
 	  if (!som_is_subspace (subsection)
 	      || !som_is_container (section, subsection)
 	      || (subsection->flags & SEC_ALLOC) != 0)
@@ -3620,7 +3616,7 @@ som_begin_writing (abfd)
 	      som_section_data (subsection)->subspace_dict->file_loc_init_value
 		= current_offset;
 	      subsection->filepos = current_offset;
-	      current_offset += bfd_section_size (abfd, subsection); 
+	      current_offset += bfd_section_size (abfd, subsection);
 	    }
 	  /* Looks like uninitialized data.  */
 	  else
@@ -3632,7 +3628,7 @@ som_begin_writing (abfd)
 	    }
 	}
       /* Goto the next section.  */
-      section = section->next; 
+      section = section->next;
     }
 
   /* If building an executable, then make sure to seek to and write
@@ -3681,7 +3677,7 @@ som_finish_writing (abfd)
      The names of the symbols are stored in a separate string table,
      and the index for each symbol name into the string table is computed
      below.  Therefore, it is not possible to write the symbol table
-     at this time. 
+     at this time.
 
      These used to be output before the subspace contents, but they
      were moved here to work around a stupid bug in the hpux linker
@@ -3690,7 +3686,7 @@ som_finish_writing (abfd)
 
   /* Make sure we're on a word boundary.  */
   if (current_offset % 4)
-    current_offset += (4 - (current_offset % 4)); 
+    current_offset += (4 - (current_offset % 4));
 
   num_syms = bfd_get_symcount (abfd);
   obj_som_file_hdr (abfd)->symbol_location = current_offset;
@@ -3723,7 +3719,7 @@ som_finish_writing (abfd)
   /* At the end of the file is the fixup stream which starts on a
      word boundary.  */
   if (current_offset % 4)
-    current_offset += (4 - (current_offset % 4)); 
+    current_offset += (4 - (current_offset % 4));
   obj_som_file_hdr (abfd)->fixup_request_location = current_offset;
 
   /* Write the fixups and update fields in subspace headers which
@@ -3736,7 +3732,7 @@ som_finish_writing (abfd)
 
   /* Done.  Store the total size of the SOM.  */
   obj_som_file_hdr (abfd)->som_length = current_offset + total_reloc_size;
- 
+
   /* Now that the symbol table information is complete, build and
      write the symbol table.  */
   if (som_build_and_write_symbol_table (abfd) == false)
@@ -3765,7 +3761,7 @@ som_finish_writing (abfd)
 	   subsection != NULL;
 	   subsection = subsection->next)
 	{
-	  
+
 	  /* Skip any section which does not correspond to a space
 	     or subspace.  Or does not have SEC_ALLOC set (and therefore
 	     has no real bits on the disk).  */
@@ -3793,7 +3789,7 @@ som_finish_writing (abfd)
 	  /* Mark the index of the current space within the subspace's
 	     dictionary record.  */
 	  som_section_data (subsection)->subspace_dict->space_index = i;
-	  
+
 	  /* Dump the current subspace header.  */
 	  if (bfd_write ((PTR) som_section_data (subsection)->subspace_dict,
 			 sizeof (struct subspace_dictionary_record), 1, abfd)
@@ -3801,7 +3797,7 @@ som_finish_writing (abfd)
 	    return false;
 	}
       /* Goto the next section.  */
-      section = section->next; 
+      section = section->next;
     }
 
   /* Now repeat the process for unloadable subspaces.  */
@@ -3820,7 +3816,7 @@ som_finish_writing (abfd)
 	   subsection != NULL;
 	   subsection = subsection->next)
 	{
-	  
+
 	  /* Skip any section which does not correspond to a space or
 	     subspace, or which SEC_ALLOC set (and therefore handled
 	     in the loadable spaces/subspaces code above).  */
@@ -3844,12 +3840,12 @@ som_finish_writing (abfd)
 	  /* Increment the number of subspaces seen and the number of
 	     subspaces contained within the current space.  */
 	  som_section_data (section)->space_dict->subspace_quantity++;
-	  subspace_index++; 
+	  subspace_index++;
 
 	  /* Mark the index of the current space within the subspace's
 	     dictionary record.  */
 	  som_section_data (subsection)->subspace_dict->space_index = i;
-	  
+
 	  /* Dump this subspace header.  */
 	  if (bfd_write ((PTR) som_section_data (subsection)->subspace_dict,
 			 sizeof (struct subspace_dictionary_record), 1, abfd)
@@ -3857,7 +3853,7 @@ som_finish_writing (abfd)
 	    return false;
 	}
       /* Goto the next section.  */
-      section = section->next; 
+      section = section->next;
     }
 
   /* All the subspace dictiondary records are written, and all the
@@ -3994,7 +3990,7 @@ som_bfd_derive_misc_symbol_info (abfd, sym, info)
      all symbols (including undefined symbols!).  Unfortunately,
      the type specified in an import/export statement does not
      always match what the linker wants.  Severe braindamage.  */
-	 
+
   /* Section symbols will not have a SOM symbol type assigned to
      them yet.  Assign all section symbols type ST_DATA.  */
   if (sym->flags & BSF_SECTION_SYM)
@@ -4044,7 +4040,7 @@ som_bfd_derive_misc_symbol_info (abfd, sym, info)
 	  else
 	    info->symbol_type = ST_DATA;
 	}
-  
+
       else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_UNKNOWN)
 	info->symbol_type = ST_DATA;
 
@@ -4064,7 +4060,7 @@ som_bfd_derive_misc_symbol_info (abfd, sym, info)
       else if (som_symbol_data (sym)->som_type == SYMBOL_TYPE_SEC_PROG)
 	info->symbol_type = ST_SEC_PROG;
     }
-	
+
   /* Now handle the symbol's scope.  Exported data which is not
      in the common section has scope SS_UNIVERSAL.  Note scope
      of common symbols was handled earlier!  */
@@ -4086,7 +4082,7 @@ som_bfd_derive_misc_symbol_info (abfd, sym, info)
       || bfd_is_und_section (sym->section)
       || bfd_is_abs_section (sym->section))
     info->symbol_info = 0;
-  /* For all other symbols, the symbol_info field contains the 
+  /* For all other symbols, the symbol_info field contains the
      subspace index of the space this symbol is contained in.  */
   else
     info->symbol_info = sym->section->target_index;
@@ -4128,8 +4124,8 @@ som_build_and_write_symbol_table (abfd)
     {
       struct som_misc_symbol_info info;
 
-      /* This is really an index into the symbol strings table.  
-	 By the time we get here, the index has already been 
+      /* This is really an index into the symbol strings table.
+	 By the time we get here, the index has already been
 	 computed and stored into the name field in the BFD symbol.  */
       som_symtab[i].name.n_strx = som_symbol_data(bfd_syms[i])->stringtab_offset;
 
@@ -4163,7 +4159,7 @@ som_build_and_write_symbol_table (abfd)
   return false;
 }
 
-/* Write an object in SOM format.  */  
+/* Write an object in SOM format.  */
 
 static boolean
 som_write_object_contents (abfd)
@@ -4213,12 +4209,12 @@ som_slurp_string_table (abfd)
 
   if (bfd_seek (abfd, obj_som_str_filepos (abfd), SEEK_SET) < 0)
     return false;
-  
+
   if (bfd_read (stringtab, obj_som_stringtab_size (abfd), 1, abfd)
       != obj_som_stringtab_size (abfd))
     return false;
 
-  /* Save our results and return success. */
+  /* Save our results and return success.  */
   obj_som_stringtab (abfd) = stringtab;
   return true;
 }
@@ -4322,7 +4318,7 @@ som_slurp_symbol_table (abfd)
     goto error_return;
   if (bfd_seek (abfd, obj_som_sym_filepos (abfd), SEEK_SET) < 0)
     goto error_return;
-  if (bfd_read (buf, symbol_count * symsize, 1, abfd) 
+  if (bfd_read (buf, symbol_count * symsize, 1, abfd)
       != symbol_count * symsize)
     goto error_return;
 
@@ -4387,7 +4383,6 @@ som_slurp_symbol_table (abfd)
 	     undefined function symbols.  */
 	  if (bufp->symbol_scope == SS_UNSAT)
 	    sym->symbol.flags |= BSF_FUNCTION;
-	     
 
 	default:
 	  break;
@@ -4559,7 +4554,7 @@ som_bfd_is_local_label_name (abfd, name)
    variables rptr, section, and symbols have no meaning.
 
    Return the number of relocations requested by the fixup stream.  When
-   not just counting 
+   not just counting
 
    This needs at least two or three more passes to get it cleaned up.  */
 
@@ -4642,7 +4637,7 @@ som_set_reloc_info (fixup, end, internal_relocs, section, symbols, just_count)
       cp = fp->format;
 
       /* Process the format string.  Parsing happens in two phases,
-	 parse RHS, then assign to LHS.  Repeat until no more 
+	 parse RHS, then assign to LHS.  Repeat until no more
 	 characters in the format string.  */
       while (*cp)
 	{
@@ -4836,7 +4831,7 @@ som_set_reloc_info (fixup, end, internal_relocs, section, symbols, just_count)
       else if (fixup > save_fixup + 1)
 	som_reloc_queue_insert (save_fixup, fixup - save_fixup, reloc_queue);
 
-      /* We do not pass R_DATA_OVERRIDE or R_NO_RELOCATION 
+      /* We do not pass R_DATA_OVERRIDE or R_NO_RELOCATION
 	 fixups to BFD.  */
       if (som_hppa_howto_table[op].type != R_DATA_OVERRIDE
 	  && som_hppa_howto_table[op].type != R_NO_RELOCATION)
@@ -4878,7 +4873,7 @@ som_set_reloc_info (fixup, end, internal_relocs, section, symbols, just_count)
 		    rptr->addend = bfd_get_32 (section->owner,
 					       (section->contents
 						+ offset - var ('L')));
-			
+
 		}
 	      else
 		rptr->addend = var ('V');
@@ -4902,9 +4897,9 @@ som_set_reloc_info (fixup, end, internal_relocs, section, symbols, just_count)
 #undef emptystack
 }
 
-/* Read in the relocs (aka fixups in SOM terms) for a section. 
+/* Read in the relocs (aka fixups in SOM terms) for a section.
 
-   som_get_reloc_upper_bound calls this routine with JUST_COUNT 
+   som_get_reloc_upper_bound calls this routine with JUST_COUNT
    set to true to indicate it only needs a count of the number
    of actual relocations.  */
 
@@ -4925,14 +4920,14 @@ som_slurp_reloc_table (abfd, section, symbols, just_count)
   if (section->reloc_count == 0)
     return true;
 
-  /* If reloc_count is -1, then the relocation stream has not been 
+  /* If reloc_count is -1, then the relocation stream has not been
      parsed.  We must do so now to know how many relocations exist.  */
   if (section->reloc_count == -1)
     {
       external_relocs = (char *) bfd_malloc (fixup_stream_size);
       if (external_relocs == (char *) NULL)
 	return false;
-      /* Read in the external forms. */
+      /* Read in the external forms.  */
       if (bfd_seek (abfd,
 		    obj_som_reloc_filepos (abfd) + section->rel_filepos,
 		    SEEK_SET)
@@ -4962,7 +4957,7 @@ som_slurp_reloc_table (abfd, section, symbols, just_count)
   if (section->relocation != (arelent *) NULL)
     return true;
 
-  internal_relocs = (arelent *) 
+  internal_relocs = (arelent *)
     bfd_zalloc (abfd, (num_relocs * sizeof (arelent)));
   if (internal_relocs == (arelent *) NULL)
     return false;
@@ -4981,7 +4976,7 @@ som_slurp_reloc_table (abfd, section, symbols, just_count)
 }
 
 /* Return the number of bytes required to store the relocation
-   information associated with the given section.  */ 
+   information associated with the given section.  */
 
 static long
 som_get_reloc_upper_bound (abfd, asect)
@@ -5158,7 +5153,7 @@ bfd_som_set_section_attributes (section, defined, private, sort_key, spnum)
   return true;
 }
 
-/* Set backend info for subsections which can not be described 
+/* Set backend info for subsections which can not be described
    in the BFD data structures.  */
 
 boolean
@@ -5295,8 +5290,8 @@ som_get_section_contents (abfd, section, location, offset, count)
 {
   if (count == 0 || ((section->flags & SEC_HAS_CONTENTS) == 0))
     return true;
-  if ((bfd_size_type)(offset+count) > section->_raw_size
-      || bfd_seek (abfd, (file_ptr)(section->filepos + offset), SEEK_SET) == -1
+  if ((bfd_size_type) (offset+count) > section->_raw_size
+      || bfd_seek (abfd, (file_ptr) (section->filepos + offset), SEEK_SET) == -1
       || bfd_read (location, (bfd_size_type)1, count, abfd) != count)
     return (false); /* on error */
   return (true);
@@ -5329,7 +5324,7 @@ som_set_section_contents (abfd, section, location, offset, count)
 
   /* Seek to the proper offset within the object file and write the
      data.  */
-  offset += som_section_data (section)->subspace_dict->file_loc_init_value; 
+  offset += som_section_data (section)->subspace_dict->file_loc_init_value;
   if (bfd_seek (abfd, offset, SEEK_SET) == -1)
     return false;
 
@@ -5447,7 +5442,7 @@ som_bfd_count_ar_symbols (abfd, lst_header, count)
   unsigned int *hash_table = NULL;
   file_ptr lst_filepos = bfd_tell (abfd) - sizeof (struct lst_header);
 
-  hash_table = 
+  hash_table =
     (unsigned int *) bfd_malloc (lst_header->hash_size
 				 * sizeof (unsigned int));
   if (hash_table == NULL && lst_header->hash_size != 0)
@@ -5525,7 +5520,7 @@ som_bfd_fill_in_ar_symbols (abfd, lst_header, syms)
   struct som_entry *som_dict = NULL;
   file_ptr lst_filepos = bfd_tell (abfd) - sizeof (struct lst_header);
 
-  hash_table = 
+  hash_table =
     (unsigned int *) bfd_malloc (lst_header->hash_size
 				 * sizeof (unsigned int));
   if (hash_table == NULL && lst_header->hash_size != 0)
@@ -5548,7 +5543,7 @@ som_bfd_fill_in_ar_symbols (abfd, lst_header, syms)
   if (bfd_seek (abfd, lst_filepos + lst_header->dir_loc, SEEK_SET) < 0)
     goto error_return;
 
-  if (bfd_read ((PTR) som_dict, lst_header->module_count, 
+  if (bfd_read ((PTR) som_dict, lst_header->module_count,
 		sizeof (struct som_entry), abfd)
       != lst_header->module_count * sizeof (struct som_entry))
     goto error_return;
@@ -5613,7 +5608,7 @@ som_bfd_fill_in_ar_symbols (abfd, lst_header, syms)
 	    goto error_return;
 
 	  /* Seek to the name length & string and read them in.  */
-	  if (bfd_seek (abfd, lst_filepos + lst_header->string_loc 
+	  if (bfd_seek (abfd, lst_filepos + lst_header->string_loc
 				+ lst_symbol.name.n_strx - 4, SEEK_SET) < 0)
 	    goto error_return;
 
@@ -5638,7 +5633,7 @@ som_bfd_fill_in_ar_symbols (abfd, lst_header, syms)
 	  set++;
 	}
     }
-  /* If we haven't died by now, then we successfully read the entire 
+  /* If we haven't died by now, then we successfully read the entire
      archive symbol table.  */
   if (hash_table != NULL)
     free (hash_table);
@@ -5724,7 +5719,7 @@ som_slurp_armap (abfd)
     return false;
 
   /* Get back to the start of the library symbol table.  */
-  if (bfd_seek (abfd, ardata->first_file_filepos - parsed_size 
+  if (bfd_seek (abfd, ardata->first_file_filepos - parsed_size
 			+ sizeof (struct lst_header), SEEK_SET) < 0)
     return false;
 
@@ -5845,7 +5840,7 @@ som_bfd_ar_symbol_hash (symbol)
 
 /* Do the bulk of the work required to write the SOM library
    symbol table.  */
-   
+
 static boolean
 som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength)
      bfd *abfd;
@@ -5885,7 +5880,7 @@ som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength)
   /* Some initialization.  */
   memset (hash_table, 0, 4 * lst.hash_size);
   memset (som_dict, 0, lst.module_count * sizeof (struct som_entry));
-  memset (last_hash_entry, 0, 	
+  memset (last_hash_entry, 0,
 	  lst.hash_size * sizeof (struct lst_symbol_record *));
 
   /* Symbols have som_index fields, so we have to keep track of the
@@ -5911,7 +5906,7 @@ som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength)
   /* Make sure we're properly aligned.  */
   curr_som_offset = (curr_som_offset + 0x1) & ~0x1;
 
-  /* FIXME should be done with buffers just like everything else... */
+  /* FIXME should be done with buffers just like everything else...  */
   lst_syms = bfd_malloc (nsyms * sizeof (struct lst_symbol_record));
   if (lst_syms == NULL && nsyms != 0)
     goto error_return;
@@ -6008,7 +6003,7 @@ som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength)
 	      tmp = last_hash_entry[curr_lst_sym->symbol_key % lst.hash_size];
 	      tmp->next_entry
 		= (curr_lst_sym - lst_syms) * sizeof (struct lst_symbol_record)
-		  + lst.hash_size * 4 
+		  + lst.hash_size * 4
 		  + lst.module_count * sizeof (struct som_entry)
 		  + sizeof (struct lst_header);
 	    }
@@ -6017,7 +6012,7 @@ som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength)
 	      /* First entry in this hash chain.  */
 	      hash_table[curr_lst_sym->symbol_key % lst.hash_size]
 		= (curr_lst_sym - lst_syms) * sizeof (struct lst_symbol_record)
-		  + lst.hash_size * 4 
+		  + lst.hash_size * 4
 		  + lst.module_count * sizeof (struct som_entry)
 		  + sizeof (struct lst_header);
 	    }
@@ -6027,7 +6022,6 @@ som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength)
 	  last_hash_entry[curr_lst_sym->symbol_key % lst.hash_size]
 	    = curr_lst_sym;
 
-
 	  /* Update the string table.  */
 	  bfd_put_32 (abfd, strlen (sym->symbol.name), p);
 	  p += 4;
@@ -6046,7 +6040,7 @@ som_bfd_ar_write_symbol_stuff (abfd, nsyms, string_size, lst, elength)
       /* Keep track of where each SOM will finally reside; then look
 	 at the next BFD.  */
       curr_som_offset += arelt_size (curr_bfd) + sizeof (struct ar_hdr);
- 
+
       /* A particular object in the archive may have an odd length; the
 	 linker requires objects begin on an even boundary.  So round
 	 up the current offset as necessary.  */
@@ -6121,7 +6115,7 @@ som_write_armap (abfd, elength, map, orl_count, stridx)
   struct ar_hdr hdr;
   struct lst_header lst;
   int *p;
- 
+
   /* We'll use this for the archive's date and mode later.  */
   if (stat (abfd->filename, &statbuf) != 0)
     {
@@ -6226,7 +6220,7 @@ som_write_armap (abfd, elength, map, orl_count, stridx)
   if (som_bfd_ar_write_symbol_stuff (abfd, nsyms, stringsize, lst, elength)
       == false)
     return false;
-  
+
   /* Done.  */
   return true;
 }
@@ -6260,7 +6254,7 @@ som_bfd_free_cached_info (abfd)
   return true;
 }
 
-/* End of miscellaneous support functions. */
+/* End of miscellaneous support functions.  */
 
 /* Linker support functions.  */
 static boolean
@@ -6300,7 +6294,6 @@ som_bfd_link_split_section (abfd, sec)
 
 #define som_bfd_gc_sections		bfd_generic_gc_sections
 
-
 const bfd_target som_vec =
 {
   "som",			/* name */
@@ -6354,7 +6347,7 @@ const bfd_target som_vec =
   BFD_JUMP_TABLE_DYNAMIC (_bfd_nodynamic),
 
   NULL,
-  
+
   (PTR) 0
 };
 
diff --git a/bfd/som.h b/bfd/som.h
index af37804..eedef8c 100644
--- a/bfd/som.h
+++ b/bfd/som.h
@@ -46,8 +46,8 @@
 #define _PA_RISC_ID(__m_num) 1
 #endif /* HOST_HPPABSD */
 
-#define FILE_HDR_SIZE sizeof(struct header)
-#define AUX_HDR_SIZE sizeof(struct som_exec_auxhdr)
+#define FILE_HDR_SIZE sizeof (struct header)
+#define AUX_HDR_SIZE sizeof (struct som_exec_auxhdr)
 
 typedef struct som_symbol
   {
@@ -77,7 +77,7 @@ typedef struct som_symbol
     int reloc_count;
 
     /* During object file writing, the offset of the name of this symbol
-       in the SOM string table. */
+       in the SOM string table.  */
     int stringtab_offset;
   }
 som_symbol_type;
@@ -159,7 +159,7 @@ struct som_copyable_section_data_struct
     int space_number;
 
     /* Add more stuff here as needed.  Good examples of information
-       we might want to pass would be initialization pointers, 
+       we might want to pass would be initialization pointers,
        and the many subspace flags we do not represent yet.  */
   };
 
@@ -167,7 +167,7 @@ struct som_copyable_section_data_struct
 
    reloc_size holds the size of the relocation stream, note this
    is very different from the number of relocations as SOM relocations
-   are variable length. 
+   are variable length.
 
    reloc_stream is the actual stream of relocation entries.  */
 
@@ -198,14 +198,13 @@ struct som_section_data_struct
   ((struct som_section_data_struct *)sec->used_by_bfd)
 #define som_symbol_data(symbol)		((som_symbol_type *) symbol)
 
-
 /* Defines groups of basic relocations.  FIXME:  These should
    be the only basic relocations created by GAS.  The rest
    should be internal to the BFD backend.
 
    The idea is both SOM and ELF define these basic relocation
    types so they map into a SOM or ELF specific reloation as
-   appropriate.  This allows GAS to share much more code 
+   appropriate.  This allows GAS to share much more code
    between the two object formats.  */
 
 #define R_HPPA_NONE			R_NO_RELOCATION