1 files changed, 56 insertions, 139 deletions
diff --git a/arch/mips/boot/compressed/ld.script b/arch/mips/boot/compressed/ld.script
index 29e9f4c0d5d8..613a35b02f50 100644
--- a/arch/mips/boot/compressed/ld.script
+++ b/arch/mips/boot/compressed/ld.script
@@ -1,150 +1,67 @@
+/*
+ * ld.script for compressed kernel support of MIPS
+ *
+ * Copyright (C) 2009 Lemote Inc.
+ * Author: Wu Zhangjin <wuzj@lemote.com>
+ */
 OUTPUT_ARCH(mips)
 ENTRY(start)
 SECTIONS
 {
-  /* Read-only sections, merged into text segment: */
+        /* . = VMLINUZ_LOAD_ADDRESS */
-  .init          : { *(.init)           } =0
+        /* read-only */
-  .text      :
+        _text = .;      /* Text and read-only data */
-  {
+        .text   : {
-    _ftext = . ;
+                _ftext = . ;
-    *(.text)
+                *(.text)
-    *(.rodata)
+                *(.rodata)
-    *(.rodata1)
+        } = 0
-    /* .gnu.warning sections are handled specially by elf32.em.  */
+        _etext = .;     /* End of text section */
-    *(.gnu.warning)
-  } =0
-  .kstrtab : { *(.kstrtab) }
-  . = ALIGN(16);                /* Exception table */
-  __start___ex_table = .;
-  __ex_table : { *(__ex_table) }
-  __stop___ex_table = .;
-  __start___dbe_table = .;      /* Exception table for data bus errors */
-  __dbe_table : { *(__dbe_table) }
-  __stop___dbe_table = .;
-  __start___ksymtab = .;        /* Kernel symbol table */
-  __ksymtab : { *(__ksymtab) }
-  __stop___ksymtab = .;
-  _etext = .;
-  . = ALIGN(8192);
-  .data.init_task : { *(.data.init_task) }
-  /* Startup code */
-  . = ALIGN(4096);
-  __init_begin = .;
-  .text.init : { *(.text.init) }
-  .data.init : { *(.data.init) }
-  . = ALIGN(16);
-  __setup_start = .;
-  .setup.init : { *(.setup.init) }
-  __setup_end = .;
-  __initcall_start = .;
-  .initcall.init : { *(.initcall.init) }
-  __initcall_end = .;
-  . = ALIGN(4096);      /* Align double page for init_task_union */
-  __init_end = .;
-  . = ALIGN(4096);
-  .data.page_aligned : { *(.data.idt) }
-  . = ALIGN(32);
-  .data.cacheline_aligned : { *(.data.cacheline_aligned) }
-  .fini      : { *(.fini)    } =0
+        /* writable */
-  .reginfo : { *(.reginfo) }
+        .data   : {     /* Data */
-  /* Adjust the address for the data segment.  We want to adjust up to
+                _fdata = . ;
-     the same address within the page on the next page up.  It would
+                *(.data)
-     be more correct to do this:
+                /* Put the compressed image here, so bss is on the end. */
-       . = .;
+                __image_begin = .;
-     The current expression does not correctly handle the case of a
+                *(.image)
-     text segment ending precisely at the end of a page; it causes the
+                __image_end = .;
-     data segment to skip a page.  The above expression does not have
+                CONSTRUCTORS
-     this problem, but it will currently (2/95) cause BFD to allocate
+        }
-     a single segment, combining both text and data, for this case.
+        .sdata  : { *(.sdata) }
-     This will prevent the text segment from being shared among
+        . = ALIGN(4);
-     multiple executions of the program; I think that is more
+        _edata  =  .;   /* End of data section */
-     important than losing a page of the virtual address space (note
-     that no actual memory is lost; the page which is skipped can not
-     be referenced).  */
-  . = .;
-  .data    :
-  {
-    _fdata = . ;
-    *(.data)
-   /* Put the compressed image here, so bss is on the end. */
+        /* BSS */
-   __image_begin = .;
+        __bss_start = .;
-   *(.image)
+        _fbss = .;
-   __image_end = .;
+        .sbss   : { *(.sbss) *(.scommon) }
-   /* Align the initial ramdisk image (INITRD) on page boundaries. */
+        .bss    : {
-   . = ALIGN(4096);
+                *(.dynbss)
-   __ramdisk_begin = .;
+                *(.bss)
-   *(.initrd)
+                *(COMMON)
-   __ramdisk_end = .;
+        }
-   . = ALIGN(4096);
+        .  = ALIGN(4);
+        _end = . ;
-    CONSTRUCTORS
+        /* These are needed for ELF backends which have not yet been converted
-  }
+         * to the new style linker.  */
-  .data1   : { *(.data1) }
-  _gp = . + 0x8000;
-  .lit8 : { *(.lit8) }
-  .lit4 : { *(.lit4) }
-  .ctors         : { *(.ctors)   }
-  .dtors         : { *(.dtors)   }
-  .got           : { *(.got.plt) *(.got) }
-  .dynamic       : { *(.dynamic) }
-  /* We want the small data sections together, so single-instruction offsets
-     can access them all, and initialized data all before uninitialized, so
-     we can shorten the on-disk segment size.  */
-  .sdata     : { *(.sdata) }
-  . = ALIGN(4);
-  _edata  =  .;
-  PROVIDE (edata = .);
-  __bss_start = .;
+        .stab 0 : { *(.stab) }
-  _fbss = .;
+        .stabstr 0 : { *(.stabstr) }
-  .sbss      : { *(.sbss) *(.scommon) }
-  .bss       :
-  {
-   *(.dynbss)
-   *(.bss)
-   *(COMMON)
-   .  = ALIGN(4);
-  _end = . ;
-  PROVIDE (end = .);
-  }
-  /* Sections to be discarded */
+        /* These must appear regardless of  .  */
-  /DISCARD/ :
+        .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
-  {
+        .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
-        *(.text.exit)
-        *(.data.exit)
-        *(.exitcall.exit)
-  }
-  /* This is the MIPS specific mdebug section.  */
+        /* Sections to be discarded */
-  .mdebug : { *(.mdebug) }
+        /DISCARD/       : {
-  /* These are needed for ELF backends which have not yet been
+                *(.MIPS.options)
-     converted to the new style linker.  */
+                *(.options)
-  .stab 0 : { *(.stab) }
+                *(.pdr)
-  .stabstr 0 : { *(.stabstr) }
+                *(.reginfo)
-  /* DWARF debug sections.
+                *(.comment)
-     Symbols in the .debug DWARF section are relative to the beginning of the
+                *(.note)
-     section so we begin .debug at 0.  It's not clear yet what needs to happen
+        }
-     for the others.   */
-  .debug          0 : { *(.debug) }
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  .line           0 : { *(.line) }
-  /* These must appear regardless of  .  */
-  .gptab.sdata : { *(.gptab.data) *(.gptab.sdata) }
-  .gptab.sbss : { *(.gptab.bss) *(.gptab.sbss) }
-  .comment : { *(.comment) }
-  .note : { *(.note) }
 }

diff --git a/arch/mips/boot/compressed/ld.script b/arch/mips/boot/compressed/ld.script index 29e9f4c0d5d8..613a35b02f50 100644 --- a/arch/mips/boot/compressed/ld.script +++ b/arch/mips/boot/compressed/ld.script
@@ -1,150 +1,67 @@
		1	/*
		2	* ld.script for compressed kernel support of MIPS
		3	*
		4	* Copyright (C) 2009 Lemote Inc.
		5	* Author: Wu Zhangjin <wuzj@lemote.com>
		6	*/
		7
1	OUTPUT_ARCH(mips)	8	OUTPUT_ARCH(mips)
2	ENTRY(start)	9	ENTRY(start)
3	SECTIONS	10	SECTIONS
4	{	11	{
5	/* Read-only sections, merged into text segment: */	12	/* . = VMLINUZ_LOAD_ADDRESS */
6	.init : { *(.init) } =0	13	/* read-only */
7	.text :	14	_text = .; /* Text and read-only data */
8	{	15	.text : {
9	_ftext = . ;	16	_ftext = . ;
10	*(.text)	17	*(.text)
11	*(.rodata)	18	*(.rodata)
12	*(.rodata1)	19	} = 0
13	/* .gnu.warning sections are handled specially by elf32.em. */	20	_etext = .; /* End of text section */
14	*(.gnu.warning)
15	} =0
16	.kstrtab : { *(.kstrtab) }
17
18	. = ALIGN(16); /* Exception table */
19	__start___ex_table = .;
20	__ex_table : { *(__ex_table) }
21	__stop___ex_table = .;
22
23	__start___dbe_table = .; /* Exception table for data bus errors */
24	__dbe_table : { *(__dbe_table) }
25	__stop___dbe_table = .;
26
27	__start___ksymtab = .; /* Kernel symbol table */
28	__ksymtab : { *(__ksymtab) }
29	__stop___ksymtab = .;
30
31	_etext = .;
32
33	. = ALIGN(8192);
34	.data.init_task : { *(.data.init_task) }
35
36	/* Startup code */
37	. = ALIGN(4096);
38	__init_begin = .;
39	.text.init : { *(.text.init) }
40	.data.init : { *(.data.init) }
41	. = ALIGN(16);
42	__setup_start = .;
43	.setup.init : { *(.setup.init) }
44	__setup_end = .;
45	__initcall_start = .;
46	.initcall.init : { *(.initcall.init) }
47	__initcall_end = .;
48	. = ALIGN(4096); /* Align double page for init_task_union */
49	__init_end = .;
50
51	. = ALIGN(4096);
52	.data.page_aligned : { *(.data.idt) }
53
54	. = ALIGN(32);
55	.data.cacheline_aligned : { *(.data.cacheline_aligned) }
56		21
57	.fini : { *(.fini) } =0	22	/* writable */
58	.reginfo : { *(.reginfo) }	23	.data : { /* Data */
59	/* Adjust the address for the data segment. We want to adjust up to	24	_fdata = . ;
60	the same address within the page on the next page up. It would	25	*(.data)
61	be more correct to do this:	26	/* Put the compressed image here, so bss is on the end. */
62	. = .;	27	__image_begin = .;
63	The current expression does not correctly handle the case of a	28	*(.image)
64	text segment ending precisely at the end of a page; it causes the	29	__image_end = .;
65	data segment to skip a page. The above expression does not have	30	CONSTRUCTORS
66	this problem, but it will currently (2/95) cause BFD to allocate	31	}
67	a single segment, combining both text and data, for this case.	32	.sdata : { *(.sdata) }
68	This will prevent the text segment from being shared among	33	. = ALIGN(4);
69	multiple executions of the program; I think that is more	34	_edata = .; /* End of data section */
70	important than losing a page of the virtual address space (note
71	that no actual memory is lost; the page which is skipped can not
72	be referenced). */
73	. = .;
74	.data :
75	{
76	_fdata = . ;
77	*(.data)
78		35
79	/* Put the compressed image here, so bss is on the end. */	36	/* BSS */
80	__image_begin = .;	37	__bss_start = .;
81	*(.image)	38	_fbss = .;
82	__image_end = .;	39	.sbss : { (.sbss) (.scommon) }
83	/* Align the initial ramdisk image (INITRD) on page boundaries. */	40	.bss : {
84	. = ALIGN(4096);	41	*(.dynbss)
85	__ramdisk_begin = .;	42	*(.bss)
86	*(.initrd)	43	*(COMMON)
87	__ramdisk_end = .;	44	}
88	. = ALIGN(4096);	45	. = ALIGN(4);
		46	_end = . ;
89		47
90	CONSTRUCTORS	48	/* These are needed for ELF backends which have not yet been converted
91	}	49	* to the new style linker. */
92	.data1 : { *(.data1) }
93	_gp = . + 0x8000;
94	.lit8 : { *(.lit8) }
95	.lit4 : { *(.lit4) }
96	.ctors : { *(.ctors) }
97	.dtors : { *(.dtors) }
98	.got : { (.got.plt) (.got) }
99	.dynamic : { *(.dynamic) }
100	/* We want the small data sections together, so single-instruction offsets
101	can access them all, and initialized data all before uninitialized, so
102	we can shorten the on-disk segment size. */
103	.sdata : { *(.sdata) }
104	. = ALIGN(4);
105	_edata = .;
106	PROVIDE (edata = .);
107		50
108	__bss_start = .;	51	.stab 0 : { *(.stab) }
109	_fbss = .;	52	.stabstr 0 : { *(.stabstr) }
110	.sbss : { (.sbss) (.scommon) }
111	.bss :
112	{
113	*(.dynbss)
114	*(.bss)
115	*(COMMON)
116	. = ALIGN(4);
117	_end = . ;
118	PROVIDE (end = .);
119	}
120		53
121	/* Sections to be discarded */	54	/* These must appear regardless of . */
122	/DISCARD/ :	55	.gptab.sdata : { (.gptab.data) (.gptab.sdata) }
123	{	56	.gptab.sbss : { (.gptab.bss) (.gptab.sbss) }
124	*(.text.exit)
125	*(.data.exit)
126	*(.exitcall.exit)
127	}
128		57
129	/* This is the MIPS specific mdebug section. */	58	/* Sections to be discarded */
130	.mdebug : { *(.mdebug) }	59	/DISCARD/ : {
131	/* These are needed for ELF backends which have not yet been	60	*(.MIPS.options)
132	converted to the new style linker. */	61	*(.options)
133	.stab 0 : { *(.stab) }	62	*(.pdr)
134	.stabstr 0 : { *(.stabstr) }	63	*(.reginfo)
135	/* DWARF debug sections.	64	*(.comment)
136	Symbols in the .debug DWARF section are relative to the beginning of the	65	*(.note)
137	section so we begin .debug at 0. It's not clear yet what needs to happen	66	}
138	for the others. */
139	.debug 0 : { *(.debug) }
140	.debug_srcinfo 0 : { *(.debug_srcinfo) }
141	.debug_aranges 0 : { *(.debug_aranges) }
142	.debug_pubnames 0 : { *(.debug_pubnames) }
143	.debug_sfnames 0 : { *(.debug_sfnames) }
144	.line 0 : { *(.line) }
145	/* These must appear regardless of . */
146	.gptab.sdata : { (.gptab.data) (.gptab.sdata) }
147	.gptab.sbss : { (.gptab.bss) (.gptab.sbss) }
148	.comment : { *(.comment) }
149	.note : { *(.note) }
150	}	67	}