From 1587442d37ee4266e54d59bfdc783574f0587aff Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 24 Apr 2017 09:37:10 -0700 Subject: [PATCH] i386: Set ELF_MAXPAGESIZE to 0x1000 for VxWorks commit a27e437177412e5b52999723f3c5d5d0d37b9087 Author: Roland McGrath 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. --- 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 0288046..6b969d6 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,8 @@ +2017-04-24 H.J. Lu + + PR ld/21425 + * elf32-i386.c (ELF_MAXPAGESIZE): Set to 0x1000 for VxWorks. + 2017-04-23 Alan Modra PR 21414 diff --git a/bfd/elf32-i386.c b/bfd/elf32-i386.c index 9e71974..83f3b11 100644 --- a/bfd/elf32-i386.c +++ b/bfd/elf32-i386.c @@ -6680,6 +6680,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 9ab31fa..07afee4 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,8 @@ +2017-04-24 H.J. Lu + + PR ld/20815 + * testsuite/ld-i386/vxworks2.sd: Add space for program headers. + 2017-04-24 Jose E. Marchesi * testsuite/ld-sparc/tlssunbin64.dd: Expect `return' instructions 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 .* -- 2.7.4