From owner-svn-src-projects@FreeBSD.ORG Sun Apr 24 16:56:35 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 16188106566B; Sun, 24 Apr 2011 16:56:35 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DFCB88FC14; Sun, 24 Apr 2011 16:56:34 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p3OGuYAH039721; Sun, 24 Apr 2011 16:56:34 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p3OGuYhW039718; Sun, 24 Apr 2011 16:56:34 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201104241656.p3OGuYhW039718@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 24 Apr 2011 16:56:34 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220993 - projects/altix/sys/conf X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Apr 2011 16:56:35 -0000 Author: marcel Date: Sun Apr 24 16:56:34 2011 New Revision: 220993 URL: http://svn.freebsd.org/changeset/base/220993 Log: Revert changes to support relocatable kernels and modules for ia64. We can replace R/O segments without problems with PBVM. Modified: projects/altix/sys/conf/kern.pre.mk projects/altix/sys/conf/kmod.mk Modified: projects/altix/sys/conf/kern.pre.mk ============================================================================== --- projects/altix/sys/conf/kern.pre.mk Sun Apr 24 16:33:41 2011 (r220992) +++ projects/altix/sys/conf/kern.pre.mk Sun Apr 24 16:56:34 2011 (r220993) @@ -8,10 +8,6 @@ # 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 @@ -159,17 +155,10 @@ SYSTEM_CFILES= config.c env.c hints.c vn 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 ${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 \ +SYSTEM_CTFMERGE= [ -z "${CTFMERGE}" -o -n "${NO_CTF}" ] || ${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SYSTEM_OBJS} vers.o +SYSTEM_LD= @${LD} -Bdynamic -T ${LDSCRIPT} \ + -warn-common -export-dynamic -dynamic-linker /red/herring \ -o ${.TARGET} -X ${SYSTEM_OBJS} vers.o SYSTEM_LD_TAIL= @${OBJCOPY} --strip-symbol gcc2_compiled. ${.TARGET} ; \ ${SIZE} ${.TARGET} ; chmod 755 ${.TARGET} Modified: projects/altix/sys/conf/kmod.mk ============================================================================== --- projects/altix/sys/conf/kmod.mk Sun Apr 24 16:33:41 2011 (r220992) +++ projects/altix/sys/conf/kmod.mk Sun Apr 24 16:56:34 2011 (r220993) @@ -82,9 +82,7 @@ OBJCOPY?= objcopy .SUFFIXES: .out .o .c .cc .cxx .C .y .l .s .S # amd64 and mips use direct linking for kmod, all others use shared binaries -.if ${MACHINE_CPUARCH} != amd64 && \ - ${MACHINE_CPUARCH} != ia64 && \ - ${MACHINE_CPUARCH} != mips +.if ${MACHINE_CPUARCH} != amd64 && ${MACHINE_CPUARCH} != mips __KLD_SHARED=yes .else __KLD_SHARED=no