57a0cd
diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
57a0cd
index 444aef2942..8a3858d32b 100644
57a0cd
--- a/ld/scripttempl/elf.sc
57a0cd
+++ b/ld/scripttempl/elf.sc
57a0cd
@@ -637,9 +637,9 @@ cat <
57a0cd
   ${SDATA_GOT+${OTHER_GOT_SECTIONS}}
57a0cd
   ${DATA_SDATA-${SDATA}}
57a0cd
   ${DATA_SDATA-${OTHER_SDATA_SECTIONS}}
57a0cd
-  ${RELOCATING+${DATA_END_SYMBOLS-${CREATE_SHLIB+PROVIDE (}${USER_LABEL_PREFIX}_edata = .${CREATE_SHLIB+)}; PROVIDE (${USER_LABEL_PREFIX}edata = .);}}
57a0cd
+  ${RELOCATING+${DATA_END_SYMBOLS-${USER_LABEL_PREFIX}_edata = .; PROVIDE (${USER_LABEL_PREFIX}edata = .);}}
57a0cd
   ${RELOCATING+. = .;}
57a0cd
-  ${RELOCATING+${CREATE_SHLIB+PROVIDE (}${USER_LABEL_PREFIX}__bss_start = .${CREATE_SHLIB+)};}
57a0cd
+  ${RELOCATING+${USER_LABEL_PREFIX}__bss_start = .;}
57a0cd
   ${RELOCATING+${OTHER_BSS_SYMBOLS}}
57a0cd
   ${DATA_SDATA-${SBSS}}
57a0cd
   ${BSS_PLT+${PLT}}
57a0cd
@@ -672,7 +672,7 @@ cat <
57a0cd
   ${LARGE_BSS_AFTER_BSS-${LARGE_BSS}}
57a0cd
   ${RELOCATING+. = ALIGN(${ALIGNMENT});}
57a0cd
   ${RELOCATING+${OTHER_END_SYMBOLS}}
57a0cd
-  ${RELOCATING+${END_SYMBOLS-${CREATE_SHLIB+PROVIDE (}${USER_LABEL_PREFIX}_end = .${CREATE_SHLIB+)}; PROVIDE (${USER_LABEL_PREFIX}end = .);}}
57a0cd
+  ${RELOCATING+${END_SYMBOLS-${USER_LABEL_PREFIX}_end = .; PROVIDE (${USER_LABEL_PREFIX}end = .);}}
57a0cd
   ${RELOCATING+${DATA_SEGMENT_END}}
57a0cd
   ${TINY_DATA_SECTION}
57a0cd
   ${TINY_BSS_SECTION}