summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/conf/Makefile.alpha8
-rw-r--r--sys/arch/amd64/conf/Makefile.amd648
-rw-r--r--sys/arch/armish/conf/Makefile.armish8
-rw-r--r--sys/arch/aviion/conf/Makefile.aviion8
-rw-r--r--sys/arch/beagle/conf/Makefile.beagle8
-rw-r--r--sys/arch/gumstix/conf/Makefile.gumstix8
-rw-r--r--sys/arch/hp300/conf/Makefile.hp3008
-rw-r--r--sys/arch/hppa/conf/Makefile.hppa8
-rw-r--r--sys/arch/hppa64/conf/Makefile.hppa648
-rw-r--r--sys/arch/i386/conf/Makefile.i3868
-rw-r--r--sys/arch/landisk/conf/Makefile.landisk8
-rw-r--r--sys/arch/loongson/conf/Makefile.loongson8
-rw-r--r--sys/arch/luna88k/conf/Makefile.luna88k8
-rw-r--r--sys/arch/mac68k/conf/Makefile.mac68k8
-rw-r--r--sys/arch/macppc/conf/Makefile.macppc8
-rw-r--r--sys/arch/mvme68k/conf/Makefile.mvme68k8
-rw-r--r--sys/arch/mvme88k/conf/Makefile.mvme88k8
-rw-r--r--sys/arch/mvmeppc/conf/Makefile.mvmeppc8
-rw-r--r--sys/arch/octeon/conf/Makefile.octeon8
-rw-r--r--sys/arch/palm/conf/Makefile.palm8
-rw-r--r--sys/arch/sgi/conf/Makefile.sgi8
-rw-r--r--sys/arch/socppc/conf/Makefile.socppc8
-rw-r--r--sys/arch/solbourne/conf/Makefile.solbourne8
-rw-r--r--sys/arch/sparc/conf/Makefile.sparc8
-rw-r--r--sys/arch/sparc64/conf/Makefile.sparc648
-rw-r--r--sys/arch/vax/conf/Makefile.vax8
-rw-r--r--sys/arch/zaurus/conf/Makefile.zaurus8
27 files changed, 108 insertions, 108 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index ea436343be7..9eece6d8614 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.alpha,v 1.70 2010/06/01 23:49:20 deraadt Exp $
+# $OpenBSD: Makefile.alpha,v 1.71 2010/12/02 04:35:00 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,11 +67,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/amd64/conf/Makefile.amd64 b/sys/arch/amd64/conf/Makefile.amd64
index 940ea90a609..82b921ff414 100644
--- a/sys/arch/amd64/conf/Makefile.amd64
+++ b/sys/arch/amd64/conf/Makefile.amd64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.amd64,v 1.44 2010/06/02 14:40:04 kettenis Exp $
+# $OpenBSD: Makefile.amd64,v 1.45 2010/12/02 04:35:01 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -68,11 +68,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index ccff747e188..1b4bb2e3c54 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.armish,v 1.35 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.armish,v 1.36 2010/12/02 04:35:01 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,7 +67,7 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= ${_mach}_start.o locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= ${_mach}_start.o locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD_HEAD+=; \
@@ -75,8 +75,8 @@ SYSTEM_LD_HEAD+=; \
sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ldscript
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
SYSTEM_LD_TAIL+=; \
dd if=/dev/zero of=bsd bs=1 count=1 seek=95 conv=notrunc 2>/dev/null; \
diff --git a/sys/arch/aviion/conf/Makefile.aviion b/sys/arch/aviion/conf/Makefile.aviion
index 06cd075d5db..bd667629077 100644
--- a/sys/arch/aviion/conf/Makefile.aviion
+++ b/sys/arch/aviion/conf/Makefile.aviion
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.aviion,v 1.30 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.aviion,v 1.31 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -73,11 +73,11 @@ PROFILE_C= ${CC} -S -c ${CFLAGS} ${CPPFLAGS} $<; \
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle
index d733145f4ba..a55e1ec0925 100644
--- a/sys/arch/beagle/conf/Makefile.beagle
+++ b/sys/arch/beagle/conf/Makefile.beagle
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.beagle,v 1.29 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.beagle,v 1.30 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,7 +67,7 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= ${_mach}_start.o locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= ${_mach}_start.o locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD_HEAD+=; \
@@ -75,8 +75,8 @@ SYSTEM_LD_HEAD+=; \
sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ldscript
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix
index 09f30402dc3..af8621b7783 100644
--- a/sys/arch/gumstix/conf/Makefile.gumstix
+++ b/sys/arch/gumstix/conf/Makefile.gumstix
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.gumstix,v 1.27 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.gumstix,v 1.28 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,7 +67,7 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= ${_mach}_start.o locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= ${_mach}_start.o locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD_HEAD+=; \
@@ -75,8 +75,8 @@ SYSTEM_LD_HEAD+=; \
sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ldscript
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index fff6296ed62..9f2928d78ab 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hp300,v 1.70 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.hp300,v 1.71 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -104,11 +104,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${FPSP}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS} ${FPSP}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index f283b4c4e2e..bbe60256342 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hppa,v 1.60 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.hppa,v 1.61 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -88,11 +88,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBSPMATH}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS} ${LIBSPMATH}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64
index 3bffcbe85f4..26507a41d9e 100644
--- a/sys/arch/hppa64/conf/Makefile.hppa64
+++ b/sys/arch/hppa64/conf/Makefile.hppa64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hppa64,v 1.33 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.hppa64,v 1.34 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -69,11 +69,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${LIBSPMATH}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS} ${LIBSPMATH}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/i386/conf/Makefile.i386 b/sys/arch/i386/conf/Makefile.i386
index c9b2c5525e1..c85f5207953 100644
--- a/sys/arch/i386/conf/Makefile.i386
+++ b/sys/arch/i386/conf/Makefile.i386
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.i386,v 1.76 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.i386,v 1.77 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -73,11 +73,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index 61085ce65ff..f20ac008ece 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.landisk,v 1.37 2010/09/06 08:00:31 jsg Exp $
+# $OpenBSD: Makefile.landisk,v 1.38 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,11 +67,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 702233ca7fb..2402a741dfb 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.loongson,v 1.26 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.loongson,v 1.27 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -74,11 +74,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/luna88k/conf/Makefile.luna88k b/sys/arch/luna88k/conf/Makefile.luna88k
index afd3572a1da..9bf514ae7c5 100644
--- a/sys/arch/luna88k/conf/Makefile.luna88k
+++ b/sys/arch/luna88k/conf/Makefile.luna88k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.luna88k,v 1.37 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.luna88k,v 1.38 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -71,11 +71,11 @@ PROFILE_C= ${CC} -S -c ${CFLAGS} ${CPPFLAGS} $<; \
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index ef5d3909ea1..a9eccbfbaf4 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mac68k,v 1.67 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.mac68k,v 1.68 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -69,11 +69,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${FPSP}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS} ${FPSP}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index 27ea5bf577b..62c07de5b41 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.macppc,v 1.56 2010/06/01 23:49:22 deraadt Exp $
+# $OpenBSD: Makefile.macppc,v 1.57 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,11 +67,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index f99f2978eea..9fab002401a 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mvme68k,v 1.58 2010/06/01 23:49:23 deraadt Exp $
+# $OpenBSD: Makefile.mvme68k,v 1.59 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -70,11 +70,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS} ${FPSP} ${060SP}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS} ${FPSP} ${060SP}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/mvme88k/conf/Makefile.mvme88k b/sys/arch/mvme88k/conf/Makefile.mvme88k
index 636a8231ad7..1bbe653f076 100644
--- a/sys/arch/mvme88k/conf/Makefile.mvme88k
+++ b/sys/arch/mvme88k/conf/Makefile.mvme88k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mvme88k,v 1.67 2010/06/01 23:49:23 deraadt Exp $
+# $OpenBSD: Makefile.mvme88k,v 1.68 2010/12/02 04:35:02 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -68,11 +68,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
# Kernel is linked as a ZMAGIC executable, with start at 10020
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
index d63967bd1ba..ae9a9fb89f3 100644
--- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc
+++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mvmeppc,v 1.53 2010/06/01 23:49:23 deraadt Exp $
+# $OpenBSD: Makefile.mvmeppc,v 1.54 2010/12/02 04:35:03 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,11 +67,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/octeon/conf/Makefile.octeon b/sys/arch/octeon/conf/Makefile.octeon
index f87008a7b46..5634a900536 100644
--- a/sys/arch/octeon/conf/Makefile.octeon
+++ b/sys/arch/octeon/conf/Makefile.octeon
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.octeon,v 1.1 2010/09/20 06:32:30 syuu Exp $
+# $OpenBSD: Makefile.octeon,v 1.2 2010/12/02 04:35:03 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -75,11 +75,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm
index 557a5357e08..3f83a7843e0 100644
--- a/sys/arch/palm/conf/Makefile.palm
+++ b/sys/arch/palm/conf/Makefile.palm
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.palm,v 1.24 2010/06/01 23:49:23 deraadt Exp $
+# $OpenBSD: Makefile.palm,v 1.25 2010/12/02 04:35:03 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,7 +67,7 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= ${_mach}_start.o locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= ${_mach}_start.o locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD_HEAD+=; \
@@ -75,8 +75,8 @@ SYSTEM_LD_HEAD+=; \
sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ldscript
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index 6dfcd7adeb1..27b8b4dd86b 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sgi,v 1.48 2010/06/01 23:49:23 deraadt Exp $
+# $OpenBSD: Makefile.sgi,v 1.49 2010/12/02 04:35:03 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -74,11 +74,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc
index 75f28effecc..eec783e57a4 100644
--- a/sys/arch/socppc/conf/Makefile.socppc
+++ b/sys/arch/socppc/conf/Makefile.socppc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.socppc,v 1.27 2010/06/01 23:49:23 deraadt Exp $
+# $OpenBSD: Makefile.socppc,v 1.28 2010/12/02 04:35:03 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,11 +67,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/solbourne/conf/Makefile.solbourne b/sys/arch/solbourne/conf/Makefile.solbourne
index 96b17dcdce1..a4186e0a2f4 100644
--- a/sys/arch/solbourne/conf/Makefile.solbourne
+++ b/sys/arch/solbourne/conf/Makefile.solbourne
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.solbourne,v 1.30 2010/06/01 23:49:23 deraadt Exp $
+# $OpenBSD: Makefile.solbourne,v 1.31 2010/12/02 04:35:03 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,11 +67,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/sparc/conf/Makefile.sparc b/sys/arch/sparc/conf/Makefile.sparc
index 54686bd9cea..1a7ce9ceadb 100644
--- a/sys/arch/sparc/conf/Makefile.sparc
+++ b/sys/arch/sparc/conf/Makefile.sparc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sparc,v 1.66 2010/06/01 23:49:23 deraadt Exp $
+# $OpenBSD: Makefile.sparc,v 1.67 2010/12/02 04:35:03 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -70,11 +70,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/sparc64/conf/Makefile.sparc64 b/sys/arch/sparc64/conf/Makefile.sparc64
index 3e9b8a74daa..73e0ebcfed6 100644
--- a/sys/arch/sparc64/conf/Makefile.sparc64
+++ b/sys/arch/sparc64/conf/Makefile.sparc64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sparc64,v 1.53 2010/06/01 23:49:23 deraadt Exp $
+# $OpenBSD: Makefile.sparc64,v 1.54 2010/12/02 04:35:03 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,11 +67,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 6d6229782bf..d4d5f8db515 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.vax,v 1.58 2010/06/01 23:49:23 deraadt Exp $
+# $OpenBSD: Makefile.vax,v 1.59 2010/12/02 04:35:03 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,11 +67,11 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index a153cb66710..eb2f909a761 100644
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.zaurus,v 1.37 2010/06/01 23:49:23 deraadt Exp $
+# $OpenBSD: Makefile.zaurus,v 1.38 2010/12/02 04:35:03 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -67,7 +67,7 @@ NORMAL_S= ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
# ${SYSTEM_LD_HEAD}
# ${SYSTEM_LD} swapxxx.o
# ${SYSTEM_LD_TAIL}
-SYSTEM_OBJ= ${_mach}_start.o locore.o param.o ioconf.o ${OBJS}
+SYSTEM_OBJ= ${_mach}_start.o locore.o param.o ioconf.o vers.o ${OBJS}
SYSTEM_DEP= Makefile ${SYSTEM_OBJ}
SYSTEM_LD_HEAD= @rm -f $@
SYSTEM_LD_HEAD+=; \
@@ -75,8 +75,8 @@ SYSTEM_LD_HEAD+=; \
sed -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \
-e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' > ldscript
-SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
- ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
+SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}'; \
+ ${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ}
SYSTEM_LD_TAIL= @${SIZE} $@; chmod 755 $@
DEBUG?=