svn commit: r220993 - projects/altix/sys/conf

[Marcel Moolenaar]

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