diff options
| author | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2005-01-28 15:39:31 +0000 |
|---|---|---|
| committer | kaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk> | 2005-01-28 15:39:31 +0000 |
| commit | dbb2d95b1d17436180618de305c8d9ac9bf9433e (patch) | |
| tree | d586020ece2ef550ced12bab7dc3524011935b3f | |
| parent | 3c3e0b071ef9556dc2568eb2db4fcdebde37897e (diff) | |
| download | xen-dbb2d95b1d17436180618de305c8d9ac9bf9433e.tar.gz xen-dbb2d95b1d17436180618de305c8d9ac9bf9433e.tar.bz2 xen-dbb2d95b1d17436180618de305c8d9ac9bf9433e.zip | |
bitkeeper revision 1.1159.223.50 (41fa5cb3P9qKPSczsZkXrCrJzdeZAg)
Linker fixes.
| -rw-r--r-- | xen/arch/x86/boot/mkelf32.c | 2 | ||||
| -rw-r--r-- | xen/arch/x86/x86_32/xen.lds | 4 | ||||
| -rw-r--r-- | xen/arch/x86/x86_64/xen.lds | 4 |
3 files changed, 1 insertions, 9 deletions
diff --git a/xen/arch/x86/boot/mkelf32.c b/xen/arch/x86/boot/mkelf32.c index 286a61315a..e16756237b 100644 --- a/xen/arch/x86/boot/mkelf32.c +++ b/xen/arch/x86/boot/mkelf32.c @@ -201,7 +201,7 @@ int main(int argc, char **argv) if ( in32_ehdr.e_phnum != 1 ) { - fprintf(stderr, "Expect precisly 1 program header; found %d.\n", + fprintf(stderr, "Expect precisely 1 program header; found %d.\n", (int)in32_ehdr.e_phnum); return 1; } diff --git a/xen/arch/x86/x86_32/xen.lds b/xen/arch/x86/x86_32/xen.lds index 537ebf15ba..298c9fee4d 100644 --- a/xen/arch/x86/x86_32/xen.lds +++ b/xen/arch/x86/x86_32/xen.lds @@ -64,12 +64,8 @@ SECTIONS __initcall_start = .; .initcall.init : { *(.initcall.init) } :text __initcall_end = .; - . = ALIGN(4096); __init_end = .; - . = ALIGN(4096); - .data.page_aligned : { *(.data.idt) } :text - __bss_start = .; /* BSS */ .bss : { *(.bss) diff --git a/xen/arch/x86/x86_64/xen.lds b/xen/arch/x86/x86_64/xen.lds index 8a6b3a27ac..2bb2d9ed49 100644 --- a/xen/arch/x86/x86_64/xen.lds +++ b/xen/arch/x86/x86_64/xen.lds @@ -62,12 +62,8 @@ SECTIONS __initcall_start = .; .initcall.init : { *(.initcall.init) } :text __initcall_end = .; - . = ALIGN(4096); __init_end = .; - . = ALIGN(4096); - .data.page_aligned : { *(.data.idt) } :text - __bss_start = .; /* BSS */ .bss : { *(.bss) |