ld whitespace fixes

	* pe-dll.c: Formatting, whitespace fixes.
	* NEWS: Whitespace fixes.
	* configure.ac: Likewise.
	* configure.tgt: Likewise.
	* deffilep.y: Likewise.
	* genscripts.sh: Likewise.
	* ld.texinfo: Likewise.
	* ldgram.y: Likewise.
	* ldlang.c: Likewise.
	* ldlex.l: Likewise.
	* lexsup.c: Likewise.
	* plugin.c: Likewise.
	* emulparams/arc-endianness.sh: Likewise.
	* emulparams/elf32_x86_64.sh: Likewise.
	* emulparams/elf64mmix.sh: Likewise.
	* emulparams/elf_x86_64.sh: Likewise.
	* emulparams/h8300elf.sh: Likewise.
	* emulparams/h8300elf_linux.sh: Likewise.
	* emulparams/vxworks.sh: Likewise.
	* emultempl/aarch64elf.em: Likewise.
	* emultempl/aix.em: Likewise.
	* emultempl/armelf.em: Likewise.
	* emultempl/avrelf.em: Likewise.
	* emultempl/beos.em: Likewise.
	* emultempl/hppaelf.em: Likewise.
	* emultempl/m68kcoff.em: Likewise.
	* emultempl/m68kelf.em: Likewise.
	* emultempl/metagelf.em: Likewise.
	* emultempl/msp430.em: Likewise.
	* emultempl/nds32elf.em: Likewise.
	* emultempl/pe.em: Likewise.
	* emultempl/pep.em: Likewise.
	* emultempl/ppc64elf.em: Likewise.
	* emultempl/sh64elf.em: Likewise.
	* emultempl/spu_ovl.S: Likewise.
	* emultempl/spuelf.em: Likewise.
	* emultempl/tic6xdsbt.em: Likewise.
	* emultempl/ticoff.em: Likewise.
	* emultempl/vms.em: Likewise.
	* po/Make-in: Likewise.
	* scripttempl/DWARF.sc: Likewise.
	* scripttempl/aix.sc: Likewise.
	* scripttempl/alpha.sc: Likewise.
	* scripttempl/alphavms.sc: Likewise.
	* scripttempl/aout.sc: Likewise.
	* scripttempl/arclinux.sc: Likewise.
	* scripttempl/armaout.sc: Likewise.
	* scripttempl/armbpabi.sc: Likewise.
	* scripttempl/armcoff.sc: Likewise.
	* scripttempl/avr.sc: Likewise.
	* scripttempl/crisaout.sc: Likewise.
	* scripttempl/delta68.sc: Likewise.
	* scripttempl/dlx.sc: Likewise.
	* scripttempl/elf.sc: Likewise.
	* scripttempl/elf32cr16.sc: Likewise.
	* scripttempl/elf32cr16c.sc: Likewise.
	* scripttempl/elf32crx.sc: Likewise.
	* scripttempl/elf32msp430.sc: Likewise.
	* scripttempl/elf32msp430_3.sc: Likewise.
	* scripttempl/elf32sh-symbian.sc: Likewise.
	* scripttempl/elf32xc16x.sc: Likewise.
	* scripttempl/elf32xc16xl.sc: Likewise.
	* scripttempl/elf32xc16xs.sc: Likewise.
	* scripttempl/elf64hppa.sc: Likewise.
	* scripttempl/elf_chaos.sc: Likewise.
	* scripttempl/elfarc.sc: Likewise.
	* scripttempl/elfarcv2.sc: Likewise.
	* scripttempl/elfd10v.sc: Likewise.
	* scripttempl/elfd30v.sc: Likewise.
	* scripttempl/elfi370.sc: Likewise.
	* scripttempl/elfm68hc11.sc: Likewise.
	* scripttempl/elfm68hc12.sc: Likewise.
	* scripttempl/elfmicroblaze.sc: Likewise.
	* scripttempl/elfxgate.sc: Likewise.
	* scripttempl/elfxtensa.sc: Likewise.
	* scripttempl/epiphany_4x4.sc: Likewise.
	* scripttempl/epocpe.sc: Likewise.
	* scripttempl/h8300.sc: Likewise.
	* scripttempl/h8300h.sc: Likewise.
	* scripttempl/h8300hn.sc: Likewise.
	* scripttempl/h8300s.sc: Likewise.
	* scripttempl/h8300sn.sc: Likewise.
	* scripttempl/h8300sx.sc: Likewise.
	* scripttempl/h8300sxn.sc: Likewise.
	* scripttempl/h8500.sc: Likewise.
	* scripttempl/h8500b.sc: Likewise.
	* scripttempl/h8500c.sc: Likewise.
	* scripttempl/h8500m.sc: Likewise.
	* scripttempl/h8500s.sc: Likewise.
	* scripttempl/hppaelf.sc: Likewise.
	* scripttempl/i386beos.sc: Likewise.
	* scripttempl/i386coff.sc: Likewise.
	* scripttempl/i386go32.sc: Likewise.
	* scripttempl/i386msdos.sc: Likewise.
	* scripttempl/i860coff.sc: Likewise.
	* scripttempl/i960.sc: Likewise.
	* scripttempl/ia64vms.sc: Likewise.
	* scripttempl/ip2k.sc: Likewise.
	* scripttempl/iq2000.sc: Likewise.
	* scripttempl/m68kaux.sc: Likewise.
	* scripttempl/m68kcoff.sc: Likewise.
	* scripttempl/m88kbcs.sc: Likewise.
	* scripttempl/mcorepe.sc: Likewise.
	* scripttempl/mep.sc: Likewise.
	* scripttempl/mips.sc: Likewise.
	* scripttempl/mipsbsd.sc: Likewise.
	* scripttempl/mmo.sc: Likewise.
	* scripttempl/moxie.sc: Likewise.
	* scripttempl/nds32elf.sc: Likewise.
	* scripttempl/nw.sc: Likewise.
	* scripttempl/pe.sc: Likewise.
	* scripttempl/pep.sc: Likewise.
	* scripttempl/pj.sc: Likewise.
	* scripttempl/ppcpe.sc: Likewise.
	* scripttempl/psos.sc: Likewise.
	* scripttempl/riscix.sc: Likewise.
	* scripttempl/sh.sc: Likewise.
	* scripttempl/sparccoff.sc: Likewise.
	* scripttempl/st2000.sc: Likewise.
	* scripttempl/tic30aout.sc: Likewise.
	* scripttempl/tic30coff.sc: Likewise.
	* scripttempl/tic4xcoff.sc: Likewise.
	* scripttempl/tic54xcoff.sc: Likewise.
	* scripttempl/tic80coff.sc: Likewise.
	* scripttempl/v850.sc: Likewise.
	* scripttempl/v850_rh850.sc: Likewise.
	* scripttempl/vanilla.sc: Likewise.
	* scripttempl/visium.sc: Likewise.
	* scripttempl/w65.sc: Likewise.
	* scripttempl/xstormy16.sc: Likewise.
	* scripttempl/z80.sc: Likewise.
	* scripttempl/z8000.sc: Likewise.
	* configure: Regenerate.

1 files changed, 120 insertions, 120 deletions

diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index a88afac..aee7b9d 100644
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -552,7 +552,7 @@ auto_export (bfd *abfd, def_file *d, const char *n)
 
   /* Return false if n is in the d->exports table.  */
   if (bsearch (&key, d->exports, d->num_exports,
-               sizeof (pe_def_file->exports[0]), pe_export_sort))
+	       sizeof (pe_def_file->exports[0]), pe_export_sort))
     return 0;
 
   if (pe_dll_do_default_excludes)
@@ -692,9 +692,9 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 	{
 	  struct coff_link_hash_entry *sym_hash;
 	  sym_hash = coff_link_hash_lookup (coff_hash_table (info),
-		ac->symbol_name, FALSE, FALSE, FALSE);
+					    ac->symbol_name, FALSE, FALSE, FALSE);
 	  if (sym_hash && sym_hash->root.type == bfd_link_hash_common
-	    && sym_hash->root.u.c.p->alignment_power < (unsigned) ac->alignment)
+	      && sym_hash->root.u.c.p->alignment_power < (unsigned) ac->alignment)
 	    {
 	      sym_hash->root.u.c.p->alignment_power = (unsigned) ac->alignment;
 	    }
@@ -736,9 +736,9 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 		   && ((symbols[j]->flags & BSF_GLOBAL)
 		       || (symbols[j]->flags == 0)));
 	      if (link_info.version_info && would_export)
-		  would_export
-		    = !bfd_hide_sym_by_version (link_info.version_info,
-						symbols[j]->name);
+		would_export
+		  = !bfd_hide_sym_by_version (link_info.version_info,
+					      symbols[j]->name);
 	      if (would_export)
 		{
 		  const char *sn = symbols[j]->name;
@@ -747,7 +747,7 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 		  {
 		    char *name;
 		    if (is_import (sn))
-			  continue;
+		      continue;
 
 		    name = xmalloc (strlen ("__imp_") + strlen (sn) + 1);
 		    sprintf (name, "%s%s", "__imp_", sn);
@@ -772,7 +772,7 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 					       NULL, &is_dup);
 		      /* Fill data flag properly, from dlltool.c.  */
 		      if (!is_dup)
-		        p->flag_data = !(symbols[j]->flags & BSF_FUNCTION);
+			p->flag_data = !(symbols[j]->flags & BSF_FUNCTION);
 		    }
 		}
 	    }
@@ -806,12 +806,12 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 	      char *tmp_at = strrchr (tmp, '@');
 
 	      if (tmp_at)
-	        *tmp_at = 0;
+		*tmp_at = 0;
 	      else
-	        einfo (_("%P%X: Cannot export %s: invalid export name\n"),
+		einfo (_("%P%X: Cannot export %s: invalid export name\n"),
 		       pe_def_file->exports[i].name);
 	      pe_def_file->exports[i].name = tmp;
-              resort_needed = TRUE;
+	      resort_needed = TRUE;
 	    }
 	}
     }
@@ -820,7 +820,7 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
      by removing leading @.  */
   if (resort_needed)
     qsort (pe_def_file->exports, NE, sizeof (pe_def_file->exports[0]),
-           pe_export_sort);
+	   pe_export_sort);
 
   if (pe_dll_stdcall_aliases)
     {
@@ -841,7 +841,7 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 				     pe_def_file->exports[i].internal_name,
 				     -1, NULL, &is_dup);
 	      if (is_dup)
-	        free (tmp);
+		free (tmp);
 	    }
 	}
     }
@@ -953,7 +953,7 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 	    }
 	}
       /* Check for forward exports.  These are indicated in DEF files by an
-         export directive of the form NAME1 = MODULE-NAME.EXTERNAL-NAME
+	 export directive of the form NAME1 = MODULE-NAME.EXTERNAL-NAME
 	 but we must take care not to be fooled when the user wants to export
 	 a symbol that actually really has a dot in it, so we only check
 	 for them here, after real defined symbols have already been matched.  */
@@ -1093,8 +1093,8 @@ generate_edata (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED)
   /* Now we need to assign ordinals to those that don't have them.  */
   for (i = 0; i < NE; i++)
     {
-      if (exported_symbol_sections[i] ||
-          pe_def_file->exports[i].flag_forward)
+      if (exported_symbol_sections[i]
+	  || pe_def_file->exports[i].flag_forward)
 	{
 	  if (pe_def_file->exports[i].ordinal != -1)
 	    {
@@ -1126,9 +1126,9 @@ generate_edata (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED)
 
   next_ordinal = min_ordinal;
   for (i = 0; i < NE; i++)
-    if ((exported_symbol_sections[i] ||
-         pe_def_file->exports[i].flag_forward) &&
-        pe_def_file->exports[i].ordinal == -1)
+    if ((exported_symbol_sections[i]
+	 || pe_def_file->exports[i].flag_forward)
+	&& pe_def_file->exports[i].ordinal == -1)
       {
 	while (exported_symbols[next_ordinal - min_ordinal] != -1)
 	  next_ordinal++;
@@ -1166,7 +1166,7 @@ fill_exported_offsets (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *info)
 
       name = xmalloc (strlen (pe_def_file->exports[i].internal_name) + 2);
       if (pe_details->underscored
- 	  && *pe_def_file->exports[i].internal_name != '@')
+	  && *pe_def_file->exports[i].internal_name != '@')
 	{
 	  *name = '_';
 	  strcpy (name + 1, pe_def_file->exports[i].internal_name);
@@ -1234,21 +1234,21 @@ fill_edata (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED)
      Scan alphabetically - ie the ordering in the exports[] table,
      rather than by ordinal - the ordering in the exported_symbol[]
      table.  See dlltool.c and:
-        http://sources.redhat.com/ml/binutils/2003-04/msg00379.html
+	http://sources.redhat.com/ml/binutils/2003-04/msg00379.html
      for more information.  */
   hint = 0;
   for (s = 0; s < NE; s++)
     {
       struct bfd_section *ssec = exported_symbol_sections[s];
-      if (pe_def_file->exports[s].ordinal != -1 &&
-          (pe_def_file->exports[s].flag_forward || ssec != NULL))
+      if (pe_def_file->exports[s].ordinal != -1
+	  && (pe_def_file->exports[s].flag_forward || ssec != NULL))
 	{
 	  int ord = pe_def_file->exports[s].ordinal;
 
 	  if (pe_def_file->exports[s].flag_forward)
 	    {
 	      bfd_put_32 (abfd, ERVA (enamestr),
-		          eaddresses + 4 * (ord - min_ordinal));
+			  eaddresses + 4 * (ord - min_ordinal));
 
 	      strcpy (enamestr, pe_def_file->exports[s].internal_name);
 	      enamestr += strlen (pe_def_file->exports[s].internal_name) + 1;
@@ -1260,7 +1260,7 @@ fill_edata (bfd *abfd, struct bfd_link_info *info ATTRIBUTE_UNUSED)
 				    + ssec->output_offset);
 
 	      bfd_put_32 (abfd, srva - image_base,
-		          eaddresses + 4 * (ord - min_ordinal));
+			  eaddresses + 4 * (ord - min_ordinal));
 	    }
 
 	  if (!pe_def_file->exports[s].flag_noname)
@@ -1880,20 +1880,20 @@ save_relocs (asection *sec)
 }
 
 /*	.section	.idata$2
- 	.global		__head_my_dll
+	.global		__head_my_dll
    __head_my_dll:
- 	.rva		hname
- 	.long		0
- 	.long		0
- 	.rva		__my_dll_iname
- 	.rva		fthunk
-
- 	.section	.idata$5
- 	.long		0
+	.rva		hname
+	.long		0
+	.long		0
+	.rva		__my_dll_iname
+	.rva		fthunk
+
+	.section	.idata$5
+	.long		0
    fthunk:
 
- 	.section	.idata$4
- 	.long		0
+	.section	.idata$4
+	.long		0
    hname:                              */
 
 static bfd *
@@ -1974,15 +1974,15 @@ make_head (bfd *parent)
 }
 
 /*	.section	.idata$4
- 	.long		0
+	.long		0
 	[.long		0] for PE+
- 	.section	.idata$5
- 	.long		0
+	.section	.idata$5
+	.long		0
 	[.long		0] for PE+
- 	.section	idata$7
- 	.global		__my_dll_iname
+	.section	idata$7
+	.global		__my_dll_iname
   __my_dll_iname:
- 	.asciz		"my.dll"       */
+	.asciz		"my.dll"       */
 
 static bfd *
 make_tail (bfd *parent)
@@ -2044,25 +2044,25 @@ make_tail (bfd *parent)
 }
 
 /*	.text
- 	.global		_function
- 	.global		___imp_function
- 	.global		__imp__function
+	.global		_function
+	.global		___imp_function
+	.global		__imp__function
   _function:
- 	jmp		*__imp__function:
+	jmp		*__imp__function:
 
- 	.section	idata$7
- 	.long		__head_my_dll
+	.section	idata$7
+	.long		__head_my_dll
 
- 	.section	.idata$5
+	.section	.idata$5
   ___imp_function:
   __imp__function:
   iat?
-  	.section	.idata$4
+	.section	.idata$4
   iat?
- 	.section	.idata$6
+	.section	.idata$6
   ID<ordinal>:
- 	.short		<hint>
- 	.asciz		"function" xlate? (add underscore, kill at)  */
+	.short		<hint>
+	.asciz		"function" xlate? (add underscore, kill at)  */
 
 static const unsigned char jmp_ix86_bytes[] =
 {
@@ -2070,11 +2070,11 @@ static const unsigned char jmp_ix86_bytes[] =
 };
 
 /* _function:
- 	mov.l	ip+8,r0
- 	mov.l	@r0,r0
- 	jmp	@r0
- 	nop
- 	.dw	__imp_function   */
+	mov.l	ip+8,r0
+	mov.l	@r0,r0
+	jmp	@r0
+	nop
+	.dw	__imp_function   */
 
 static const unsigned char jmp_sh_bytes[] =
 {
@@ -2082,10 +2082,10 @@ static const unsigned char jmp_sh_bytes[] =
 };
 
 /* _function:
- 	lui	$t0,<high:__imp_function>
- 	lw	$t0,<low:__imp_function>
- 	jr	$t0
- 	nop                              */
+	lui	$t0,<high:__imp_function>
+	lw	$t0,<low:__imp_function>
+	jr	$t0
+	nop                              */
 
 static const unsigned char jmp_mips_bytes[] =
 {
@@ -2211,7 +2211,7 @@ make_one (def_file_export *exp, bfd *parent, bfd_boolean include_jmp_stub)
 	  /* Mark this object as SAFESEH compatible.  */
 	  quick_symbol (abfd, "", "@feat.00", "", bfd_abs_section_ptr,
 			BSF_LOCAL, 1);
-          quick_reloc (abfd, 2, BFD_RELOC_32, 2);
+	  quick_reloc (abfd, 2, BFD_RELOC_32, 2);
 #endif
 	  break;
 	case PE_ARCH_sh:
@@ -2223,8 +2223,8 @@ make_one (def_file_export *exp, bfd *parent, bfd_boolean include_jmp_stub)
 	  quick_reloc (abfd, 4, BFD_RELOC_LO16, 2);
 	  break;
 	case PE_ARCH_arm:
- 	case PE_ARCH_arm_epoc:
- 	case PE_ARCH_arm_wince:
+	case PE_ARCH_arm_epoc:
+	case PE_ARCH_arm_wince:
 	  quick_reloc (abfd, 8, BFD_RELOC_32, 2);
 	  break;
 	default:
@@ -2432,11 +2432,11 @@ make_import_fixup_mark (arelent *rel, char *name)
 }
 
 /*	.section	.idata$2
-  	.rva		__nm_thnk_SYM (singleton thunk with name of func)
- 	.long		0
- 	.long		0
- 	.rva		__my_dll_iname (name of dll)
- 	.rva		__fuNN_SYM (pointer to reference (address) in text)  */
+	.rva		__nm_thnk_SYM (singleton thunk with name of func)
+	.long		0
+	.long		0
+	.rva		__my_dll_iname (name of dll)
+	.rva		__fuNN_SYM (pointer to reference (address) in text)  */
 
 static bfd *
 make_import_fixup_entry (const char *name,
@@ -2492,8 +2492,8 @@ make_import_fixup_entry (const char *name,
 }
 
 /*	.section	.rdata_runtime_pseudo_reloc
- 	.long		addend
- 	.rva		__fuNN_SYM (pointer to reference (address) in text)  */
+	.long		addend
+	.rva		__fuNN_SYM (pointer to reference (address) in text)  */
 
 static bfd *
 make_runtime_pseudo_reloc (const char *name ATTRIBUTE_UNUSED,
@@ -2577,7 +2577,7 @@ make_runtime_pseudo_reloc (const char *name ATTRIBUTE_UNUSED,
 }
 
 /*	.section	.rdata
- 	.rva		__pei386_runtime_relocator  */
+	.rva		__pei386_runtime_relocator  */
 
 static bfd *
 pe_create_runtime_relocator_reference (bfd *parent)
@@ -2655,16 +2655,16 @@ pe_create_import_fixup (arelent *rel, asection *s, bfd_vma addend, char *name)
       add_bfd_to_link (b, b->filename, &link_info);
 
       /* If we ever use autoimport, we have to cast text section writable.
-         But not for version 2.  */
+	 But not for version 2.  */
       if (link_info.pei386_runtime_pseudo_reloc != 2)
-        {
-          config.text_read_only = FALSE;
-          link_info.output_bfd->flags &= ~WP_TEXT;
-        }
+	{
+	  config.text_read_only = FALSE;
+	  link_info.output_bfd->flags &= ~WP_TEXT;
+	}
       if (link_info.pei386_runtime_pseudo_reloc == 2)
-        {
+	{
 	  b = make_singleton_name_imp (name, link_info.output_bfd);
-          add_bfd_to_link (b, b->filename, &link_info);
+	  add_bfd_to_link (b, b->filename, &link_info);
 	}
     }
 
@@ -2679,27 +2679,27 @@ pe_create_import_fixup (arelent *rel, asection *s, bfd_vma addend, char *name)
       add_bfd_to_link (b, b->filename, &link_info);
     }
 
-    if ((link_info.pei386_runtime_pseudo_reloc != 0 && addend != 0)
-        || link_info.pei386_runtime_pseudo_reloc == 2)
-      {
-	if (pe_dll_extra_pe_debug)
-	  printf ("creating runtime pseudo-reloc entry for %s (addend=%d)\n",
-	          fixup_name, (int) addend);
+  if ((link_info.pei386_runtime_pseudo_reloc != 0 && addend != 0)
+      || link_info.pei386_runtime_pseudo_reloc == 2)
+    {
+      if (pe_dll_extra_pe_debug)
+	printf ("creating runtime pseudo-reloc entry for %s (addend=%d)\n",
+		fixup_name, (int) addend);
 
-	b = make_runtime_pseudo_reloc (name, fixup_name, addend, rel->howto->bitsize,
-				       link_info.output_bfd);
-	add_bfd_to_link (b, b->filename, &link_info);
+      b = make_runtime_pseudo_reloc (name, fixup_name, addend, rel->howto->bitsize,
+				     link_info.output_bfd);
+      add_bfd_to_link (b, b->filename, &link_info);
 
-	if (runtime_pseudo_relocs_created == 0)
-	  {
-	    b = pe_create_runtime_relocator_reference (link_info.output_bfd);
-	    add_bfd_to_link (b, b->filename, &link_info);
-	  }
-	runtime_pseudo_relocs_created++;
-      }
-    else if (addend != 0)
-      einfo (_("%P%X%C: variable '%T' can't be auto-imported. Please read the documentation for ld's --enable-auto-import for details.\n"),
-	     s->owner, s, rel->address, sym->name);
+      if (runtime_pseudo_relocs_created == 0)
+	{
+	  b = pe_create_runtime_relocator_reference (link_info.output_bfd);
+	  add_bfd_to_link (b, b->filename, &link_info);
+	}
+      runtime_pseudo_relocs_created++;
+    }
+  else if (addend != 0)
+    einfo (_("%P%X%C: variable '%T' can't be auto-imported. Please read the documentation for ld's --enable-auto-import for details.\n"),
+	   s->owner, s, rel->address, sym->name);
 }
 
 
@@ -2753,8 +2753,8 @@ pe_dll_generate_implib (def_file *def, const char *impfilename, struct bfd_link_
 	  found = (filename_cmp (ex->string, ibfd->filename) == 0);
 	}
       /* If it matched, we must open a fresh BFD for it (the original
-        input BFD is still needed for the DLL's final link) and add
-	it into the archive member chain.  */
+	 input BFD is still needed for the DLL's final link) and add
+	 it into the archive member chain.  */
       if (found)
 	{
 	  bfd *newbfd = bfd_openr (ibfd->my_archive
@@ -2913,7 +2913,7 @@ pe_find_cdecl_alias_match (struct bfd_link_info *linfo, char *name)
     {
       h = bfd_link_hash_lookup (linfo->hash, kv->oname, FALSE, FALSE, FALSE);
       if (h->type == bfd_link_hash_undefined)
-        goto return_h;
+	goto return_h;
     }
 
   if (lname[0] == '?')
@@ -2922,7 +2922,7 @@ pe_find_cdecl_alias_match (struct bfd_link_info *linfo, char *name)
   if (at || lname[0] == '@')
     {
       if (lname[0] == '@')
-        {
+	{
 	  if (pe_details->underscored)
 	    lname[0] = '_';
 	  else
@@ -2938,7 +2938,7 @@ pe_find_cdecl_alias_match (struct bfd_link_info *linfo, char *name)
 	    }
 	}
       if (at)
-        *strchr (lname, '@') = 0;
+	*strchr (lname, '@') = 0;
       key.key = lname;
       kv = bsearch (&key, udef_table, undef_count,
 		    sizeof (struct key_value), undef_sort_cmp);
@@ -2979,7 +2979,7 @@ pe_find_cdecl_alias_match (struct bfd_link_info *linfo, char *name)
     {
       h = bfd_link_hash_lookup (linfo->hash, kv->oname, FALSE, FALSE, FALSE);
       if (h->type == bfd_link_hash_undefined)
-        goto return_h;
+	goto return_h;
     }
 
  return_NULL:
@@ -2991,7 +2991,7 @@ pe_find_cdecl_alias_match (struct bfd_link_info *linfo, char *name)
 
 static bfd_boolean
 pe_undef_count (struct bfd_link_hash_entry *h ATTRIBUTE_UNUSED,
-                void *inf ATTRIBUTE_UNUSED)
+		void *inf ATTRIBUTE_UNUSED)
 {
   if (h->type == bfd_link_hash_undefined)
     undef_count++;
@@ -3009,7 +3009,7 @@ pe_undef_fill (struct bfd_link_hash_entry *h, void *inf ATTRIBUTE_UNUSED)
       at = strchr (udef_table[undef_count].key
 		   + (udef_table[undef_count].key[0] == '@'), '@');
       if (at)
-        at[1] = 0;
+	at[1] = 0;
       udef_table[undef_count].oname = h->root.string;
       undef_count++;
     }
@@ -3073,7 +3073,7 @@ pe_process_import_defs (bfd *output_bfd, struct bfd_link_info *linfo)
       for (i = 0; i < pe_def_file->num_imports && imp[i].module != module; i++)
 	;
       if (i >= pe_def_file->num_imports)
-        continue;
+	continue;
 
       dll_filename = module->name;
       dll_symname = xstrdup (module->name);
@@ -3117,7 +3117,7 @@ pe_process_import_defs (bfd *output_bfd, struct bfd_link_info *linfo)
 	      blhe = bfd_link_hash_lookup (linfo->hash, name,
 					   FALSE, FALSE, FALSE);
 	      if (blhe)
-	        is_undef = (blhe->type == bfd_link_hash_undefined);
+		is_undef = (blhe->type == bfd_link_hash_undefined);
 	    }
 	  else
 	    {
@@ -3131,7 +3131,7 @@ pe_process_import_defs (bfd *output_bfd, struct bfd_link_info *linfo)
 	      blhe = pe_find_cdecl_alias_match (linfo, name);
 	      include_jmp_stub = TRUE;
 	      if (blhe)
-	        is_undef = (blhe->type == bfd_link_hash_undefined);
+		is_undef = (blhe->type == bfd_link_hash_undefined);
 	    }
 
 	  free (name);
@@ -3380,26 +3380,26 @@ pe_implied_import_dll (const char *filename)
       /* Skip unwanted symbols, which are
 	 exported in buggy auto-import releases.  */
       if (! CONST_STRNEQ (erva + name_rva, "__nm_"))
- 	{
+	{
 	  int is_dup = 0;
- 	  /* is_data is true if the address is in the data, rdata or bss
+	  /* is_data is true if the address is in the data, rdata or bss
 	     segment.  */
- 	  is_data =
+	  is_data =
 	    (func_rva >= data_start && func_rva < data_end)
 	    || (func_rva >= rdata_start && func_rva < rdata_end)
 	    || (func_rva >= bss_start && func_rva < bss_end);
 
 	  imp = def_file_add_import (pe_def_file, erva + name_rva,
 				     dllname, i, NULL, NULL, &is_dup);
- 	  /* Mark symbol type.  */
- 	  if (!is_dup)
- 	    imp->data = is_data;
+	  /* Mark symbol type.  */
+	  if (!is_dup)
+	    imp->data = is_data;
 
- 	  if (pe_dll_extra_pe_debug)
+	  if (pe_dll_extra_pe_debug)
 	    printf ("%s dll-name: %s sym: %s addr: 0x%lx %s\n",
 		    __FUNCTION__, dllname, erva + name_rva,
 		    (unsigned long) func_rva, is_data ? "(data)" : "");
- 	}
+	}
     }
 
   return TRUE;
@@ -3504,6 +3504,6 @@ bfd_boolean
 pe_bfd_is_dll (bfd *abfd)
 {
   return (bfd_get_format (abfd) == bfd_object
-          && obj_pe (abfd)
-          && pe_data (abfd)->dll);
+	  && obj_pe (abfd)
+	  && pe_data (abfd)->dll);
 }