This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
PATCH: PR ld/10569: -z max-page-size may not work for linker scripts
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: binutils at sources dot redhat dot com
- Date: Thu, 27 Aug 2009 17:02:33 -0700
- Subject: PATCH: PR ld/10569: -z max-page-size may not work for linker scripts
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
When a linker script change output target with
OUTPUT_FORMAT("elf32-i386")
and elf32-i386 isn't the default target, -z max-page-size won't work
correctly.
Here is a patch with 2 testcases. OK to install?
Thanks.
H.J.
----
ld/
2009-08-27 H.J. Lu <hongjiu.lu@intel.com>
PR ld/10569
* ldlang.c (lang_add_output_format): Call
bfd_emul_set_maxpagesize/bfd_emul_set_commonpagesize if
maximum/common page sizes are specified and output target
isn't the same as default target.
ld/testsuite
2009-08-27 H.J. Lu <hongjiu.lu@intel.com>
PR ld/10569
* ld-elf/commonpage2.d: New.
* ld-elf/maxpage4.d: Likewise.
* ld-elf/maxpage4.t: Likewise.
Index: ld/testsuite/ld-elf/maxpage4.d
===================================================================
--- ld/testsuite/ld-elf/maxpage4.d (revision 0)
+++ ld/testsuite/ld-elf/maxpage4.d (revision 0)
@@ -0,0 +1,9 @@
+#source: maxpage1.s
+#as: --32
+#ld: -z max-page-size=0x200000 -T maxpage4.t
+#readelf: -l --wide
+#target: x86_64-*-linux*
+
+#...
+ LOAD+.*0x200000
+#pass
Index: ld/testsuite/ld-elf/maxpage4.t
===================================================================
--- ld/testsuite/ld-elf/maxpage4.t (revision 0)
+++ ld/testsuite/ld-elf/maxpage4.t (revision 0)
@@ -0,0 +1,9 @@
+OUTPUT_FORMAT("elf32-i386")
+OUTPUT_ARCH(i386)
+ENTRY(_start)
+SECTIONS
+{
+ .text : {*(.text)}
+ .data : {*(.data)}
+ /DISCARD/ : {*(*)}
+}
Index: ld/testsuite/ld-elf/commonpage2.d
===================================================================
--- ld/testsuite/ld-elf/commonpage2.d (revision 0)
+++ ld/testsuite/ld-elf/commonpage2.d (revision 0)
@@ -0,0 +1,9 @@
+#source: maxpage1.s
+#as: --32
+#ld: -z max-page-size=0x200000 -z common-page-size=0x100000 -T maxpage4.t
+#readelf: -l --wide
+#target: x86_64-*-linux*
+
+#...
+ LOAD+.*0x200000
+#pass
Index: ld/ldlang.c
===================================================================
--- ld/ldlang.c (revision 6600)
+++ ld/ldlang.c (working copy)
@@ -6708,6 +6708,20 @@ lang_add_output_format (const char *form
format = little;
output_target = format;
+
+ /* If maximum/common page sizes are specified, we may need to
+ set them for OUTPUT_TARGET. */
+ if ((config.maxpagesize != 0 || config.commonpagesize != 0)
+ && strcmp (output_target, default_target) != 0)
+ {
+ if (config.maxpagesize != 0)
+ bfd_emul_set_maxpagesize (output_target,
+ config.maxpagesize);
+
+ if (config.commonpagesize != 0)
+ bfd_emul_set_commonpagesize (output_target,
+ config.commonpagesize);
+ }
}
}