diff --git a/ld/ChangeLog b/ld/ChangeLog
index df184895c9..375584bb32 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -3,6 +3,11 @@
 	* scripttempl/h8300.sc: Fix formatting.  Fix a comment typo.
 	* scripttempl/h8300h.sc: Fix formatting.
 	* scripttempl/h8300s.sc: Likewise.
+	* scripttempl/h8500.sc: Likewise.
+	* scripttempl/h8500b.sc: Likewise.
+	* scripttempl/h8500c.sc: Likewise.
+	* scripttempl/h8500m.sc: Likewise.
+	* scripttempl/h8500s.sc: Likewise.
 
 2000-01-07  David O'Brien  <obrien@BSDi.com>
 
diff --git a/ld/scripttempl/h8500.sc b/ld/scripttempl/h8500.sc
index f6e88c61df..6b889ddcc7 100644
--- a/ld/scripttempl/h8500.sc
+++ b/ld/scripttempl/h8500.sc
@@ -12,27 +12,27 @@ OUTPUT_ARCH(${ARCH})
 
 /* Code and data 64k total */
 
-SECTIONS 				
-{ 					
-.text ${RELOCATING+ 0x0000 } :
-	{ 					
+SECTIONS
+{
+.text ${RELOCATING+ 0x0000} :
+	{
 	  *(.text)
-   	  ${RELOCATING+ _etext = . ; }
+	  ${RELOCATING+ _etext = . ; }
 	}
 
 .data  ${RELOCATING+ . } :
 	{
 	  *(.data)
 	  ${RELOCATING+ _edata = . ; }
-	} 
+	}
 
 .rdata  ${RELOCATING+ . } :
 	{
-	  *(.rdata); 
+	  *(.rdata);
 	  *(.strings)
-	  
+
 	  ${CONSTRUCTING+${TORS}}
-	} 
+	}
 
 .bss  ${RELOCATING+ . } :
 	{
@@ -46,20 +46,16 @@ SECTIONS
 	{
 	  ${RELOCATING+ _stack = . ; }
 	  *(.stack)
-	} 
+	}
 
-.stab  0 ${RELOCATING+(NOLOAD)} : 
+.stab  0 ${RELOCATING+(NOLOAD)} :
 	{
 	  [ .stab ]
 	}
-	
+
 .stabstr  0 ${RELOCATING+(NOLOAD)} :
 	{
 	  [ .stabstr ]
 	}
 }
 EOF
-
-
-
-
diff --git a/ld/scripttempl/h8500b.sc b/ld/scripttempl/h8500b.sc
index a64eebcfa5..fb6c0e86b6 100644
--- a/ld/scripttempl/h8500b.sc
+++ b/ld/scripttempl/h8500b.sc
@@ -12,55 +12,50 @@ OUTPUT_ARCH(${ARCH})
 
 /* Code and data, both larger than 64k */
 
-SECTIONS 				
-{ 					
+SECTIONS
+{
 .text ${RELOCATING+ 0x10000} :
-	{ 					
-	  *(.text) 				
-
-   	 ${RELOCATING+ _etext = . ; }
+	{
+	  *(.text)
+	  ${RELOCATING+ _etext = . ; }
 	}
 
-
 .data  ${RELOCATING+ 0x20000} :
 	{
-	*(.data)
-	${RELOCATING+ _edata = . ; }
-	} 
+	  *(.data)
+	  ${RELOCATING+ _edata = . ; }
+	}
 
 .rdata  ${RELOCATING+ 0x30000} :
 	{
-	*(.rdata); 
+	  *(.rdata);
 	  *(.strings)
-	  
-	${CONSTRUCTING+${TORS}}
-	} 
+
+	  ${CONSTRUCTING+${TORS}}
+	}
 
 .bss  ${RELOCATING+ 0x40000} :
 	{
-	${RELOCATING+ __start_bss = . ; }
-	*(.bss)
-	*(COMMON)
-	${RELOCATING+ _end = . ;  }
+	  ${RELOCATING+ __start_bss = . ; }
+	  *(.bss)
+	  *(COMMON)
+	  ${RELOCATING+ _end = . ;  }
 	}
 
 .stack  ${RELOCATING+ 0x50000} :
 	{
-	${RELOCATING+ _stack = . ; }
-	*(.stack)
-	} 
+	  ${RELOCATING+ _stack = . ; }
+	  *(.stack)
+	}
 
-  .stab  0 ${RELOCATING+(NOLOAD)} : 
-  {
-    [ .stab ]
-  }
-  .stabstr  0 ${RELOCATING+(NOLOAD)} :
-  {
-    [ .stabstr ]
-  }
+.stab  0 ${RELOCATING+(NOLOAD)} :
+	{
+	  [ .stab ]
+	}
+
+.stabstr  0 ${RELOCATING+(NOLOAD)} :
+	{
+	  [ .stabstr ]
+	}
 }
 EOF
-
-
-
-
diff --git a/ld/scripttempl/h8500c.sc b/ld/scripttempl/h8500c.sc
index bc69649998..145ffc5c32 100644
--- a/ld/scripttempl/h8500c.sc
+++ b/ld/scripttempl/h8500c.sc
@@ -12,53 +12,50 @@ OUTPUT_ARCH(${ARCH})
 
 /* Compact model - code < 64k, data > 64k */
 
-SECTIONS 				
-{ 					
+SECTIONS
+{
 .text 0x10000 :
-	{ 					
-	  *(.text) 				
+	{
+	  *(.text)
 	  *(.strings)
-   	 ${RELOCATING+ _etext = . ; }
+	  ${RELOCATING+ _etext = . ; }
 	} ${RELOCATING+ > ram}
 
-
 .data 0x20000 :
 	{
-	*(.data)
-	${RELOCATING+ _edata = . ; }
+	  *(.data)
+	  ${RELOCATING+ _edata = . ; }
 	} ${RELOCATING+ > ram}
 
 .rdata 0x30000  :
-       {
-	*(.rdata); 
-	  
-	${CONSTRUCTING+${TORS}}
+	{
+	  *(.rdata);
+
+	  ${CONSTRUCTING+${TORS}}
 	}  ${RELOCATING+ > ram}
 
 .bss  0x40000 :
 	{
-	${RELOCATING+ __start_bss = . ; }
-	*(.bss)
-	*(COMMON)
-	${RELOCATING+ _end = . ;  }
+	  ${RELOCATING+ __start_bss = . ; }
+	  *(.bss)
+	  *(COMMON)
+	  ${RELOCATING+ _end = . ;  }
 	} ${RELOCATING+ >ram}
+
 .stack 0x5fff0 :
 	{
-	${RELOCATING+ _stack = . ; }
-	*(.stack)
+	  ${RELOCATING+ _stack = . ; }
+	  *(.stack)
 	} ${RELOCATING+ > topram}
 
-  .stab  0 ${RELOCATING+(NOLOAD)} : 
-  {
-    [ .stab ]
-  }
-  .stabstr  0 ${RELOCATING+(NOLOAD)} :
-  {
-    [ .stabstr ]
-  }
+.stab  0 ${RELOCATING+(NOLOAD)} :
+	{
+	  [ .stab ]
+	}
+
+.stabstr  0 ${RELOCATING+(NOLOAD)} :
+	{
+	  [ .stabstr ]
+	}
 }
 EOF
-
-
-
-
diff --git a/ld/scripttempl/h8500m.sc b/ld/scripttempl/h8500m.sc
index 06ce2af6b4..3314066ed6 100644
--- a/ld/scripttempl/h8500m.sc
+++ b/ld/scripttempl/h8500m.sc
@@ -12,27 +12,27 @@ OUTPUT_ARCH(${ARCH})
 
 /* Code and data, both larger than 64k */
 
-SECTIONS 				
-{ 					
+SECTIONS
+{
 .text ${RELOCATING+ 0x10000} :
-	{ 					
-	  *(.text) 				
-   	  ${RELOCATING+ _etext = . ; }
+	{
+	  *(.text)
+	  ${RELOCATING+ _etext = . ; }
 	}
 
 .data  ${RELOCATING+ 0x20000} :
 	{
 	  *(.data)
 	  ${RELOCATING+ _edata = . ; }
-	} 
+	}
 
 .rdata  ${RELOCATING+ . } :
 	{
-	  *(.rdata); 
+	  *(.rdata);
 	  *(.strings)
-	  
-	${CONSTRUCTING+${TORS}}
-	} 
+
+	  ${CONSTRUCTING+${TORS}}
+	}
 
 .bss  ${RELOCATING+ . } :
 	{
@@ -46,20 +46,16 @@ SECTIONS
 	{
 	  ${RELOCATING+ _stack = . ; }
 	  *(.stack)
-	} 
-
-.stab  0 ${RELOCATING+(NOLOAD)} : 
-        {
-          [ .stab ]
 	}
-	
+
+.stab  0 ${RELOCATING+(NOLOAD)} :
+	{
+	  [ .stab ]
+	}
+
 .stabstr  0 ${RELOCATING+(NOLOAD)} :
 	{
 	  [ .stabstr ]
 	}
 }
 EOF
-
-
-
-
diff --git a/ld/scripttempl/h8500s.sc b/ld/scripttempl/h8500s.sc
index 2567489e1d..da4d2101b1 100644
--- a/ld/scripttempl/h8500s.sc
+++ b/ld/scripttempl/h8500s.sc
@@ -12,19 +12,19 @@ OUTPUT_ARCH(${ARCH})
 
 /* Code and data, both 64k */
 
-SECTIONS 				
-{ 					
-.text ${RELOCATING+ 0x10000 } :
-	{ 					
-	  *(.text) 				
-   	  ${RELOCATING+ _etext = . ; }
+SECTIONS
+{
+.text ${RELOCATING+ 0x10000} :
+	{
+	  *(.text)
+	  ${RELOCATING+ _etext = . ; }
 	}
 
-.rdata  ${RELOCATING+ 0x20000 } :
+.rdata  ${RELOCATING+ 0x20000} :
 	{
-	  *(.rdata); 
+	  *(.rdata);
 	  *(.strings)
-	  
+
 	  ${CONSTRUCTING+${TORS}}
 	}
 
@@ -32,7 +32,7 @@ SECTIONS
 	{
 	  *(.data)
 	  ${RELOCATING+ _edata = . ; }
-	} 
+	}
 
 .bss  ${RELOCATING+ .} :
 	{
@@ -46,20 +46,16 @@ SECTIONS
 	{
 	  ${RELOCATING+ _stack = . ; }
 	  *(.stack)
-	} 
-
-.stab  0 ${RELOCATING+(NOLOAD)} : 
-	{
-          [ .stab ]
 	}
-	
+
+.stab  0 ${RELOCATING+(NOLOAD)} :
+	{
+	  [ .stab ]
+	}
+
 .stabstr  0 ${RELOCATING+(NOLOAD)} :
 	{
 	  [ .stabstr ]
 	}
 }
 EOF
-
-
-
-