* emulparams/armelf.sh (OTHER_BSS_END_SYMBOLS): Split out from
authorAlan Modra <amodra@gmail.com>
Fri, 5 Aug 2005 04:29:57 +0000 (04:29 +0000)
committerAlan Modra <amodra@gmail.com>
Fri, 5 Aug 2005 04:29:57 +0000 (04:29 +0000)
OTHER_END_SYMBOLS.
* emulparams/armelf_linux.sh: Likewise.
* emulparams/armnto.sh: Likewise.
* emulparams/criself.sh: Likewise.
* emulparams/elf32mcore.sh: Likewise.
* emulparams/criself.sh (OTHER_SYMBOLS): Define.
* emulparams/crislinux.sh (OTHER_SYMBOLS): Define.
(OTHER_END_SYMBOLS): Don't define.
* emulparams/elf32fr30.sh: Likewise.
* emulparams/elf64mmix.sh: Likewise.
* emulparams/hppa64linux.sh: Likewise.
* emulparams/m32relf.sh: Likewise.
* emulparams/vxworks.sh: Likewise.
* scripttempl/armbpabi.sc (OTHER_BSS_SECTIONS): Delete.
(OTHER_BSS_END_SYMBOLS): Add.
(OTHER_END_SYMBOLS): Move before current end sym definitions.
(OTHER_SYMBOLS): Replace OTHER_END_SYMBOLS near end of script.
* scripttempl/elf.sc: Likewise.
* scripttempl/elf32sh-symbian.sc: Likewise.
* scripttempl/elf_chaos.sc: Likewise.
* scripttempl/elfxtensa.sc: Likewise.
* scripttempl/iq2000.sc: Likewise.
* scripttempl/xstormy16.sc: Likewise.

* scripttempl/elf.sc (LBSS, LARGE_SECTIONS): Delete.
(REL_LDATA, REL_LBSS, REL_LRODATA): Delete.
(REL_LARGE, LARGE_SECTIONS): Add.
* emulparams/elf_x86_64.sh (LARGE_SECTIONS): Define as script text.
(REL_LARGE): Define.
* emulparams/hppa64linux.sh (OTHER_BSS_SECTIONS): Don't define.
(LARGE_SECTIONS): Define.
* emulparams/hppa64linux.sh (OTHER_BSS_SECTIONS): Don't define.
(LARGE_SECTIONS): Define.

20 files changed:
ld/ChangeLog
ld/emulparams/armelf.sh
ld/emulparams/armelf_linux.sh
ld/emulparams/armnto.sh
ld/emulparams/criself.sh
ld/emulparams/crislinux.sh
ld/emulparams/elf32fr30.sh
ld/emulparams/elf32mcore.sh
ld/emulparams/elf64mmix.sh
ld/emulparams/elf_x86_64.sh
ld/emulparams/hppa64linux.sh
ld/emulparams/m32relf.sh
ld/emulparams/vxworks.sh
ld/scripttempl/armbpabi.sc
ld/scripttempl/elf.sc
ld/scripttempl/elf32sh-symbian.sc
ld/scripttempl/elf_chaos.sc
ld/scripttempl/elfxtensa.sc
ld/scripttempl/iq2000.sc
ld/scripttempl/xstormy16.sc

index 907208f20682c471d0d9e47a7575aea01b29fac0..05c579332d2a1a774e133a6c8b4c02bfa7eca158 100644 (file)
@@ -1,3 +1,40 @@
+2005-08-05  Alan Modra  <amodra@bigpond.net.au>
+
+       * emulparams/armelf.sh (OTHER_BSS_END_SYMBOLS): Split out from
+       OTHER_END_SYMBOLS.
+       * emulparams/armelf_linux.sh: Likewise.
+       * emulparams/armnto.sh: Likewise.
+       * emulparams/criself.sh: Likewise.
+       * emulparams/elf32mcore.sh: Likewise.
+       * emulparams/criself.sh (OTHER_SYMBOLS): Define.
+       * emulparams/crislinux.sh (OTHER_SYMBOLS): Define.
+       (OTHER_END_SYMBOLS): Don't define.
+       * emulparams/elf32fr30.sh: Likewise.
+       * emulparams/elf64mmix.sh: Likewise.
+       * emulparams/hppa64linux.sh: Likewise.
+       * emulparams/m32relf.sh: Likewise.
+       * emulparams/vxworks.sh: Likewise.
+       * scripttempl/armbpabi.sc (OTHER_BSS_SECTIONS): Delete.
+       (OTHER_BSS_END_SYMBOLS): Add.
+       (OTHER_END_SYMBOLS): Move before current end sym definitions.
+       (OTHER_SYMBOLS): Replace OTHER_END_SYMBOLS near end of script.
+       * scripttempl/elf.sc: Likewise.
+       * scripttempl/elf32sh-symbian.sc: Likewise.
+       * scripttempl/elf_chaos.sc: Likewise.
+       * scripttempl/elfxtensa.sc: Likewise.
+       * scripttempl/iq2000.sc: Likewise.
+       * scripttempl/xstormy16.sc: Likewise.
+
+       * scripttempl/elf.sc (LBSS, LARGE_SECTIONS): Delete.
+       (REL_LDATA, REL_LBSS, REL_LRODATA): Delete.
+       (REL_LARGE, LARGE_SECTIONS): Add.
+       * emulparams/elf_x86_64.sh (LARGE_SECTIONS): Define as script text.
+       (REL_LARGE): Define.
+       * emulparams/hppa64linux.sh (OTHER_BSS_SECTIONS): Don't define.
+       (LARGE_SECTIONS): Define.
+       * emulparams/hppa64linux.sh (OTHER_BSS_SECTIONS): Don't define.
+       (LARGE_SECTIONS): Define.
+
 2005-08-04  Alan Modra  <amodra@bigpond.net.au>
 
        * ldemul.c (ldemul_do_assignments, do_assignments_default): Delete.
index c3d5bd0f8474921f6af66d8791c932d1bcd7db6d..782fd2d52c548aca45fe759c5e382aebfe01da20 100644 (file)
@@ -8,7 +8,8 @@ TEMPLATE_NAME=elf32
 EXTRA_EM_FILE=armelf
 OTHER_TEXT_SECTIONS='*(.glue_7t) *(.glue_7)'
 OTHER_BSS_SYMBOLS='__bss_start__ = .;'
-OTHER_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;'
+OTHER_BSS_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ;'
+OTHER_END_SYMBOLS='__end__ = . ;'
 OTHER_SECTIONS='.note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }'
 OTHER_READONLY_SECTIONS="
   .ARM.extab ${RELOCATING-0} : { *(.ARM.extab${RELOCATING+* .gnu.linkonce.armextab.*}) }
index fd927c51907583f0373c8256e5dd0769290c0b3b..39b7f656409f2a87d374e77975d7871d11ce34c1 100644 (file)
@@ -13,7 +13,8 @@ GENERATE_PIE_SCRIPT=yes
 DATA_START_SYMBOLS='__data_start = . ;';
 OTHER_TEXT_SECTIONS='*(.glue_7t) *(.glue_7)'
 OTHER_BSS_SYMBOLS='__bss_start__ = .;'
-OTHER_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;'
+OTHER_BSS_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ;'
+OTHER_END_SYMBOLS='__end__ = . ;'
 OTHER_SECTIONS='.note.gnu.arm.ident 0 : { KEEP (*(.note.gnu.arm.ident)) }'
 
 TEXT_START_ADDR=0x00008000
index 7e468c09f922f164a10b04ef2364352b888f42fa..64296129dc2cb7744f4b5beff07cf7768954c2eb 100644 (file)
@@ -8,7 +8,8 @@ TEMPLATE_NAME=elf32
 EXTRA_EM_FILE=armelf
 OTHER_TEXT_SECTIONS='*(.glue_7t) *(.glue_7)'
 OTHER_BSS_SYMBOLS='__bss_start__ = .;'
-OTHER_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ; __end__ = . ;'
+OTHER_BSS_END_SYMBOLS='_bss_end__ = . ; __bss_end__ = . ;'
+OTHER_END_SYMBOLS='__end__ = . ;'
 
 DATA_START_SYMBOLS='__data_start = . ;';
 
index d63424db56cce79d0d4c59b2b956c137aad20a36..0478f345af426bc8973d05fdea6cfd94c37eeafd 100644 (file)
@@ -42,12 +42,12 @@ OTHER_SDATA_SECTIONS="${RELOCATING+PROVIDE (__Edata = .);}"
 # address, we can't get to it with OTHER_BSS_SYMBOLS, neither can we
 # use ADDR(.bss) there.  Instead, we use the symbol support for the
 # end symbol.
-OTHER_END_SYMBOLS='
+OTHER_BSS_END_SYMBOLS='
  PROVIDE (__Ebss = .);
- PROVIDE (__end = .);
  __Sbss = ADDR (.bss);
  PROVIDE (_bss_start = __Sbss);
 '
+OTHER_END_SYMBOLS='PROVIDE (__end = .);'
 
 INIT_START='
  . = ALIGN(2);
@@ -90,7 +90,7 @@ CTOR_END='
 '
 
 # Also add the other symbols provided for rsim/xsim and elinux.
-OTHER_END_SYMBOLS='
+OTHER_SYMBOLS='
   PROVIDE (__Eall = .);
   PROVIDE (__Endmem = 0x10000000); 
   PROVIDE (__Stacksize = 0);
index 8d7ba5fd796ad0c800bb6f7dd6e69bc3f102c035..98d12f3929b84a903b3bfb53131923cb82c5015e 100644 (file)
@@ -28,10 +28,10 @@ DATA_START_SYMBOLS='PROVIDE (__Sdata = .);'
 # Smuggle an "OTHER_DATA_END_SYMBOLS" here.
 OTHER_SDATA_SECTIONS="${RELOCATING+PROVIDE (__Edata = .);}"
 OTHER_BSS_SYMBOLS='PROVIDE (__Sbss = .);'
-OTHER_END_SYMBOLS='PROVIDE (__Ebss = .);'
+OTHER_BSS_END_SYMBOLS='PROVIDE (__Ebss = .);'
 
 # Also add the other symbols provided for rsim/xsim and elinux.
-OTHER_END_SYMBOLS='
+OTHER_SYMBOLS='
   PROVIDE (__Eall = .);
   PROVIDE (__Endmem = 0x10000000); 
   PROVIDE (__Stacksize = 0);
index cec006c71f91790939c23981f22176edb1382ef2..069c623cd30f7a4f5d993338908e2a3d52ed785f 100755 (executable)
@@ -7,4 +7,4 @@ MAXPAGESIZE=256
 ENTRY=_start
 EMBEDDED=yes
 NOP=0x9fa09fa0
-OTHER_END_SYMBOLS='PROVIDE (__stack = 0x200000);'
+OTHER_SYMBOLS='PROVIDE (__stack = 0x200000);'
index 242af810e780ab14330bdbe45144f96b3369e3e1..930a9c3c8bcdeccb03325f4f57f4d31ed8fbdaad 100644 (file)
@@ -22,7 +22,7 @@ EMBEDDED=yes
 NOP=0x0e0e0e0e
 
 OTHER_BSS_SYMBOLS="__bss_start__ = . ;"
-OTHER_END_SYMBOLS="__bss_end__ = . ;"
+OTHER_BSS_END_SYMBOLS="__bss_end__ = . ;"
 
 # This sets the stack to the top of the simulator memory (2^19 bytes).
 STACK_ADDR=0x80000
index 1ee928328916499f81c4fd0e194e435ac179e331..22b207fce16484b7f668c87acdf1ca1fffa6e0e2 100644 (file)
@@ -58,4 +58,4 @@ OTHER_SECTIONS='
 # EXECUTABLE_SYMBOLS.
 # By default, put the high end of the stack where the register stack
 # begins.  They grow in opposite directions.  */
-OTHER_END_SYMBOLS="PROVIDE (__Stack_start = 0x6000000000000000);"
+OTHER_SYMBOLS="PROVIDE (__Stack_start = 0x6000000000000000);"
index 35240df04cf9fe78df4ecf914aae5e63cdcdc0ca..d62b5e41d289547865b58445f529139feef328bb 100644 (file)
@@ -12,9 +12,32 @@ TEMPLATE_NAME=elf32
 GENERATE_SHLIB_SCRIPT=yes
 GENERATE_PIE_SCRIPT=yes
 NO_SMALL_DATA=yes
-LARGE_SECTIONS=yes
 SEPARATE_GOTPLT=24
 
+LARGE_SECTIONS="
+  .lbss ${RELOCATING-0} :
+  {
+    *(.dynlbss)
+    *(.lbss${RELOCATING+ .lbss.* .gnu.linkonce.lb.*})
+    *(LARGE_COMMON)
+  }
+  .lrodata ${RELOCATING-0} ${RELOCATING+ALIGN(${MAXPAGESIZE}) + (. & (${MAXPAGESIZE} - 1))} :
+  {
+    *(.lrodata${RELOCATING+ .lrodata.* .gnu.linkonce.lr.*})
+  }
+  .ldata ${RELOCATING-0} ${RELOCATING+ALIGN(${MAXPAGESIZE}) + (. & (${MAXPAGESIZE} - 1))} :
+  {
+    *(.ldata${RELOCATING+ .ldata.* .gnu.linkonce.l.*})
+    ${RELOCATING+. = ALIGN(. != 0 ? ${ALIGNMENT} : 1);}
+  }"
+REL_LARGE="
+  .rel.ldata    ${RELOCATING-0} : { *(.rel.ldata${RELOCATING+ .rel.ldata.* .rel.gnu.linkonce.l.*}) }
+  .rela.ldata   ${RELOCATING-0} : { *(.rela.ldata${RELOCATING+ .rela.ldata.* .rela.gnu.linkonce.l.*}) }
+  .rel.lbss     ${RELOCATING-0} : { *(.rel.lbss${RELOCATING+ .rel.lbss.* .rel.gnu.linkonce.lb.*}) }
+  .rela.lbss    ${RELOCATING-0} : { *(.rela.lbss${RELOCATING+ .rela.lbss.* .rela.gnu.linkonce.lb.*}) }
+  .rel.lrodata  ${RELOCATING-0} : { *(.rel.lrodata${RELOCATING+ .rel.lrodata.* .rel.gnu.linkonce.lr.*}) }
+  .rela.lrodata ${RELOCATING-0} : { *(.rela.lrodata${RELOCATING+ .rela.lrodata.* .rela.gnu.linkonce.lr.*}) }"
+
 if [ "x${host}" = "x${target}" ]; then
   case " $EMULATION_LIBPATH " in
     *" ${EMULATION_NAME} "*)
index 3e0e3e74c7bae6b9c6d8e1e51b87259a1fb9a83a..66bb842382c97be3f4c0187791cf93ed1fe1d61e 100644 (file)
@@ -30,12 +30,12 @@ OTHER_READWRITE_SECTIONS="
 # The PA64 ELF port has two additional bss sections. huge bss and thread bss.
 # Make sure they end up in the appropriate location.  We also have to set
 # __TLS_SIZE to the size of the thread bss section.
-OTHER_BSS_SECTIONS="
+LARGE_SECTIONS="
   .hbss         ${RELOCATING-0} : { *(.hbss) }
   .tbss         ${RELOCATING-0} : { *(.tbss) }
 "
-#OTHER_END_SYMBOLS='PROVIDE (__TLS_SIZE = SIZEOF (.tbss));'
-OTHER_END_SYMBOLS='
+#OTHER_SYMBOLS='PROVIDE (__TLS_SIZE = SIZEOF (.tbss));'
+OTHER_SYMBOLS='
   PROVIDE (__TLS_SIZE = 0);
   PROVIDE (__TLS_INIT_SIZE = 0);
   PROVIDE (__TLS_INIT_START = 0);
index c67472abf52e0faa773e28ed19c8cf3b6c6e67f1..947c7a8eae184aa87de31ac17108bb80a1515f8b 100644 (file)
@@ -9,4 +9,4 @@ MAXPAGESIZE=32
 EMBEDDED=yes
 
 # This sets the stack to the top of simulator memory (8MB).
-OTHER_END_SYMBOLS='PROVIDE (_stack = 0x800000);'
+OTHER_SYMBOLS='PROVIDE (_stack = 0x800000);'
index 01757a2e8f09971312fd1df00406c27ec4e6f217..0bd00e53afb2bc40ef268894f5910b3dd27cbfa4 100644 (file)
@@ -21,5 +21,5 @@ FINI_END='KEEP (*(.fini$99));
           PROVIDE (_etext = .);'
 
 ETEXT_NAME=etext_unrelocated
-OTHER_END_SYMBOLS="PROVIDE (_ehdr = ${TEXT_START_ADDR});"
+OTHER_SYMBOLS="PROVIDE (_ehdr = ${TEXT_START_ADDR});"
 DATA_END_SYMBOLS=".edata : { PROVIDE (_edata = .); }"
index fb4656fb1132da938eb90a719839ee3c99860ab8..dccc8cdf155b9fe6776d0c9fa0a762576a9ef3a2 100644 (file)
@@ -293,10 +293,10 @@ cat <<EOF
       .bss section disappears because there are no input sections.  */
    ${RELOCATING+. = ALIGN(${ALIGNMENT});}
   }
-  ${OTHER_BSS_SECTIONS}
+  ${RELOCATING+${OTHER_BSS_END_SYMBOLS}}
   ${RELOCATING+. = ALIGN(${ALIGNMENT});}
-  ${RELOCATING+_end = .;}
   ${RELOCATING+${OTHER_END_SYMBOLS}}
+  ${RELOCATING+_end = .;}
   ${RELOCATING+PROVIDE (end = .);}
   ${RELOCATING+${DATA_SEGMENT_END}}
 
@@ -353,7 +353,7 @@ cat <<EOF
 
   ${STACK_ADDR+${STACK}}
   ${OTHER_SECTIONS}
-  ${RELOCATING+${OTHER_END_SYMBOLS}}
+  ${RELOCATING+${OTHER_SYMBOLS}}
   ${RELOCATING+${STACKNOTE}}
 EOF
 
index 3ee8b43693b6bc59d4af240c0d0b5ee3a99fa09b..ccbaaf4af1c96a0112da890e09c18420f172e4ad 100644 (file)
@@ -14,7 +14,6 @@
 #              (e.g., .PARISC.global)
 #      OTHER_RELRO_SECTIONS - other than .data.rel.ro ...
 #              (e.g. PPC32 .fixup, .got[12])
-#      OTHER_BSS_SECTIONS - other than .bss .sbss ...
 #      OTHER_SECTIONS - at the end
 #      EXECUTABLE_SYMBOLS - symbols that must be defined for an
 #              executable (e.g., _DYNAMIC_LINK)
@@ -46,7 +45,7 @@
 #      FINI_START, FINI_END - statements just before and just after
 #      combination of .fini sections.
 #      STACK_ADDR - start of a .stack section.
-#      OTHER_END_SYMBOLS - symbols to place right at the end of the script.
+#      OTHER_SYMBOLS - symbols to place right at the end of the script.
 #      ETEXT_NAME - name of a symbol for the end of the text section,
 #              normally etext.
 #      SEPARATE_GOTPLT - if set, .got.plt should be separate output section,
@@ -166,31 +165,6 @@ if test -z "${SDATA_GOT}"; then
     SDATA_GOT=" "
   fi
 fi
-if test -n "${LARGE_SECTIONS}"; then
-  LBSS="
-  .lbss ${RELOCATING-0} :
-  {
-   *(.dynlbss)
-   *(.lbss${RELOCATING+ .lbss.* .gnu.linkonce.lb.*})
-   *(LARGE_COMMON)
-  }"
-  LARGE_SECTIONS="
-  .lrodata ${RELOCATING-0} ${RELOCATING+ALIGN(${MAXPAGESIZE}) + (. & (${MAXPAGESIZE} - 1))} :
-  {
-   *(.lrodata${RELOCATING+ .lrodata.* .gnu.linkonce.lr.*})
-  }
-  .ldata ${RELOCATING-0} ${RELOCATING+ALIGN(${MAXPAGESIZE}) + (. & (${MAXPAGESIZE} - 1))} :
-  {
-   *(.ldata${RELOCATING+ .ldata.* .gnu.linkonce.l.*})
-   ${RELOCATING+. = ALIGN(. != 0 ? ${ALIGNMENT} : 1);}
-  }"
-  REL_LDATA=".rel.ldata    ${RELOCATING-0} : { *(.rel.ldata${RELOCATING+ .rel.ldata.* .rel.gnu.linkonce.l.*}) }
-  .rela.ldata   ${RELOCATING-0} : { *(.rela.ldata${RELOCATING+ .rela.ldata.* .rela.gnu.linkonce.l.*}) }"
-  REL_LBSS=".rel.lbss     ${RELOCATING-0} : { *(.rel.lbss${RELOCATING+ .rel.lbss.* .rel.gnu.linkonce.lb.*}) }
-  .rela.lbss    ${RELOCATING-0} : { *(.rela.lbss${RELOCATING+ .rela.lbss.* .rela.gnu.linkonce.lb.*}) }"
-  REL_LRODATA=".rel.lrodata       ${RELOCATING-0} : { *(.rel.lrodata${RELOCATING+ .rel.lrodata.* .rel.gnu.linkonce.lr.*}) }
-  .rela.lrodata       ${RELOCATING-0} : { *(.rela.lrodata${RELOCATING+ .rela.lrodata.* .rela.gnu.linkonce.lr.*}) }"
-fi
 test -n "$SEPARATE_GOTPLT" && SEPARATE_GOTPLT=" "
 CTOR=".ctors        ${CONSTRUCTING-0} : 
   {
@@ -308,9 +282,7 @@ eval $COMBRELOCCAT <<EOF
   ${REL_SBSS2}
   .rel.bss      ${RELOCATING-0} : { *(.rel.bss${RELOCATING+ .rel.bss.* .rel.gnu.linkonce.b.*}) }
   .rela.bss     ${RELOCATING-0} : { *(.rela.bss${RELOCATING+ .rela.bss.* .rela.gnu.linkonce.b.*}) }
-  ${REL_LDATA}
-  ${REL_LBSS}
-  ${REL_LRODATA}
+  ${REL_LARGE}
 EOF
 if [ -n "$COMBRELOC" ]; then
 cat <<EOF
@@ -451,8 +423,8 @@ cat <<EOF
       pad the .data section.  */
    ${RELOCATING+. = ALIGN(. != 0 ? ${ALIGNMENT} : 1);}
   }
-  ${LBSS}
-  ${OTHER_BSS_SECTIONS}
+  ${RELOCATING+${OTHER_BSS_END_SYMBOLS}}
+  ${RELOCATING+. = ALIGN(${ALIGNMENT});}
   ${LARGE_SECTIONS}
   ${RELOCATING+. = ALIGN(${ALIGNMENT});}
   ${RELOCATING+${OTHER_END_SYMBOLS}}
@@ -503,7 +475,7 @@ cat <<EOF
 
   ${STACK_ADDR+${STACK}}
   ${OTHER_SECTIONS}
-  ${RELOCATING+${OTHER_END_SYMBOLS}}
+  ${RELOCATING+${OTHER_SYMBOLS}}
   ${RELOCATING+${STACKNOTE}}
 }
 EOF
index 7f177c974ddbc66dd08bd09a0899dd440cc30f84..1f87c2add6289091eef823928fd98004d9f97e42 100644 (file)
@@ -8,7 +8,6 @@
 #      OTHER_TEXT_SECTIONS - these get put in .text when relocating
 #      OTHER_READWRITE_SECTIONS - other than .data .bss .ctors .sdata ...
 #              (e.g., .PARISC.global)
-#      OTHER_BSS_SECTIONS - other than .bss .sbss ...
 #      OTHER_SECTIONS - at the end
 #      EXECUTABLE_SYMBOLS - symbols that must be defined for an
 #              executable (e.g., _DYNAMIC_LINK)
@@ -34,7 +33,7 @@
 #      FINI_START, FINI_END - statements just before and just after
 #      combination of .fini sections.
 #      STACK_ADDR - start of a .stack section.
-#      OTHER_END_SYMBOLS - symbols to place right at the end of the script.
+#      OTHER_SYMBOLS - symbols to place right at the end of the script.
 #
 # When adding sections, do note that the names of some sections are used
 # when specifying the start address of the next.
@@ -257,10 +256,10 @@ SECTIONS
       .bss section disappears because there are no input sections.  */
    ${RELOCATING+. = ALIGN(${ALIGNMENT});}
   } :data
-  ${OTHER_BSS_SECTIONS}
+  ${RELOCATING+${OTHER_BSS_END_SYMBOLS}}
   ${RELOCATING+. = ALIGN(${ALIGNMENT});}
-  ${RELOCATING+_end = .;}
   ${RELOCATING+${OTHER_END_SYMBOLS}}
+  ${RELOCATING+_end = .;}
   ${RELOCATING+PROVIDE (end = .);}
   ${RELOCATING+${DATA_SEGMENT_END}}
 
@@ -371,7 +370,7 @@ cat <<EOF
 
   ${STACK_ADDR+${STACK}}
   ${OTHER_SECTIONS}
-  ${RELOCATING+${OTHER_END_SYMBOLS}}
+  ${RELOCATING+${OTHER_SYMBOLS}}
   ${RELOCATING+${STACKNOTE}}
 }
 EOF
index 11e7291183d5974dbda455700ed39f4d04c0745e..10abf4a0de4d77d1a301b0307e935e6a19d0b409 100644 (file)
@@ -10,7 +10,6 @@
 #      OTHER_TEXT_SECTIONS - these get put in .text when relocating
 #      OTHER_READWRITE_SECTIONS - other than .data .bss .ctors .sdata ...
 #              (e.g., .PARISC.global)
-#      OTHER_BSS_SECTIONS - other than .bss .sbss ...
 #      OTHER_SECTIONS - at the end
 #      EXECUTABLE_SYMBOLS - symbols that must be defined for an
 #              executable (e.g., _DYNAMIC_LINK)
@@ -36,7 +35,7 @@
 #      FINI_START, FINI_END - statements just before and just after
 #      combination of .fini sections.
 #      STACK_ADDR - start of a .stack section.
-#      OTHER_END_SYMBOLS - symbols to place right at the end of the script.
+#      OTHER_SYMBOLS - symbols to place right at the end of the script.
 #
 # When adding sections, do note that the names of some sections are used
 # when specifying the start address of the next.
@@ -298,10 +297,10 @@ cat <<EOF
       .bss section disappears because there are no input sections.  */
    ${RELOCATING+. = ALIGN(${ALIGNMENT});}
   }
-  ${OTHER_BSS_SECTIONS}
+  ${RELOCATING+${OTHER_BSS_END_SYMBOLS}}
   ${RELOCATING+. = ALIGN(${ALIGNMENT});}
-  ${RELOCATING+_end = .;}
   ${RELOCATING+${OTHER_END_SYMBOLS}}
+  ${RELOCATING+_end = .;}
   ${RELOCATING+PROVIDE (end = .);}
 
   /* Stabs debugging sections.  */
@@ -349,6 +348,6 @@ cat <<EOF
 
   ${STACK_ADDR+${STACK}}
   ${OTHER_SECTIONS}
-  ${RELOCATING+${OTHER_END_SYMBOLS}}
+  ${RELOCATING+${OTHER_SYMBOLS}}
 }
 EOF
index 6b594c6395c4b3aa4cb6581cee16e2f168920d27..1d8984fa0c26997ad5e2364692c88a9b4bc9fef7 100644 (file)
@@ -14,7 +14,6 @@
 #              (e.g., .PARISC.global)
 #      OTHER_RELRO_SECTIONS - other than .data.rel.ro ...
 #              (e.g. PPC32 .fixup, .got[12])
-#      OTHER_BSS_SECTIONS - other than .bss .sbss ...
 #      OTHER_SECTIONS - at the end
 #      EXECUTABLE_SYMBOLS - symbols that must be defined for an
 #              executable (e.g., _DYNAMIC_LINK)
@@ -46,7 +45,7 @@
 #      FINI_START, FINI_END - statements just before and just after
 #      combination of .fini sections.
 #      STACK_ADDR - start of a .stack section.
-#      OTHER_END_SYMBOLS - symbols to place right at the end of the script.
+#      OTHER_SYMBOLS - symbols to place right at the end of the script.
 #      ETEXT_NAME - name of a symbol for the end of the text section,
 #              normally etext.
 #      SEPARATE_GOTPLT - if set, .got.plt should be separate output section,
@@ -404,10 +403,10 @@ cat <<EOF
       .bss section disappears because there are no input sections.  */
    ${RELOCATING+. = ALIGN(${ALIGNMENT});}
   }
-  ${OTHER_BSS_SECTIONS}
+  ${RELOCATING+${OTHER_BSS_END_SYMBOLS}}
   ${RELOCATING+. = ALIGN(${ALIGNMENT});}
-  ${RELOCATING+_end = .;}
   ${RELOCATING+${OTHER_END_SYMBOLS}}
+  ${RELOCATING+_end = .;}
   ${RELOCATING+PROVIDE (end = .);}
   ${RELOCATING+${DATA_SEGMENT_END}}
 
@@ -454,7 +453,7 @@ cat <<EOF
 
   ${STACK_ADDR+${STACK}}
   ${OTHER_SECTIONS}
-  ${RELOCATING+${OTHER_END_SYMBOLS}}
+  ${RELOCATING+${OTHER_SYMBOLS}}
   ${RELOCATING+${STACKNOTE}}
 }
 EOF
index ddff5ffcf571479f891545b24c39e64fa6fb5019..d158629d6dfb0de39ba91d0e31075bd3b86abbf6 100644 (file)
@@ -8,7 +8,6 @@
 #      OTHER_TEXT_SECTIONS - these get put in .text when relocating
 #      OTHER_READWRITE_SECTIONS - other than .data .bss .ctors .sdata ...
 #              (e.g., .PARISC.global)
-#      OTHER_BSS_SECTIONS - other than .bss .sbss ...
 #      OTHER_SECTIONS - at the end
 #      EXECUTABLE_SYMBOLS - symbols that must be defined for an
 #              executable (e.g., _DYNAMIC_LINK)
@@ -388,10 +387,10 @@ cat <<EOF
       .bss section disappears because there are no input sections.  */
    ${RELOCATING+. = ALIGN(${ALIGNMENT});}
   }
-  ${RELOCATING+${OTHER_BSS_SECTIONS}}
+  ${RELOCATING+${OTHER_BSS_END_SYMBOLS}}
   ${RELOCATING+. = ALIGN(${ALIGNMENT});}
-  ${RELOCATING+_end = .;}
   ${RELOCATING+${OTHER_END_SYMBOLS}}
+  ${RELOCATING+_end = .;}
   ${RELOCATING+PROVIDE (end = .);}
 
   /* Stabs debugging sections.  */
index 92a80ab26502f25cea608b7c7b448016cd69c1c5..6b0ab602ae7db945e5baa882d0fa02a4aedb0a5c 100644 (file)
@@ -7,7 +7,6 @@
 #      OTHER_TEXT_SECTIONS - these get put in .text when relocating
 #      OTHER_READWRITE_SECTIONS - other than .data .bss .ctors .sdata ...
 #              (e.g., .PARISC.global)
-#      OTHER_BSS_SECTIONS - other than .bss .sbss ...
 #      OTHER_SECTIONS - at the end
 #      EXECUTABLE_SYMBOLS - symbols that must be defined for an
 #              executable (e.g., _DYNAMIC_LINK)
@@ -144,11 +143,11 @@ SECTIONS
       .bss section disappears because there are no input sections.  */
    ${RELOCATING+. = ALIGN(${ALIGNMENT});}
   } > RAM
-  ${RELOCATING+${OTHER_BSS_SECTIONS}}
+  ${RELOCATING+${OTHER_BSS_END_SYMBOLS}}
   ${RELOCATING+. = ALIGN(${ALIGNMENT});}
+  ${RELOCATING+${OTHER_END_SYMBOLS}}
   ${RELOCATING+_end = .;}
   ${RELOCATING+__stack = .;}
-  ${RELOCATING+${OTHER_END_SYMBOLS}}
   ${RELOCATING+PROVIDE (end = .);}
 
   /* Read-only sections in ROM.  */