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.

20 files changed, 181 insertions, 181 deletions

diff --git a/ld/emultempl/aarch64elf.em b/ld/emultempl/aarch64elf.em
index 5731ecd..3007e4d 100644
--- a/ld/emultempl/aarch64elf.em
+++ b/ld/emultempl/aarch64elf.em
@@ -55,10 +55,10 @@ aarch64_elf_before_allocation (void)
     {
       /* Here we rummage through the found bfds to collect information.  */
       LANG_FOR_EACH_INPUT_STATEMENT (is)
-	{
-          /* Initialise mapping tables for code/data.  */
-          bfd_elf${ELFSIZE}_aarch64_init_maps (is->the_bfd);
-	}
+      {
+	/* Initialise mapping tables for code/data.  */
+	bfd_elf${ELFSIZE}_aarch64_init_maps (is->the_bfd);
+      }
     }
 
   /* Call the standard elf routine.  */
@@ -357,7 +357,7 @@ EOF
 PARSE_AND_LIST_PROLOGUE='
 #define OPTION_NO_ENUM_SIZE_WARNING	309
 #define OPTION_PIC_VENEER		310
-#define OPTION_STUBGROUP_SIZE           311
+#define OPTION_STUBGROUP_SIZE		311
 #define OPTION_NO_WCHAR_SIZE_WARNING	312
 #define OPTION_FIX_ERRATUM_835769	313
 #define OPTION_FIX_ERRATUM_843419	314
@@ -430,8 +430,8 @@ PARSE_AND_LIST_ARGS_CASES='
       {
 	const char *end;
 
-        group_size = bfd_scan_vma (optarg, &end, 0);
-        if (*end)
+	group_size = bfd_scan_vma (optarg, &end, 0);
+	if (*end)
 	  einfo (_("%P%F: invalid number `%s'\''\n"), optarg);
       }
       break;
diff --git a/ld/emultempl/aix.em b/ld/emultempl/aix.em
index 8d11863..480bbbc 100644
--- a/ld/emultempl/aix.em
+++ b/ld/emultempl/aix.em
@@ -345,23 +345,23 @@ read_file_list (const char *filename)
     {
       /* Skip empty lines.  */
       while (*b == '\n' || *b == '\r')
-        b++;
+	b++;
 
       /* Stop if end of buffer.  */
       if (b == buffer + len)
-        break;
+	break;
 
       /* Eat any byte until end of line.  */
       for (e = b; *e != '\0'; e++)
-        if (*e == '\n' || *e == '\r')
-          break;
+	if (*e == '\n' || *e == '\r')
+	  break;
 
       /* Replace end of line by nul.  */
       if (*e != '\0')
-        *e++ = '\0';
+	*e++ = '\0';
 
       if (b != e)
-        lang_add_input_file (b, lang_input_file_is_search_file_enum, NULL);
+	lang_add_input_file (b, lang_input_file_is_search_file_enum, NULL);
       b = e;
     }
   return;
@@ -388,7 +388,7 @@ gld${EMULATION_NAME}_handle_option (int optc)
 
     case 'f':
       /* This overrides --auxiliary.  This option specifies a file containing
-         a list of input files.  */
+	 a list of input files.  */
       read_file_list (optarg);
       break;
 
diff --git a/ld/emultempl/armelf.em b/ld/emultempl/armelf.em
index 29c73ff..34ff993 100644
--- a/ld/emultempl/armelf.em
+++ b/ld/emultempl/armelf.em
@@ -101,8 +101,8 @@ arm_elf_before_allocation (void)
       /* Here we rummage through the found bfds to collect glue information.  */
       LANG_FOR_EACH_INPUT_STATEMENT (is)
 	{
-          /* Initialise mapping tables for code/data.  */
-          bfd_elf32_arm_init_maps (is->the_bfd);
+	  /* Initialise mapping tables for code/data.  */
+	  bfd_elf32_arm_init_maps (is->the_bfd);
 
 	  if (!bfd_elf32_arm_process_before_allocation (is->the_bfd,
 							&link_info)
@@ -422,9 +422,9 @@ gld${EMULATION_NAME}_finish (void)
   {
     LANG_FOR_EACH_INPUT_STATEMENT (is)
       {
-        /* Figure out where VFP11 erratum veneers (and the labels returning
-           from same) have been placed.  */
-        bfd_elf32_arm_vfp11_fix_veneer_locations (is->the_bfd, &link_info);
+	/* Figure out where VFP11 erratum veneers (and the labels returning
+	   from same) have been placed.  */
+	bfd_elf32_arm_vfp11_fix_veneer_locations (is->the_bfd, &link_info);
 
 	 /* Figure out where STM32L4XX erratum veneers (and the labels returning
 	   from them) have been placed.  */
@@ -531,13 +531,13 @@ arm_elf_create_output_section_statements (void)
   bfd_elf32_arm_set_target_params (link_info.output_bfd, &link_info, &params);
 
   stub_file = lang_add_input_file ("linker stubs",
- 				   lang_input_file_is_fake_enum,
- 				   NULL);
+				   lang_input_file_is_fake_enum,
+				   NULL);
   stub_file->the_bfd = bfd_create ("linker stubs", link_info.output_bfd);
   if (stub_file->the_bfd == NULL
       || ! bfd_set_arch_mach (stub_file->the_bfd,
- 			      bfd_get_arch (link_info.output_bfd),
- 			      bfd_get_mach (link_info.output_bfd)))
+			      bfd_get_arch (link_info.output_bfd),
+			      bfd_get_mach (link_info.output_bfd)))
     {
       einfo (_("%X%P: can not create BFD %E\n"));
       return;
@@ -704,26 +704,26 @@ PARSE_AND_LIST_ARGS_CASES='
 
     case OPTION_VFP11_DENORM_FIX:
       if (strcmp (optarg, "none") == 0)
-        params.vfp11_denorm_fix = BFD_ARM_VFP11_FIX_NONE;
+	params.vfp11_denorm_fix = BFD_ARM_VFP11_FIX_NONE;
       else if (strcmp (optarg, "scalar") == 0)
-        params.vfp11_denorm_fix = BFD_ARM_VFP11_FIX_SCALAR;
+	params.vfp11_denorm_fix = BFD_ARM_VFP11_FIX_SCALAR;
       else if (strcmp (optarg, "vector") == 0)
-        params.vfp11_denorm_fix = BFD_ARM_VFP11_FIX_VECTOR;
+	params.vfp11_denorm_fix = BFD_ARM_VFP11_FIX_VECTOR;
       else
-        einfo (_("Unrecognized VFP11 fix type '\''%s'\''.\n"), optarg);
+	einfo (_("Unrecognized VFP11 fix type '\''%s'\''.\n"), optarg);
       break;
 
     case OPTION_STM32L4XX_FIX:
       if (!optarg)
-        params.stm32l4xx_fix = BFD_ARM_STM32L4XX_FIX_DEFAULT;
+	params.stm32l4xx_fix = BFD_ARM_STM32L4XX_FIX_DEFAULT;
       else if (strcmp (optarg, "none") == 0)
-        params.stm32l4xx_fix = BFD_ARM_STM32L4XX_FIX_NONE;
+	params.stm32l4xx_fix = BFD_ARM_STM32L4XX_FIX_NONE;
       else if (strcmp (optarg, "default") == 0)
-        params.stm32l4xx_fix = BFD_ARM_STM32L4XX_FIX_DEFAULT;
+	params.stm32l4xx_fix = BFD_ARM_STM32L4XX_FIX_DEFAULT;
       else if (strcmp (optarg, "all") == 0)
-        params.stm32l4xx_fix = BFD_ARM_STM32L4XX_FIX_ALL;
+	params.stm32l4xx_fix = BFD_ARM_STM32L4XX_FIX_ALL;
       else
-        einfo (_("Unrecognized STM32L4XX fix type '\''%s'\''.\n"), optarg);
+	einfo (_("Unrecognized STM32L4XX fix type '\''%s'\''.\n"), optarg);
       break;
 
     case OPTION_NO_ENUM_SIZE_WARNING:
@@ -742,8 +742,8 @@ PARSE_AND_LIST_ARGS_CASES='
       {
 	const char *end;
 
-        group_size = bfd_scan_vma (optarg, &end, 0);
-        if (*end)
+	group_size = bfd_scan_vma (optarg, &end, 0);
+	if (*end)
 	  einfo (_("%P%F: invalid number `%s'\''\n"), optarg);
       }
       break;
diff --git a/ld/emultempl/avrelf.em b/ld/emultempl/avrelf.em
index 7aeecb7..451b59f 100644
--- a/ld/emultempl/avrelf.em
+++ b/ld/emultempl/avrelf.em
@@ -51,13 +51,13 @@ static void
 avr_elf_set_global_bfd_parameters (void)
 {
   elf32_avr_setup_params (& link_info,
-                          stub_file->the_bfd,
-                          avr_stub_section,
-                          avr_no_stubs,
-                          avr_debug_stubs,
-                          avr_debug_relax,
-                          avr_pc_wrap_around,
-                          avr_replace_call_ret_sequences);
+			  stub_file->the_bfd,
+			  avr_stub_section,
+			  avr_no_stubs,
+			  avr_debug_stubs,
+			  avr_debug_relax,
+			  avr_pc_wrap_around,
+			  avr_replace_call_ret_sequences);
 }
 
 
@@ -122,14 +122,14 @@ avr_elf_create_output_section_statements (void)
     }
 
   stub_file = lang_add_input_file ("linker stubs",
-                                   lang_input_file_is_fake_enum,
-                                   NULL);
+				   lang_input_file_is_fake_enum,
+				   NULL);
 
   stub_file->the_bfd = bfd_create ("linker stubs", link_info.output_bfd);
   if (stub_file->the_bfd == NULL
       || !bfd_set_arch_mach (stub_file->the_bfd,
-                             bfd_get_arch (link_info.output_bfd),
-                             bfd_get_mach (link_info.output_bfd)))
+			     bfd_get_arch (link_info.output_bfd),
+			     bfd_get_mach (link_info.output_bfd)))
     {
       einfo (_("%X%P: can not create stub BFD %E\n"));
       return;
@@ -138,7 +138,7 @@ avr_elf_create_output_section_statements (void)
   /* Now we add the stub section.  */
 
   flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_CODE
-           | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP);
+	   | SEC_HAS_CONTENTS | SEC_RELOC | SEC_IN_MEMORY | SEC_KEEP);
   avr_stub_section = bfd_make_section_anyway_with_flags (stub_file->the_bfd,
 							 ".trampolines",
 							 flags);
@@ -151,9 +151,9 @@ avr_elf_create_output_section_statements (void)
 
   return;
 
-  err_ret:
-   einfo (_("%X%P: can not make stub section: %E\n"));
-   return;
+ err_ret:
+  einfo (_("%X%P: can not make stub section: %E\n"));
+  return;
 }
 
 /* Re-calculates the size of the stubs so that we won't waste space.  */
@@ -199,17 +199,17 @@ avr_finish (void)
     {
       avr_link_relax = TRUE;
       for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link.next)
-        {
-          /* Don't let the linker stubs prevent the final object being
-             marked as link-relax ready.  */
-          if ((elf_elfheader (abfd)->e_flags
-               & EF_AVR_LINKRELAX_PREPARED) == 0
-              && abfd != stub_file->the_bfd)
-            {
-              avr_link_relax = FALSE;
-              break;
-            }
-        }
+	{
+	  /* Don't let the linker stubs prevent the final object being
+	     marked as link-relax ready.  */
+	  if ((elf_elfheader (abfd)->e_flags
+	       & EF_AVR_LINKRELAX_PREPARED) == 0
+	      && abfd != stub_file->the_bfd)
+	    {
+	      avr_link_relax = FALSE;
+	      break;
+	    }
+	}
     }
   else
     {
@@ -234,15 +234,15 @@ EOF
 PARSE_AND_LIST_PROLOGUE='
 
 #define OPTION_NO_CALL_RET_REPLACEMENT 301
-#define OPTION_PMEM_WRAP_AROUND        302
-#define OPTION_NO_STUBS                303
-#define OPTION_DEBUG_STUBS             304
-#define OPTION_DEBUG_RELAX             305
+#define OPTION_PMEM_WRAP_AROUND	       302
+#define OPTION_NO_STUBS		       303
+#define OPTION_DEBUG_STUBS	       304
+#define OPTION_DEBUG_RELAX	       305
 '
 
 PARSE_AND_LIST_LONGOPTS='
   { "no-call-ret-replacement", no_argument,
-     NULL, OPTION_NO_CALL_RET_REPLACEMENT},
+    NULL, OPTION_NO_CALL_RET_REPLACEMENT},
   { "pmem-wrap-around", required_argument,
     NULL, OPTION_PMEM_WRAP_AROUND},
   { "no-stubs", no_argument,
@@ -286,17 +286,17 @@ PARSE_AND_LIST_ARGS_CASES='
 
     case OPTION_PMEM_WRAP_AROUND:
       {
-        /* This variable is defined in the bfd library.  */
-        if ((!strcmp (optarg,"32k"))      || (!strcmp (optarg,"32K")))
-          avr_pc_wrap_around = 32768;
-        else if ((!strcmp (optarg,"8k")) || (!strcmp (optarg,"8K")))
-          avr_pc_wrap_around = 8192;
-        else if ((!strcmp (optarg,"16k")) || (!strcmp (optarg,"16K")))
-          avr_pc_wrap_around = 16384;
-        else if ((!strcmp (optarg,"64k")) || (!strcmp (optarg,"64K")))
-          avr_pc_wrap_around = 0x10000;
-        else
-          return FALSE;
+	/* This variable is defined in the bfd library.  */
+	if ((!strcmp (optarg,"32k"))      || (!strcmp (optarg,"32K")))
+	  avr_pc_wrap_around = 32768;
+	else if ((!strcmp (optarg,"8k"))  || (!strcmp (optarg,"8K")))
+	  avr_pc_wrap_around = 8192;
+	else if ((!strcmp (optarg,"16k")) || (!strcmp (optarg,"16K")))
+	  avr_pc_wrap_around = 16384;
+	else if ((!strcmp (optarg,"64k")) || (!strcmp (optarg,"64K")))
+	  avr_pc_wrap_around = 0x10000;
+	else
+	  return FALSE;
       }
       break;
 
@@ -314,8 +314,8 @@ PARSE_AND_LIST_ARGS_CASES='
 
     case OPTION_NO_CALL_RET_REPLACEMENT:
       {
-        /* This variable is defined in the bfd library.  */
-        avr_replace_call_ret_sequences = FALSE;
+	/* This variable is defined in the bfd library.  */
+	avr_replace_call_ret_sequences = FALSE;
       }
       break;
 '
diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em
index ff447bd..3128e20 100644
--- a/ld/emultempl/beos.em
+++ b/ld/emultempl/beos.em
@@ -81,8 +81,8 @@ gld_${EMULATION_NAME}_before_parse (void)
 #define OPTION_MINOR_OS_VERSION		(OPTION_MINOR_IMAGE_VERSION + 1)
 #define OPTION_MINOR_SUBSYSTEM_VERSION	(OPTION_MINOR_OS_VERSION + 1)
 #define OPTION_SECTION_ALIGNMENT	(OPTION_MINOR_SUBSYSTEM_VERSION + 1)
-#define OPTION_STACK                    (OPTION_SECTION_ALIGNMENT + 1)
-#define OPTION_SUBSYSTEM                (OPTION_STACK + 1)
+#define OPTION_STACK			(OPTION_SECTION_ALIGNMENT + 1)
+#define OPTION_SUBSYSTEM		(OPTION_STACK + 1)
 #define OPTION_HEAP			(OPTION_SUBSYSTEM + 1)
 
 static void
diff --git a/ld/emultempl/hppaelf.em b/ld/emultempl/hppaelf.em
index 08ed7ea..ead7912 100644
--- a/ld/emultempl/hppaelf.em
+++ b/ld/emultempl/hppaelf.em
@@ -55,7 +55,7 @@ hppaelf_after_parse (void)
 
   /* Enable this once we split millicode stuff from libgcc:
      lang_add_input_file ("milli",
-     			  lang_input_file_is_l_enum,
+			  lang_input_file_is_l_enum,
 			  NULL);
   */
 
@@ -370,8 +370,8 @@ PARSE_AND_LIST_ARGS_CASES='
     case OPTION_STUBGROUP_SIZE:
       {
 	const char *end;
-        group_size = bfd_scan_vma (optarg, &end, 0);
-        if (*end)
+	group_size = bfd_scan_vma (optarg, &end, 0);
+	if (*end)
 	  einfo (_("%P%F: invalid number `%s'\''\n"), optarg);
       }
       break;
diff --git a/ld/emultempl/m68kcoff.em b/ld/emultempl/m68kcoff.em
index a1383be..359f0e0 100644
--- a/ld/emultempl/m68kcoff.em
+++ b/ld/emultempl/m68kcoff.em
@@ -72,7 +72,7 @@ gld${EMULATION_NAME}_after_open (void)
       asection *datasec;
 
       /* As first-order business, make sure that each input BFD is COFF. It
-         better be, as we are directly calling a COFF backend function.  */
+	 better be, as we are directly calling a COFF backend function.  */
       if (bfd_get_flavour (abfd) != bfd_target_coff_flavour)
 	einfo (_("%F%B: all input objects must be COFF "
 		 "for --embedded-relocs\n"));
@@ -80,12 +80,12 @@ gld${EMULATION_NAME}_after_open (void)
       datasec = bfd_get_section_by_name (abfd, ".data");
 
       /* Note that we assume that the reloc_count field has already
-         been set up.  We could call bfd_get_reloc_upper_bound, but
-         that returns the size of a memory buffer rather than a reloc
-         count.  We do not want to call bfd_canonicalize_reloc,
-         because although it would always work it would force us to
-         read in the relocs into BFD canonical form, which would waste
-         a significant amount of time and memory.  */
+	 been set up.  We could call bfd_get_reloc_upper_bound, but
+	 that returns the size of a memory buffer rather than a reloc
+	 count.  We do not want to call bfd_canonicalize_reloc,
+	 because although it would always work it would force us to
+	 read in the relocs into BFD canonical form, which would waste
+	 a significant amount of time and memory.  */
       if (datasec != NULL && datasec->reloc_count > 0)
 	{
 	  asection *relsec;
@@ -103,7 +103,7 @@ gld${EMULATION_NAME}_after_open (void)
 	}
 
       /* Double check that all other data sections are empty, as is
-         required for embedded PIC code.  */
+	 required for embedded PIC code.  */
       bfd_map_over_sections (abfd, check_sections, datasec);
     }
 }
diff --git a/ld/emultempl/m68kelf.em b/ld/emultempl/m68kelf.em
index 9da6e66..de4ef7d 100644
--- a/ld/emultempl/m68kelf.em
+++ b/ld/emultempl/m68kelf.em
@@ -235,15 +235,15 @@ PARSE_AND_LIST_OPTIONS='
 PARSE_AND_LIST_ARGS_CASES='
     case OPTION_GOT:
       if (strcmp (optarg, "target") == 0)
-        got_handling = GOT_HANDLING_TARGET_DEFAULT;
+	got_handling = GOT_HANDLING_TARGET_DEFAULT;
       else if (strcmp (optarg, "single") == 0)
-        got_handling = 0;
+	got_handling = 0;
       else if (strcmp (optarg, "negative") == 0)
-        got_handling = 1;
+	got_handling = 1;
       else if (strcmp (optarg, "multigot") == 0)
-        got_handling = 2;
+	got_handling = 2;
       else
-        einfo (_("Unrecognized --got argument '\''%s'\''.\n"), optarg);
+	einfo (_("Unrecognized --got argument '\''%s'\''.\n"), optarg);
       break;
 '
 
diff --git a/ld/emultempl/metagelf.em b/ld/emultempl/metagelf.em
index 0a2fbd4..b26a738 100644
--- a/ld/emultempl/metagelf.em
+++ b/ld/emultempl/metagelf.em
@@ -328,8 +328,8 @@ PARSE_AND_LIST_ARGS_CASES='
     case OPTION_STUBGROUP_SIZE:
       {
 	const char *end;
-        group_size = bfd_scan_vma (optarg, &end, 0);
-        if (*end)
+	group_size = bfd_scan_vma (optarg, &end, 0);
+	if (*end)
 	  einfo (_("%P%F: invalid number `%s'\''\n"), optarg);
       }
       break;
diff --git a/ld/emultempl/msp430.em b/ld/emultempl/msp430.em
index 5281ab4..0792e3c 100644
--- a/ld/emultempl/msp430.em
+++ b/ld/emultempl/msp430.em
@@ -7,7 +7,7 @@ fragment <<EOF
    Copyright (C) 2014-2017 Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
    Extended for the MSP430 by Nick Clifton  nickc@redhat.com
-   
+
    This file is part of the GNU Binutils.
 
    This program is free software; you can redistribute it and/or modify
@@ -197,7 +197,7 @@ scan_children (lang_statement_union_type * l)
 	  break;
 
 	case lang_wild_statement_enum:
-	  amount += scan_children (l->wild_statement.children.head);	  
+	  amount += scan_children (l->wild_statement.children.head);
 	  break;
 
 	case lang_data_statement_enum:
@@ -214,7 +214,7 @@ scan_children (lang_statement_union_type * l)
 
   return amount;
 }
-  
+
 /* Place an orphan section.  We use this to put .either sections
    into either their lower or their upper equivalents.  */
 
@@ -258,7 +258,7 @@ gld${EMULATION_NAME}_place_orphan (asection * s,
     }
   else
     name = (char *) secname;
-  
+
   lower_name = concat (".lower", name, NULL);
   upper_name = concat (".upper", name, NULL);
 
diff --git a/ld/emultempl/nds32elf.em b/ld/emultempl/nds32elf.em
index d14389b..a2416d2 100644
--- a/ld/emultempl/nds32elf.em
+++ b/ld/emultempl/nds32elf.em
@@ -195,7 +195,7 @@ nds32_elf_after_allocation (void)
     {
       /* Initialize ex9 hash table.  */
       if (!nds32_elf_ex9_init ())
-        return;
+	return;
     }
 
   /* Call default after allocation callback.
diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index 3183caa..0693483 100644
--- a/ld/emultempl/pe.em
+++ b/ld/emultempl/pe.em
@@ -242,9 +242,9 @@ fragment <<EOF
 					(OPTION_EXCLUDE_LIBS + 1)
 #define OPTION_DLL_DISABLE_RUNTIME_PSEUDO_RELOC	\
 					(OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC + 1)
-#define OPTION_LARGE_ADDRESS_AWARE 	(OPTION_DLL_DISABLE_RUNTIME_PSEUDO_RELOC + 1)
+#define OPTION_LARGE_ADDRESS_AWARE	(OPTION_DLL_DISABLE_RUNTIME_PSEUDO_RELOC + 1)
 #define OPTION_DISABLE_LARGE_ADDRESS_AWARE \
- 					(OPTION_LARGE_ADDRESS_AWARE + 1)
+					(OPTION_LARGE_ADDRESS_AWARE + 1)
 #define OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V1	\
 					(OPTION_DISABLE_LARGE_ADDRESS_AWARE + 1)
 #define OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V2	\
@@ -253,8 +253,8 @@ fragment <<EOF
 					(OPTION_DLL_ENABLE_RUNTIME_PSEUDO_RELOC_V2 + 1)
 #define OPTION_USE_NUL_PREFIXED_IMPORT_TABLES \
 					(OPTION_EXCLUDE_MODULES_FOR_IMPLIB + 1)
-#define OPTION_NO_LEADING_UNDERSCORE 	(OPTION_USE_NUL_PREFIXED_IMPORT_TABLES + 1)
-#define OPTION_LEADING_UNDERSCORE 	(OPTION_NO_LEADING_UNDERSCORE + 1)
+#define OPTION_NO_LEADING_UNDERSCORE	(OPTION_USE_NUL_PREFIXED_IMPORT_TABLES + 1)
+#define OPTION_LEADING_UNDERSCORE	(OPTION_NO_LEADING_UNDERSCORE + 1)
 #define OPTION_ENABLE_LONG_SECTION_NAMES \
 					(OPTION_LEADING_UNDERSCORE + 1)
 #define OPTION_DISABLE_LONG_SECTION_NAMES \
@@ -531,10 +531,10 @@ set_entry_point (void)
   int i;
 
   static const struct
-    {
-      const int value;
-      const char *entry;
-    }
+  {
+    const int value;
+    const char *entry;
+  }
   v[] =
     {
       { 1, "NtProcessStartup"  },
@@ -560,14 +560,14 @@ set_entry_point (void)
   else
     {
       for (i = 0; v[i].entry; i++)
-        if (v[i].value == pe_subsystem)
-          break;
+	if (v[i].value == pe_subsystem)
+	  break;
 
       /* If no match, use the default.  */
       if (v[i].entry != NULL)
-        entry = v[i].entry;
+	entry = v[i].entry;
       else
-        entry = default_entry;
+	entry = default_entry;
     }
 
   initial_symbol_char = (is_underscoring () != 0 ? "_" : "");
@@ -1109,7 +1109,7 @@ pe_fixup_stdcalls (void)
 
 	    if (lead_at)
 	      *cname = '_';
-	    if (at)	      
+	    if (at)
 	      * strchr (cname, '@') = 0;
 	    sym = bfd_link_hash_lookup (link_info.hash, cname, FALSE, FALSE, TRUE);
 
@@ -1290,9 +1290,9 @@ pecoff_checksum_contents (bfd *abfd,
 
       status = bfd_bread (&b, (bfd_size_type) 1, abfd);
       if (status < 1)
-        {
-          break;
-        }
+	{
+	  break;
+	}
 
       (*process) (&b, 1, arg);
       filepos += 1;
@@ -1317,25 +1317,25 @@ write_build_id (bfd *abfd)
     {
       struct bfd_link_order *l = NULL;
       for (l = asec->map_head.link_order; l != NULL; l = l->next)
-        {
-          if (l->type == bfd_indirect_link_order)
-            {
-              if (l->u.indirect.section == t->build_id.sec)
-                {
-                  link_order = l;
-                  break;
-                }
-            }
-        }
+	{
+	  if (l->type == bfd_indirect_link_order)
+	    {
+	      if (l->u.indirect.section == t->build_id.sec)
+		{
+		  link_order = l;
+		  break;
+		}
+	    }
+	}
 
       if (link_order)
-        break;
+	break;
     }
 
   if (!link_order)
     {
       einfo (_("%P: warning: .buildid section discarded,"
-               " --build-id ignored.\n"));
+	       " --build-id ignored.\n"));
       return TRUE;
     }
 
@@ -1947,7 +1947,7 @@ gld_${EMULATION_NAME}_unrecognized_file (lang_input_statement_type *entry ATTRIB
 	      struct bfd_link_hash_entry *h;
 
 	      sprintf (buf, "%s%s", U (""),
-	               pe_def_file->exports[i].internal_name);
+		       pe_def_file->exports[i].internal_name);
 
 	      h = bfd_link_hash_lookup (link_info.hash, buf, TRUE, TRUE, TRUE);
 	      if (h == (struct bfd_link_hash_entry *) NULL)
@@ -2342,8 +2342,8 @@ gld_${EMULATION_NAME}_open_dynamic_archive
       /* Alternate explicit import library for dll's.  */
       { "%s.dll.a", FALSE },
       /* "libfoo.a" could be either an import lib or a static lib.
-          For backwards compatibility, libfoo.a needs to precede
-          libfoo.dll and foo.dll in the search.  */
+	 For backwards compatibility, libfoo.a needs to precede
+	 libfoo.dll and foo.dll in the search.  */
       { "lib%s.a", FALSE },
       /* The 'native' spelling of an import lib name is "foo.lib".  */
       { "%s.lib", FALSE },
diff --git a/ld/emultempl/pep.em b/ld/emultempl/pep.em
index 6fef7d8..1446e04 100644
--- a/ld/emultempl/pep.em
+++ b/ld/emultempl/pep.em
@@ -493,10 +493,10 @@ set_entry_point (void)
   int i;
 
   static const struct
-    {
-      const int value;
-      const char *entry;
-    }
+  {
+    const int value;
+    const char *entry;
+  }
   v[] =
     {
       { 1, "NtProcessStartup"  },
@@ -518,14 +518,14 @@ set_entry_point (void)
   else
     {
       for (i = 0; v[i].entry; i++)
-        if (v[i].value == pep_subsystem)
-          break;
+	if (v[i].value == pep_subsystem)
+	  break;
 
       /* If no match, use the default.  */
       if (v[i].entry != NULL)
-        entry = v[i].entry;
+	entry = v[i].entry;
       else
-        entry = default_entry;
+	entry = default_entry;
     }
 
   /* Now we check target's default for getting proper symbol_char.  */
@@ -1257,9 +1257,9 @@ pecoff_checksum_contents (bfd *abfd,
 
       status = bfd_bread (&b, (bfd_size_type) 1, abfd);
       if (status < 1)
-        {
-          break;
-        }
+	{
+	  break;
+	}
 
       (*process) (&b, 1, arg);
       filepos += 1;
@@ -1284,25 +1284,25 @@ write_build_id (bfd *abfd)
     {
       struct bfd_link_order *l = NULL;
       for (l = asec->map_head.link_order; l != NULL; l = l->next)
-        {
-          if (l->type == bfd_indirect_link_order)
-            {
-              if (l->u.indirect.section == t->build_id.sec)
-                {
-                  link_order = l;
-                  break;
-                }
-            }
-        }
+	{
+	  if (l->type == bfd_indirect_link_order)
+	    {
+	      if (l->u.indirect.section == t->build_id.sec)
+		{
+		  link_order = l;
+		  break;
+		}
+	    }
+	}
 
       if (link_order)
-        break;
+	break;
     }
 
   if (!link_order)
     {
       einfo (_("%P: warning: .buildid section discarded,"
-               " --build-id ignored.\n"));
+	       " --build-id ignored.\n"));
       return TRUE;
     }
 
@@ -2115,8 +2115,8 @@ gld_${EMULATION_NAME}_open_dynamic_archive
       /* Alternate explicit import library for dll's.  */
       { "%s.dll.a", FALSE },
       /* "libfoo.a" could be either an import lib or a static lib.
-          For backwards compatibility, libfoo.a needs to precede
-          libfoo.dll and foo.dll in the search.  */
+	 For backwards compatibility, libfoo.a needs to precede
+	 libfoo.dll and foo.dll in the search.  */
       { "lib%s.a", FALSE },
       /* The 'native' spelling of an import lib name is "foo.lib".  */
       { "%s.lib", FALSE },
diff --git a/ld/emultempl/ppc64elf.em b/ld/emultempl/ppc64elf.em
index 5c3ecb0..ac30664 100644
--- a/ld/emultempl/ppc64elf.em
+++ b/ld/emultempl/ppc64elf.em
@@ -826,8 +826,8 @@ PARSE_AND_LIST_ARGS_CASES=${PARSE_AND_LIST_ARGS_CASES}'
     case OPTION_STUBGROUP_SIZE:
       {
 	const char *end;
-        params.group_size = bfd_scan_vma (optarg, &end, 0);
-        if (*end)
+	params.group_size = bfd_scan_vma (optarg, &end, 0);
+	if (*end)
 	  einfo (_("%P%F: invalid number `%s'\''\n"), optarg);
       }
       break;
diff --git a/ld/emultempl/sh64elf.em b/ld/emultempl/sh64elf.em
index cdc73cc..1b18dfd 100644
--- a/ld/emultempl/sh64elf.em
+++ b/ld/emultempl/sh64elf.em
@@ -170,7 +170,7 @@ sh64_elf_${EMULATION_NAME}_before_allocation (void)
     break_1:
 
       /* Check that all input sections have the same contents-type flags
-         as the first input section.  */
+	 as the first input section.  */
       {
 	LANG_FOR_EACH_INPUT_STATEMENT (f)
 	  {
@@ -302,7 +302,7 @@ sh64_elf_${EMULATION_NAME}_after_allocation (void)
     break_1:
 
       /* Check that all input sections have the same contents-type flags
-         as the first input section.  */
+	 as the first input section.  */
       {
 	LANG_FOR_EACH_INPUT_STATEMENT (f)
 	  {
diff --git a/ld/emultempl/spu_ovl.S b/ld/emultempl/spu_ovl.S
index 52cc08f..ad69dfd 100644
--- a/ld/emultempl/spu_ovl.S
+++ b/ld/emultempl/spu_ovl.S
@@ -101,7 +101,7 @@
 #define irq_stat	save4
 
 	.text
-	.align 	4
+	.align	4
 	.type	__rv_pattern, @object
 	.size	__rv_pattern, 16
 __rv_pattern:
@@ -126,7 +126,7 @@ __ovly_current:
  * Load the previous overlay and jump to the caller return address.
  * Updates __ovly_current.
  */
-	.align 	4
+	.align	4
 	.global	__ovly_return
 	.type	__ovly_return, @function
 __ovly_return:
@@ -446,7 +446,7 @@ __ovly_xfer_loop:
 #endif
 	andc	oldvma, oldvma, pbit				# 0,2	77
 	lqd	save1, -16($sp)					# 1,6	77
-	nop	       						# 0,0	78
+	nop							# 0,0	78
 #lnop
 #nop
 	stqx	oldvma, tab5, off5				# 1,6	79
diff --git a/ld/emultempl/spuelf.em b/ld/emultempl/spuelf.em
index 43be87b..f8650a5 100644
--- a/ld/emultempl/spuelf.em
+++ b/ld/emultempl/spuelf.em
@@ -421,7 +421,7 @@ gld${EMULATION_NAME}_finish (void)
   if (is_spu_target ())
     {
       if (params.local_store_lo < params.local_store_hi)
-        {
+	{
 	  asection *s;
 
 	  s = spu_elf_check_vma (&link_info);
diff --git a/ld/emultempl/tic6xdsbt.em b/ld/emultempl/tic6xdsbt.em
index f7f1f25..b83dad9 100644
--- a/ld/emultempl/tic6xdsbt.em
+++ b/ld/emultempl/tic6xdsbt.em
@@ -103,7 +103,7 @@ gld${EMULATION_NAME}_after_allocation (void)
 	 the unwind table index.  */
       unsigned int list_size = 10;
       asection **sec_list = (asection **)
-          xmalloc (list_size * sizeof (asection *));
+	xmalloc (list_size * sizeof (asection *));
       unsigned int sec_count = 0;
 
       LANG_FOR_EACH_INPUT_STATEMENT (is)
@@ -130,7 +130,7 @@ gld${EMULATION_NAME}_after_allocation (void)
 		    {
 		      list_size *= 2;
 		      sec_list = (asection **)
-                          xrealloc (sec_list, list_size * sizeof (asection *));
+			xrealloc (sec_list, list_size * sizeof (asection *));
 		    }
 
 		  sec_list[sec_count++] = sec;
diff --git a/ld/emultempl/ticoff.em b/ld/emultempl/ticoff.em
index 926dbd9..d394e12 100644
--- a/ld/emultempl/ticoff.em
+++ b/ld/emultempl/ticoff.em
@@ -78,17 +78,17 @@ gld${EMULATION_NAME}_handle_option (int optc)
 
     case OPTION_COFF_FORMAT:
       if ((*optarg == '0' || *optarg == '1' || *optarg == '2')
-          && optarg[1] == '\0')
-      {
-        static char buf[] = "coffX-${OUTPUT_FORMAT_TEMPLATE}";
-        coff_version = *optarg - '0';
-        buf[4] = *optarg;
-	lang_add_output_format (buf, NULL, NULL, 0);
-      }
+	  && optarg[1] == '\0')
+	{
+	  static char buf[] = "coffX-${OUTPUT_FORMAT_TEMPLATE}";
+	  coff_version = *optarg - '0';
+	  buf[4] = *optarg;
+	  lang_add_output_format (buf, NULL, NULL, 0);
+	}
       else
-        {
+	{
 	  einfo (_("%P%F: invalid COFF format version %s\n"), optarg);
-        }
+	}
       break;
     }
   return FALSE;
diff --git a/ld/emultempl/vms.em b/ld/emultempl/vms.em
index cd39f97..6f0153b 100644
--- a/ld/emultempl/vms.em
+++ b/ld/emultempl/vms.em
@@ -52,8 +52,8 @@ gld${EMULATION_NAME}_create_output_section_statements (void)
 
 static bfd_boolean
 gld${EMULATION_NAME}_open_dynamic_archive (const char *arch ATTRIBUTE_UNUSED,
-                                           search_dirs_type *search,
-                                           lang_input_statement_type *entry)
+					   search_dirs_type *search,
+					   lang_input_statement_type *entry)
 {
   char *string;
 
@@ -198,7 +198,7 @@ gld${EMULATION_NAME}_before_allocation (void)
   if (elf_hash_table (&link_info)->dynamic_sections_created
       && bed->elf_backend_size_dynamic_sections
       && ! (*bed->elf_backend_size_dynamic_sections) (link_info.output_bfd,
-                                                      &link_info))
+						      &link_info))
     einfo (_("%P%F: failed to set dynamic section sizes: %E\n"));
 
   before_allocation_default ();