Date: Thu, 17 Mar 2011 16:35:37 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r219716 - projects/altix/sys/conf Message-ID: <201103171635.p2HGZb64033004@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Thu Mar 17 16:35:37 2011 New Revision: 219716 URL: http://svn.freebsd.org/changeset/base/219716 Log: Make it easier to switch to relocatable kernels... Modified: projects/altix/sys/conf/kern.pre.mk Modified: projects/altix/sys/conf/kern.pre.mk ============================================================================== --- projects/altix/sys/conf/kern.pre.mk Thu Mar 17 16:16:09 2011 (r219715) +++ projects/altix/sys/conf/kern.pre.mk Thu Mar 17 16:35:37 2011 (r219716) @@ -8,6 +8,10 @@ # backwards compat option for older systems. MACHINE_CPUARCH?=${MACHINE_ARCH:C/mipse[lb]/mips/:C/armeb/arm/:C/powerpc64/powerpc/} +# Support for building relocatable kernels on some architectures. +REL_KERNEL_ARCHS= # Altix TODO +LINK_REL_KERNEL= ${REL_KERNEL_ARCHS:S/${MACHINE_ARCH}/yes/g:Myes} + # Can be overridden by makeoptions or /etc/make.conf KERNEL_KO?= kernel KERNEL?= kernel @@ -148,13 +152,15 @@ SYSTEM_DEP= Makefile ${SYSTEM_OBJS} SYSTEM_OBJS= locore.o ${MDOBJS} ${OBJS} SYSTEM_OBJS+= ${SYSTEM_CFILES:.c=.o} SYSTEM_CTFMERGE= [ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o -.if ${MACHINE_ARCH} == XXX_ALTIX_TODO -SYSTEM_LDFLAGS= -r + +.if ${LINK_REL_KERNEL} == yes +SYSTEM_LDFLAGS= -r -e __start .else SYSTEM_OBJS+= hack.So SYSTEM_LDFLAGS= -Bdynamic -T ${LDSCRIPT} -export-dynamic \ -dynamic-linker /red/herring .endif + SYSTEM_LD= @${LD} ${SYSTEM_LDFLAGS} -warn-common \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103171635.p2HGZb64033004>