View | Details | Raw Unified | Return to bug 230857
Collapse All | Expand All

(-)src/sys/conf/kmod.mk (+17 lines)
Lines 242-248 ${KMOD}.kld: ${OBJS} Link Here
242
.else
242
.else
243
${FULLPROG}: ${OBJS}
243
${FULLPROG}: ${OBJS}
244
.endif
244
.endif
245
.if !defined(FIRMWS) && (${MACHINE_CPUARCH} == "i386")
246
	${LD} -m ${LD_EMULATION} ${_LDFLAGS} -r \
247
	    -T ${SYSDIR}/conf/ldscript.set_pad \
248
	    -d -o ${.TARGET}.set_pad_apply ${OBJS}
249
	${LD} -m ${LD_EMULATION} ${_LDFLAGS} -r \
250
	    -T ${SYSDIR}/conf/ldscript.set_pad_apply \
251
	    -d -o ${.TARGET} ${.TARGET}.set_pad_apply
252
.else
245
	${LD} -m ${LD_EMULATION} ${_LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
253
	${LD} -m ${LD_EMULATION} ${_LDFLAGS} -r -d -o ${.TARGET} ${OBJS}
254
.endif
246
.if ${MK_CTF} != "no"
255
.if ${MK_CTF} != "no"
247
	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
256
	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${OBJS}
248
.endif
257
.endif
Lines 303-308 ${_ILINKS}: Link Here
303
	ln -fns $$path ${.TARGET:T}
312
	ln -fns $$path ${.TARGET:T}
304
313
305
CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS}
314
CLEANFILES+= ${PROG} ${KMOD}.kld ${OBJS}
315
316
.if !defined(FIRMWS) && (${MACHINE_CPUARCH} == "i386")
317
.if ${__KLD_SHARED} == yes
318
CLEANFILES+= ${KMOD}.kld.set_pad_apply
319
.else
320
CLEANFILES+= ${FULLPROG}.kld.set_pad_apply
321
.endif
322
.endif
306
323
307
.if defined(DEBUG_FLAGS)
324
.if defined(DEBUG_FLAGS)
308
CLEANFILES+= ${FULLPROG} ${PROG}.debug
325
CLEANFILES+= ${FULLPROG} ${PROG}.debug
(-)src/sys/conf/ldscript.set_pad (+12 lines)
Line 0 Link Here
1
___set_pcpu_pad = ABSOLUTE ( SIZEOF(set_pcpu) ? 1 : 0 ) ;
2
SECTIONS
3
{
4
	set_pcpu	: { *(set_pcpu) }
5
}
6
7
___set_vnet_pad = ABSOLUTE ( SIZEOF(set_vnet) ? 1 : 0 ) ;
8
SECTIONS
9
{
10
	set_vnet	: { *(set_vnet) }
11
}
12
(-)src/sys/conf/ldscript.set_pad_apply (+18 lines)
Line 0 Link Here
1
SECTIONS
2
{
3
	set_pcpu	:
4
	{
5
		*(set_pcpu)
6
		. = . + ABSOLUTE (___set_pcpu_pad) ;
7
	}
8
}
9
10
SECTIONS
11
{
12
	set_vnet	:
13
	{
14
		*(set_vnet)
15
		. = . + ABSOLUTE (___set_vnet_pad) ;
16
	}
17
}
18

Return to bug 230857