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 --git a/bfd/ChangeLog b/bfd/ChangeLog
index 386b4800c029bf80264cfeff6da536e12278cf04..00875637e9e68ccbda3a6bbab2415b8fd62df4a7 100644 (file)
--- 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 24beba3e1d5fef9d48d174c001c4b30edc458571..f570253ee3ddba7b657507e08650183be12cd3cc 100644 (file)
--- 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 6e0b987fd931500b775a18502844ee20f3c746b2..682ac6cdb53fd0ab626f6920c1f86ca81fd4d8e4 100644 (file)
--- 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 5ff87d3bef81d14e73d9a80f8ef1bb79c58cd05e..4f56f2ac7ec1b98b2394fffadafb44977016ddcd 100644 (file)
--- 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 .*