[PATCH 490] M68k: don't emit empty stack program header in vmlinux

[Geert Uytterhoeven]

M68k: Recent versions of ld add an empty stack program header to the kernel
image, which makes it incompatible with current m68k bootstrap loaders.
Modify the linker script to make sure we see only the program headers that are
really needed. (from Roman Zippel)

Signed-off-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>

--- linux-2.6.9-rc3/arch/m68k/kernel/vmlinux-std.lds	2004-05-24 11:13:22.000000000 +0200
+++ linux-m68k-2.6.9-rc3/arch/m68k/kernel/vmlinux-std.lds	2004-08-30 21:26:50.000000000 +0200
@@ -15,7 +15,7 @@ SECTIONS
 	SCHED_TEXT
 	*(.fixup)
 	*(.gnu.warning)
-	} = 0x4e75
+	} :text = 0x4e75
 
   . = ALIGN(16);		/* Exception table */
   __start___ex_table = .;
@@ -34,7 +34,7 @@ SECTIONS
   .bss : { *(.bss) }		/* BSS */
 
   . = ALIGN(16);
-  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
+  .data.cacheline_aligned : { *(.data.cacheline_aligned) } :data
 
   _edata = .;			/* End of data section */
 
--- linux-2.6.9-rc3/arch/m68k/kernel/vmlinux.lds.S	2004-04-27 20:21:23.000000000 +0200
+++ linux-m68k-2.6.9-rc3/arch/m68k/kernel/vmlinux.lds.S	2004-08-30 21:26:50.000000000 +0200
@@ -1,5 +1,9 @@
 #include <linux/config.h>
-
+PHDRS
+{
+  text PT_LOAD FILEHDR PHDRS FLAGS (7);
+  data PT_LOAD FLAGS (7);
+}
 #ifdef CONFIG_SUN3
 #include "vmlinux-sun3.lds"
 #else

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/