Attachment #565452 for bug #662678

Lines 19-24 OUTPUT_FORMAT("elf32-i386", "elf32-i386", "elf32-i386") Link Here

(-)a/efi/i386/syslinux.ld (-16 / +21 lines)
19	OUTPUT_ARCH(i386)	19	OUTPUT_ARCH(i386)
20	ENTRY(_start)	20	ENTRY(_start)
21		21
		22	PHDRS
		23	{
		24	all PT_LOAD ;
		25	}
		26
22	SECTIONS	27	SECTIONS
23	{	28	{
24	. = 0;	29	. = 0;
Lines 31-37 SECTIONS Link Here
31	*(.text)	36	*(.text)
32	(.text.)	37	(.text.)
33	__text_end = .;	38	__text_end = .;
34	}	39	} :all
35		40
36	. = ALIGN(16);	41	. = ALIGN(16);
37		42
Lines 40-46 SECTIONS Link Here
40	*(.rodata)	45	*(.rodata)
41	(.rodata.)	46	(.rodata.)
42	__rodata_end = .;	47	__rodata_end = .;
43	}	48	} :all
44		49
45	. = ALIGN(4);	50	. = ALIGN(4);
46		51
Lines 49-62 SECTIONS Link Here
49	KEEP ((SORT(.ctors.)))	54	KEEP ((SORT(.ctors.)))
50	KEEP (*(.ctors))	55	KEEP (*(.ctors))
51	__ctors_end = .;	56	__ctors_end = .;
52	}	57	} :all
53		58
54	.dtors : {	59	.dtors : {
55	__dtors_start = .;	60	__dtors_start = .;
56	KEEP ((SORT(.dtors.)))	61	KEEP ((SORT(.dtors.)))
57	KEEP (*(.dtors))	62	KEEP (*(.dtors))
58	__dtors_end = .;	63	__dtors_end = .;
59	}	64	} :all
60		65
61	. = ALIGN(4096);	66	. = ALIGN(4096);
62	.rel : {	67	.rel : {
Lines 64-70 SECTIONS Link Here
64	*(.rel.data)	69	*(.rel.data)
65	(.rel.data.)	70	(.rel.data.)
66	*(.rel.ctors)	71	*(.rel.ctors)
67	}	72	} :all
68		73
69	. = ALIGN(4);	74	. = ALIGN(4);
70		75
Lines 72-85 SECTIONS Link Here
72	__gnu_hash_start = .;	77	__gnu_hash_start = .;
73	*(.gnu.hash)	78	*(.gnu.hash)
74	__gnu_hash_end = .;	79	__gnu_hash_end = .;
75	}	80	} :all
76		81
77		82
78	.dynsym : {	83	.dynsym : {
79	__dynsym_start = .;	84	__dynsym_start = .;
80	*(.dynsym)	85	*(.dynsym)
81	__dynsym_end = .;	86	__dynsym_end = .;
82	}	87	} :all
83		88
84	. = ALIGN(4);	89	. = ALIGN(4);
85		90
Lines 87-93 SECTIONS Link Here
87	__dynstr_start = .;	92	__dynstr_start = .;
88	*(.dynstr)	93	*(.dynstr)
89	__dynstr_end = .;	94	__dynstr_end = .;
90	}	95	} :all
91		96
92	. = ALIGN(4);	97	. = ALIGN(4);
93		98
Lines 104-110 SECTIONS Link Here
104	KEEP (*(.got.plt))	109	KEEP (*(.got.plt))
105	KEEP (*(.got))	110	KEEP (*(.got))
106	__got_end = .;	111	__got_end = .;
107	}	112	} :all
108		113
109	. = ALIGN(4);	114	. = ALIGN(4);
110		115
Lines 112-118 SECTIONS Link Here
112	__dynamic_start = .;	117	__dynamic_start = .;
113	*(.dynamic)	118	*(.dynamic)
114	__dynamic_end = .;	119	__dynamic_end = .;
115	}	120	} :all
116		121
117	. = ALIGN(16);	122	. = ALIGN(16);
118		123
Lines 122-140 SECTIONS Link Here
122	(.data.)	127	(.data.)
123	*(.lowmem)	128	*(.lowmem)
124	__data_end = .;	129	__data_end = .;
125	}	130	} :all
126		131
127	.reloc : {	132	.reloc : {
128	*(.reloc)	133	*(.reloc)
129	}	134	} :all
130		135
131	.symtab : {	136	.symtab : {
132	*(.symtab)	137	*(.symtab)
133	}	138	} :all
134		139
135	.strtab : {	140	.strtab : {
136	*(.strtab)	141	*(.strtab)
137	}	142	} :all
138		143
139	.bss (NOLOAD) : {	144	.bss (NOLOAD) : {
140	/* the EFI loader doesn't seem to like a .bss section,	145	/* the EFI loader doesn't seem to like a .bss section,
Lines 148-154 SECTIONS Link Here
148	__bss_end = .;	153	__bss_end = .;
149	*(.sbss)	154	*(.sbss)
150	*(.scommon)	155	*(.scommon)
151	}	156	} :all
152	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);	157	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);
153	__bss_dwords = (__bss_len + 3) >> 2;	158	__bss_dwords = (__bss_len + 3) >> 2;
154		159
Lines 161-167 SECTIONS Link Here
161	*(.hugebss)	166	*(.hugebss)
162	(.hugebss.)	167	(.hugebss.)
163	__hugebss_end = .;	168	__hugebss_end = .;
164	}	169	} :all
165		170
166	_end = .;	171	_end = .;
167		172

Lines 19-24 OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") Link Here

(-)a/efi/x86_64/syslinux.ld (-16 / +21 lines)
19	OUTPUT_ARCH(i386:x86-64)	19	OUTPUT_ARCH(i386:x86-64)
20	ENTRY(_start)	20	ENTRY(_start)
21		21
		22	PHDRS
		23	{
		24	all PT_LOAD ;
		25	}
		26
22	SECTIONS	27	SECTIONS
23	{	28	{
24	. = 0;	29	. = 0;
Lines 31-37 SECTIONS Link Here
31	*(.text)	36	*(.text)
32	(.text.)	37	(.text.)
33	__text_end = .;	38	__text_end = .;
34	}	39	} :all
35		40
36	. = ALIGN(16);	41	. = ALIGN(16);
37		42
Lines 40-46 SECTIONS Link Here
40	*(.rodata)	45	*(.rodata)
41	(.rodata.)	46	(.rodata.)
42	__rodata_end = .;	47	__rodata_end = .;
43	}	48	} :all
44		49
45	. = ALIGN(4);	50	. = ALIGN(4);
46		51
Lines 49-62 SECTIONS Link Here
49	KEEP ((SORT(.ctors.)))	54	KEEP ((SORT(.ctors.)))
50	KEEP (*(.ctors))	55	KEEP (*(.ctors))
51	__ctors_end = .;	56	__ctors_end = .;
52	}	57	} :all
53		58
54	.dtors : {	59	.dtors : {
55	__dtors_start = .;	60	__dtors_start = .;
56	KEEP ((SORT(.dtors.)))	61	KEEP ((SORT(.dtors.)))
57	KEEP (*(.dtors))	62	KEEP (*(.dtors))
58	__dtors_end = .;	63	__dtors_end = .;
59	}	64	} :all
60		65
61	. = ALIGN(4096);	66	. = ALIGN(4096);
62	.rel : {	67	.rel : {
Lines 64-70 SECTIONS Link Here
64	*(.rel.data)	69	*(.rel.data)
65	(.rel.data.)	70	(.rel.data.)
66	*(.rel.ctors)	71	*(.rel.ctors)
67	}	72	} :all
68		73
69	. = ALIGN(4);	74	. = ALIGN(4);
70		75
Lines 72-85 SECTIONS Link Here
72	__gnu_hash_start = .;	77	__gnu_hash_start = .;
73	*(.gnu.hash)	78	*(.gnu.hash)
74	__gnu_hash_end = .;	79	__gnu_hash_end = .;
75	}	80	} :all
76		81
77		82
78	.dynsym : {	83	.dynsym : {
79	__dynsym_start = .;	84	__dynsym_start = .;
80	*(.dynsym)	85	*(.dynsym)
81	__dynsym_end = .;	86	__dynsym_end = .;
82	}	87	} :all
83		88
84	. = ALIGN(4);	89	. = ALIGN(4);
85		90
Lines 87-93 SECTIONS Link Here
87	__dynstr_start = .;	92	__dynstr_start = .;
88	*(.dynstr)	93	*(.dynstr)
89	__dynstr_end = .;	94	__dynstr_end = .;
90	}	95	} :all
91		96
92	. = ALIGN(4);	97	. = ALIGN(4);
93		98
Lines 104-110 SECTIONS Link Here
104	KEEP (*(.got.plt))	109	KEEP (*(.got.plt))
105	KEEP (*(.got))	110	KEEP (*(.got))
106	__got_end = .;	111	__got_end = .;
107	}	112	} :all
108		113
109	. = ALIGN(4);	114	. = ALIGN(4);
110		115
Lines 112-118 SECTIONS Link Here
112	__dynamic_start = .;	117	__dynamic_start = .;
113	*(.dynamic)	118	*(.dynamic)
114	__dynamic_end = .;	119	__dynamic_end = .;
115	}	120	} :all
116		121
117	. = ALIGN(16);	122	. = ALIGN(16);
118		123
Lines 122-140 SECTIONS Link Here
122	(.data.)	127	(.data.)
123	*(.lowmem)	128	*(.lowmem)
124	__data_end = .;	129	__data_end = .;
125	}	130	} :all
126		131
127	.reloc : {	132	.reloc : {
128	*(.reloc)	133	*(.reloc)
129	}	134	} :all
130		135
131	.symtab : {	136	.symtab : {
132	*(.symtab)	137	*(.symtab)
133	}	138	} :all
134		139
135	.strtab : {	140	.strtab : {
136	*(.strtab)	141	*(.strtab)
137	}	142	} :all
138		143
139	.bss (NOLOAD) : {	144	.bss (NOLOAD) : {
140	/* the EFI loader doesn't seem to like a .bss section,	145	/* the EFI loader doesn't seem to like a .bss section,
Lines 148-154 SECTIONS Link Here
148	__bss_end = .;	153	__bss_end = .;
149	*(.sbss)	154	*(.sbss)
150	*(.scommon)	155	*(.scommon)
151	}	156	} :all
152	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);	157	__bss_len = ABSOLUTE(__bss_end) - ABSOLUTE(__bss_start);
153	__bss_dwords = (__bss_len + 3) >> 2;	158	__bss_dwords = (__bss_len + 3) >> 2;
154		159
Lines 161-167 SECTIONS Link Here
161	*(.hugebss)	166	*(.hugebss)
162	(.hugebss.)	167	(.hugebss.)
163	__hugebss_end = .;	168	__hugebss_end = .;
164	}	169	} :all
165		170
166	_end = .;	171	_end = .;
167		172

Return to bug 662678