1 files changed, 20 insertions, 21 deletions

diff --git a/ld/scripttempl/elfmicroblaze.sc b/ld/scripttempl/elfmicroblaze.sc
index d8f7569..4a7c196 100644
--- a/ld/scripttempl/elfmicroblaze.sc
+++ b/ld/scripttempl/elfmicroblaze.sc
@@ -63,9 +63,9 @@ ${RELOCATING+${LIB_SEARCH_DIRS}}
 
 ${RELOCATING+ENTRY (${ENTRY})}
 
-_TEXT_START_ADDR = DEFINED(_TEXT_START_ADDR) ? _TEXT_START_ADDR : 0x50;
+${RELOCATING+_TEXT_START_ADDR = DEFINED(_TEXT_START_ADDR) ? _TEXT_START_ADDR : 0x50;
 _HEAP_SIZE = DEFINED(_HEAP_SIZE) ? _HEAP_SIZE : 0x0;
-_STACK_SIZE = DEFINED(_STACK_SIZE) ? _STACK_SIZE : 0x400;
+_STACK_SIZE = DEFINED(_STACK_SIZE) ? _STACK_SIZE : 0x400;}
 
 SECTIONS
 {
@@ -79,7 +79,7 @@ SECTIONS
 
   ${RELOCATING+ _ftext  =  .;}
   .text : {
-    ${RELOCATING+*(.text)}
+    *(.text)
     ${RELOCATING+*(.text.*)}
     ${RELOCATING+*(.gnu.linkonce.t.*)}
   }
@@ -103,10 +103,10 @@ SECTIONS
   ${RELOCATING+ . = ALIGN(4);}
    ${RELOCATING+ _frodata = . ;}
   .rodata : {
-    ${RELOCATING+*(.rodata)}
+    *(.rodata)
     ${RELOCATING+*(.rodata.*)}
     ${RELOCATING+*(.gnu.linkonce.r.*)}
-    ${CONSTRUCTING+CONSTRUCTORS}; /* Is this needed? */
+    ${CONSTRUCTING+CONSTRUCTORS;} /* Is this needed? */
   }
   ${RELOCATING+ _erodata = .;}
 
@@ -115,14 +115,14 @@ SECTIONS
   ${RELOCATING+. = ALIGN(8);}
   ${RELOCATING+ _ssrw = .;}
   .sdata2 : {
-    ${RELOCATING+*(.sdata2)}
+    *(.sdata2)
     ${RELOCATING+*(.sdata2.*)}
     ${RELOCATING+*(.gnu.linkonce.s2.*)}
   }
   ${RELOCATING+. = ALIGN(4);}
   .sbss2 : {
     ${RELOCATING+PROVIDE (__sbss2_start = .);}
-    ${RELOCATING+*(.sbss2)}
+    *(.sbss2)
     ${RELOCATING+*(.sbss2.*)}
     ${RELOCATING+*(.gnu.linkonce.sb2.*)}
     ${RELOCATING+PROVIDE (__sbss2_end = .);}
@@ -135,36 +135,36 @@ SECTIONS
   ${RELOCATING+ . = ALIGN(4);}
   ${RELOCATING+ _fdata = .;}
   .data : {
-    ${RELOCATING+*(.data)}
+    *(.data)
     ${RELOCATING+*(.gnu.linkonce.d.*)}
-    ${CONSTRUCTING+CONSTRUCTORS}; /* Is this needed? */
+    ${CONSTRUCTING+CONSTRUCTORS;} /* Is this needed? */
   }
   ${RELOCATING+ _edata = . ;}
 
    /* Added to handle pic code */
   .got : {
-    ${RELOCATING+*(.got)}
+    *(.got)
   }
 
   .got1 : {
-    ${RELOCATING+*(.got1)}
+    *(.got1)
   }
 
   .got2 : {
-    ${RELOCATING+*(.got2)}
+    *(.got2)
   }
 
   /* Added by Sathya to handle C++ exceptions */
   .eh_frame : {
-    ${RELOCATING+*(.eh_frame)}
+    *(.eh_frame)
   }
 
   .jcr : {
-    ${RELOCATING+*(.jcr)}
+    *(.jcr)
   }
 
   .gcc_except_table : {
-    ${RELOCATING+*(.gcc_except_table)}
+    *(.gcc_except_table)
   }
 
   /* Alignments by 8 to ensure that _SDA_BASE_ on a word boundary */
@@ -172,14 +172,14 @@ SECTIONS
   ${RELOCATING+. = ALIGN(8);}
   ${RELOCATING+ _ssro = .;}
   .sdata : {
-    ${RELOCATING+*(.sdata)}
+    *(.sdata)
     ${RELOCATING+*(.sdata.*)}
     ${RELOCATING+*(.gnu.linkonce.s.*)}
   }
   ${RELOCATING+. = ALIGN(4);}
   .sbss : {
     ${RELOCATING+PROVIDE (__sbss_start = .);}
-    ${RELOCATING+*(.sbss)}
+    *(.sbss)
     ${RELOCATING+*(.sbss.*)}
     ${RELOCATING+*(.gnu.linkonce.sb.*)}
     ${RELOCATING+PROVIDE (__sbss_end = .);}
@@ -193,14 +193,13 @@ SECTIONS
   ${RELOCATING+ _fbss = .;}
   .bss : {
     ${RELOCATING+PROVIDE (__bss_start = .);}
-    ${RELOCATING+*(.bss)}
+    *(.bss)
     ${RELOCATING+*(.bss.*)}
     ${RELOCATING+*(.gnu.linkonce.b.*)}
     ${RELOCATING+*(COMMON)}
     ${RELOCATING+. = ALIGN(. != 0 ? 4 : 1);}
 
     ${RELOCATING+PROVIDE (__bss_end = .);}
-
   }
 
   ${RELOCATING+ . = ALIGN(4);}
@@ -223,12 +222,12 @@ SECTIONS
   }
 
   .tdata : {
-    ${RELOCATING+*(.tdata)}
+    *(.tdata)
     ${RELOCATING+*(.tdata.*)}
     ${RELOCATING+*(.gnu.linkonce.td.*)}
   }
   .tbss : {
-    ${RELOCATING+*(.tbss)}
+    *(.tbss)
     ${RELOCATING+*(.tbss.*)}
     ${RELOCATING+*(.gnu.linkonce.tb.*)}
   }