From b604e8a388702df3cd4d3d64cf42dfc361b235c0 Mon Sep 17 00:00:00 2001 From: Piotr Jaroszyński Date: Thu, 1 Jul 2010 03:47:52 +0200 Subject: [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 Modified-by: Michael Brown Signed-off-by: Michael Brown --- src/arch/x86_64/scripts/linux.lds | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/arch/x86_64/scripts') diff --git a/src/arch/x86_64/scripts/linux.lds b/src/arch/x86_64/scripts/linux.lds index ed32b7cf5..85e548ffe 100644 --- a/src/arch/x86_64/scripts/linux.lds +++ b/src/arch/x86_64/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) -- cgit v1.2.3-55-g7522