From: Dave Anglin <dave.anglin@nrc.ca>
Date: Mon, 14 Mar 2011 02:35:08 +0000 (+0000)
Subject: 	Backport from mainline:
X-Git-Tag: binutils-2_21_1~152
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bdd732dedb05f715d2389a826c039043da053b47;p=thirdparty%2Fbinutils-gdb.git

	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 e5e42051bea..a6b952ec671 100644
--- 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 9fa46151500..d7d87e2d3ad 100644
--- 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