From 1bc214bab3b406fa9e8d510bad40bc6658c5c378 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 26 Oct 2006 00:31:59 +0000
Subject: [PATCH] 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.
---
 ld/ChangeLog                 | 7 +++++++
 ld/emulparams/hppa64linux.sh | 2 +-
 ld/scripttempl/elf.sc        | 6 ++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 55ab937..b36ed3b 100644
--- 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 5ab4f4b..1af8e37 100644
--- 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 9a2d8b8..8cc19a5 100644
--- 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.*})
-- 
2.7.4