Use ${CONSTRUCTING...} to enclose constructors and destructors.

1 files changed, 29 insertions, 25 deletions

diff --git a/ld/scripttempl/h8500m.sc b/ld/scripttempl/h8500m.sc
index 040a4a7..06ce2af 100644
--- a/ld/scripttempl/h8500m.sc
+++ b/ld/scripttempl/h8500m.sc
@@ -1,3 +1,11 @@
+TORS="
+    ___ctors = . ;
+    *(.ctors)
+    ___ctors_end = . ;
+    ___dtors = . ;
+    *(.dtors)
+    ___dtors_end = . ;"
+
 cat <<EOF
 OUTPUT_FORMAT("${OUTPUT_FORMAT}")
 OUTPUT_ARCH(${ARCH})
@@ -9,50 +17,46 @@ SECTIONS
 .text ${RELOCATING+ 0x10000} :
 	{ 					
 	  *(.text) 				
-   	 ${RELOCATING+ _etext = . ; }
+   	  ${RELOCATING+ _etext = . ; }
 	}
 
-
 .data  ${RELOCATING+ 0x20000} :
 	{
-	*(.data)
-	${RELOCATING+ _edata = . ; }
+	  *(.data)
+	  ${RELOCATING+ _edata = . ; }
 	} 
 
 .rdata  ${RELOCATING+ . } :
 	{
-	*(.rdata); 
+	  *(.rdata); 
 	  *(.strings)
-	___ctors = . ;
-	*(.ctors)
-	___ctors_end = . ;
-	___dtors = . ;
-	*(.dtors)
-	___dtors_end = . ;
+	  
+	${CONSTRUCTING+${TORS}}
 	} 
 
 .bss  ${RELOCATING+ . } :
 	{
-	${RELOCATING+ __start_bss = . ; }
-	*(.bss)
-	*(COMMON)
-	${RELOCATING+ _end = . ;  }
+	  ${RELOCATING+ __start_bss = . ; }
+	  *(.bss)
+	  *(COMMON)
+	  ${RELOCATING+ _end = . ;  }
 	}
 
 .stack  ${RELOCATING+ 0x2fff0} :
 	{
-	${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