2006-10-25 H.J. Lu <hongjiu.lu@intel.com>

	* emulparams/hppa64linux.sh (LARGE_SECTIONS): Renamed to ...
	(OTHER_BSS_SECTIONS): This.
	* scripttempl/elf.sc (OTHER_BSS_SECTIONS): Support LARGE_SECTIONS.
	(LARGE_SECTIONS): Move .lbss sections to OTHER_BSS_SECTIONS.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 55ab9373d0f7291b7f3e367025980d1804110ac6..b36ed3b6db463818e4a2b864332f15c95c4dc29d 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2006-10-25  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * emulparams/hppa64linux.sh (LARGE_SECTIONS): Renamed to ...
+       (OTHER_BSS_SECTIONS): This.
+       * scripttempl/elf.sc (OTHER_BSS_SECTIONS): Support LARGE_SECTIONS.
+       (LARGE_SECTIONS): Move .lbss sections to OTHER_BSS_SECTIONS.
+
 2006-10-25  Alan Modra  <amodra@bigpond.net.au>
            Trevor Smigiel  <Trevor_Smigiel@playstation.sony.com>
            Yukishige Shibata  <shibata@rd.scei.sony.co.jp>

diff --git a/ld/emulparams/hppa64linux.sh b/ld/emulparams/hppa64linux.sh
index 5ab4f4bc02c679cdec0fe408322b3a8cbab115a0..1af8e37d376765d7cb2b28f0f411f4dc906c1ee7 100644 (file)
--- a/ld/emulparams/hppa64linux.sh
+++ b/ld/emulparams/hppa64linux.sh
@@ -28,7 +28,7 @@ OTHER_READWRITE_SECTIONS="
   .dlt          ${RELOCATING-0} : { *(.dlt) }"
 
 # The PA64 ELF port has an additional huge bss section.
-LARGE_SECTIONS=".hbss         ${RELOCATING-0} : { *(.hbss) }"
+OTHER_BSS_SECTIONS=".hbss         ${RELOCATING-0} : { *(.hbss) }"
 
 #OTHER_SYMBOLS='PROVIDE (__TLS_SIZE = SIZEOF (.tbss));'
 OTHER_SYMBOLS='

diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
index 9a2d8b84d2fdc22f9ff56eedb3776bb105671f3b..8cc19a544fd50ac938191ff038f375708fad8238 100644 (file)
--- a/ld/scripttempl/elf.sc
+++ b/ld/scripttempl/elf.sc
@@ -177,13 +177,15 @@ test "${LARGE_SECTIONS}" = "yes" && REL_LARGE="
   .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.*}) }"
-test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS="
+test "${LARGE_SECTIONS}" = "yes" && OTHER_BSS_SECTIONS="
+  ${OTHER_BSS_SECTIONS}
   .lbss ${RELOCATING-0} :
   {
     *(.dynlbss)
     *(.lbss${RELOCATING+ .lbss.* .gnu.linkonce.lb.*})
     *(LARGE_COMMON)
-  }
+  }"
+test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS="
   .lrodata ${RELOCATING-0} ${RELOCATING+ALIGN(${MAXPAGESIZE}) + (. & (${MAXPAGESIZE} - 1))} :
   {
     *(.lrodata${RELOCATING+ .lrodata.* .gnu.linkonce.lr.*})