summaryrefslogtreecommitdiffstats
path: root/src/arch/i386/scripts
diff options
context:
space:
mode:
authorPiotr Jaroszyński2010-07-01 03:47:52 +0200
committerMichael Brown2011-03-27 22:03:05 +0200
commitb604e8a388702df3cd4d3d64cf42dfc361b235c0 (patch)
treed3e581fc9462b3658fb1a2d354794108e85a3086 /src/arch/i386/scripts
parent[image] Remove redundant call to basename() (diff)
downloadipxe-b604e8a388702df3cd4d3d64cf42dfc361b235c0.tar.gz
ipxe-b604e8a388702df3cd4d3d64cf42dfc361b235c0.tar.xz
ipxe-b604e8a388702df3cd4d3d64cf42dfc361b235c0.zip
[linux] Make malloc and linux_umalloc valgrindable
Make the allocators used by malloc and linux_umalloc valgrindable. Include valgrind headers in the codebase to avoid a build dependency on valgrind. Signed-off-by: Piotr Jaroszyński <p.jaroszynski@gmail.com> Modified-by: Michael Brown <mcb30@ipxe.org> Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/arch/i386/scripts')
-rw-r--r--src/arch/i386/scripts/linux.lds7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/arch/i386/scripts/linux.lds b/src/arch/i386/scripts/linux.lds
index 5501d93f..64c9b97f 100644
--- a/src/arch/i386/scripts/linux.lds
+++ b/src/arch/i386/scripts/linux.lds
@@ -42,9 +42,12 @@ SECTIONS {
/*
* The data section
*
+ * Adjust the address for the data segment. We want to adjust up to
+ * the same address within the page on the next page up.
*/
- . = ALIGN ( _max_align );
+ . = ALIGN (CONSTANT (MAXPAGESIZE)) - ((CONSTANT (MAXPAGESIZE) - .) & (CONSTANT (MAXPAGESIZE) - 1));
+ . = DATA_SEGMENT_ALIGN (CONSTANT (MAXPAGESIZE), CONSTANT (COMMONPAGESIZE));
.data : {
_data = .;
*(.data)
@@ -91,8 +94,6 @@ SECTIONS {
*(.comment.*)
*(.note)
*(.note.*)
- *(.eh_frame)
- *(.eh_frame.*)
*(.rel)
*(.rel.*)
*(.discard)