Backport from mainline:

	2011-02-18  John David Anglin  <dave.anglin@nrc-cnnrc.gc.ca>

	PR ld/12376
	emulparams/hppalinux.sh (DATA_ADDR): Define.
	(SHLIB_DATA_ADDR): Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index e5e42051bea707cfb2e853cb8ab21b9658e1b2cf..a6b952ec671c696419416d1c660a517965ad5bcd 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-13  John David Anglin  <dave.anglin@nrc-cnnrc.gc.ca>
+
+       Backport from mainline:
+       2011-02-18  John David Anglin  <dave.anglin@nrc-cnnrc.gc.ca>
+
+       PR ld/12376
+       emulparams/hppalinux.sh (DATA_ADDR): Define.
+       (SHLIB_DATA_ADDR): Likewise.
+
 2011-02-14  Alan Modra  <amodra@gmail.com>
 
        * ldmain.c (remove_output): Rename to..

diff --git a/ld/emulparams/hppalinux.sh b/ld/emulparams/hppalinux.sh
index 9fa461515003574083aae0f38ade3e0348a37ed9..d7d87e2d3ad8ecbb179fa575fb24fee3a65d05dc 100644 (file)
--- a/ld/emulparams/hppalinux.sh
+++ b/ld/emulparams/hppalinux.sh
@@ -8,6 +8,8 @@ NO_REL_RELOCS=yes
 TEXT_START_ADDR=0x10000
 TARGET_PAGE_SIZE=0x10000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
+DATA_ADDR="ALIGN(${MAXPAGESIZE})"
+SHLIB_DATA_ADDR="ALIGN(${MAXPAGESIZE})"
 ARCH=hppa
 MACHINE=hppa1.1    # We use 1.1 specific features.
 NOP=0x08000240