This is the mail archive of the
binutils-cvs@sourceware.org
mailing list for the binutils project.
[binutils-gdb/binutils-2_28-branch] i386: Set ELF_MAXPAGESIZE to 0x1000 for VxWorks
- From: H.J.Lu <hjl at sourceware dot org>
- To: bfd-cvs at sourceware dot org
- Date: 24 Apr 2017 16:54:39 -0000
- Subject: [binutils-gdb/binutils-2_28-branch] i386: Set ELF_MAXPAGESIZE to 0x1000 for VxWorks
https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=cff08d0aa476af2142f60ebf78412b0b7ba61eb3
commit cff08d0aa476af2142f60ebf78412b0b7ba61eb3
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Mon Apr 24 09:37:10 2017 -0700
i386: Set ELF_MAXPAGESIZE to 0x1000 for VxWorks
commit a27e437177412e5b52999723f3c5d5d0d37b9087
Author: Roland McGrath <roland@gnu.org>
Date: Thu Jul 28 22:35:15 2011 +0000
BFD vector for elf32-i386-nacl:
changed ELF_MAXPAGESIZE to 0x10000 for VxWorks. This patch fixes it
and updated testsuite/ld-i386/vxworks2.sd to add space for program
headers.
bfd/
PR ld/21425
* elf32-i386.c (ELF_MAXPAGESIZE): Set to 0x1000 for VxWorks.
ld/
PR ld/20815
* testsuite/ld-i386/vxworks2.sd: Add space for program headers.
(cherry picked from commit 1587442d37ee4266e54d59bfdc783574f0587aff)
Diff:
---
bfd/ChangeLog | 5 +++++
bfd/elf32-i386.c | 2 ++
ld/ChangeLog | 5 +++++
ld/testsuite/ld-i386/vxworks2.sd | 2 +-
4 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 386b480..0087563 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-24 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/21425
+ * elf32-i386.c (ELF_MAXPAGESIZE): Set to 0x1000 for VxWorks.
+
2017-03-28 Hans-Peter Nilsson <hp@axis.com>
PR ld/16044
diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c
index 24beba3..f570253 100644
--- a/bfd/elf32-i386.c
+++ b/bfd/elf32-i386.c
@@ -6576,6 +6576,8 @@ elf32_i386_nacl_elf_object_p (bfd *abfd)
#undef TARGET_LITTLE_NAME
#define TARGET_LITTLE_NAME "elf32-i386-vxworks"
#undef ELF_OSABI
+#undef ELF_MAXPAGESIZE
+#define ELF_MAXPAGESIZE 0x1000
#undef elf_backend_plt_alignment
#define elf_backend_plt_alignment 4
diff --git a/ld/ChangeLog b/ld/ChangeLog
index 6e0b987..682ac6c 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-24 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR ld/20815
+ * testsuite/ld-i386/vxworks2.sd: Add space for program headers.
+
2017-03-28 Hans-Peter Nilsson <hp@axis.com>
PR ld/16044
diff --git a/ld/testsuite/ld-i386/vxworks2.sd b/ld/testsuite/ld-i386/vxworks2.sd
index 5ff87d3..4f56f2a 100644
--- a/ld/testsuite/ld-i386/vxworks2.sd
+++ b/ld/testsuite/ld-i386/vxworks2.sd
@@ -6,7 +6,7 @@ Program Headers:
Type .*
PHDR .*
#...
- LOAD .* 0x00080000 0x00080000 .* R E 0x1000
+ LOAD .* 0x0007f000 0x0007f000 .* R E 0x1000
LOAD .* 0x00081000 0x00081000 .* RW 0x1000
DYNAMIC .*