summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/armish/conf/Makefile.armish15
-rw-r--r--sys/arch/gumstix/conf/Makefile.gumstix10
-rw-r--r--sys/arch/moko/conf/Makefile.moko8
-rw-r--r--sys/arch/palm/conf/Makefile.palm8
-rw-r--r--sys/arch/zaurus/conf/Makefile.zaurus8
5 files changed, 25 insertions, 24 deletions
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index abc061c44f6..795f65d304b 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.armish,v 1.22 2010/04/27 15:33:08 deraadt Exp $
+# $OpenBSD: Makefile.armish,v 1.23 2010/04/27 16:43:42 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -94,10 +94,11 @@ SYSTEM_LD_HEAD+=; \
SYSTEM_LD= @echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
${LD} ${LINKFLAGS} -o $@ ${SYSTEM_OBJ} vers.o
-SYSTEM_LD_TAIL= @dd if=/dev/zero of=bsd bs=1 count=1 seek=95 conv=notrunc 2>/dev/null; \
+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; \
dd if=/dev/zero of=bsd bs=1 count=1 seek=127 conv=notrunc 2>/dev/null; \
- dd if=/dev/zero of=bsd bs=1 count=1 seek=159 conv=notrunc 2>/dev/null; \
- ${SIZE} $@; chmod 755 $@
+ dd if=/dev/zero of=bsd bs=1 count=1 seek=159 conv=notrunc 2>/dev/null
DEBUG?=
.if ${DEBUG} == "-g"
@@ -156,11 +157,11 @@ links:
sed 's,.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
sh makelinks && rm -f dontlink makelinks
-SRCS= ${_archdir}/arm/locore.S \
+SRCS= ${_archdir}/${_arch}/locore.S \
param.c ioconf.c ${CFILES} ${SFILES}
depend:: .depend
.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
- ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S
+ ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
.if ${SFILES} != ""
${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
@@ -179,7 +180,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h
${NORMAL_S}
-locore.o: ${_archdir}/arm/locore.S assym.h
+locore.o: ${_archdir}/${_arch}/locore.S assym.h
${NORMAL_S}
# The install target can be redefined by putting a
diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix
index 8e68990f2b7..dfcb6543577 100644
--- a/sys/arch/gumstix/conf/Makefile.gumstix
+++ b/sys/arch/gumstix/conf/Makefile.gumstix
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.gumstix,v 1.15 2010/04/27 15:33:08 deraadt Exp $
+# $OpenBSD: Makefile.gumstix,v 1.16 2010/04/27 16:43:42 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -25,7 +25,7 @@ _machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
INCLUDES= -nostdinc -I. -I$S -I$S/arch
-CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D__gumstix__
+CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
CDIAGFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
-Wstack-larger-than-2047 -Wvariable-decl
@@ -154,11 +154,11 @@ links:
sed 's,.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
sh makelinks && rm -f dontlink makelinks
-SRCS= ${_archdir}/arm/locore.S \
+SRCS= ${_archdir}/${_arch}/locore.S \
param.c ioconf.c ${CFILES} ${SFILES}
depend:: .depend
.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
- ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S
+ ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
.if ${SFILES} != ""
${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
@@ -177,7 +177,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h
${NORMAL_S}
-locore.o: ${_archdir}/arm/locore.S assym.h
+locore.o: ${_archdir}/${_arch}/locore.S assym.h
${NORMAL_S}
# The install target can be redefined by putting a
diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko
index 32c7825255e..a4fa049b21d 100644
--- a/sys/arch/moko/conf/Makefile.moko
+++ b/sys/arch/moko/conf/Makefile.moko
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.moko,v 1.15 2010/04/27 15:33:08 deraadt Exp $
+# $OpenBSD: Makefile.moko,v 1.16 2010/04/27 16:43:42 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -154,11 +154,11 @@ links:
sed 's,.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
sh makelinks && rm -f dontlink makelinks
-SRCS= ${_archdir}/arm/locore.S \
+SRCS= ${_archdir}/${_arch}/locore.S \
param.c ioconf.c ${CFILES} ${SFILES}
depend:: .depend
.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
- ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S
+ ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
.if ${SFILES} != ""
${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
@@ -177,7 +177,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h
${NORMAL_S}
-locore.o: ${_archdir}/arm/locore.S assym.h
+locore.o: ${_archdir}/${_arch}/locore.S assym.h
${NORMAL_S}
# The install target can be redefined by putting a
diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm
index 781508448ef..7edb7502194 100644
--- a/sys/arch/palm/conf/Makefile.palm
+++ b/sys/arch/palm/conf/Makefile.palm
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.palm,v 1.12 2010/04/27 15:33:08 deraadt Exp $
+# $OpenBSD: Makefile.palm,v 1.13 2010/04/27 16:43:42 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -154,11 +154,11 @@ links:
sed 's,.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
sh makelinks && rm -f dontlink makelinks
-SRCS= ${_archdir}/arm/locore.S \
+SRCS= ${_archdir}/${_arch}/locore.S \
param.c ioconf.c ${CFILES} ${SFILES}
depend:: .depend
.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
- ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S
+ ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
.if ${SFILES} != ""
${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
@@ -177,7 +177,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h
${NORMAL_S}
-locore.o: ${_archdir}/arm/locore.S assym.h
+locore.o: ${_archdir}/${_arch}/locore.S assym.h
${NORMAL_S}
# The install target can be redefined by putting a
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index 08548644b6f..61f6942b2c1 100644
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.zaurus,v 1.25 2010/04/27 15:33:08 deraadt Exp $
+# $OpenBSD: Makefile.zaurus,v 1.26 2010/04/27 16:43:41 deraadt Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -154,11 +154,11 @@ links:
sed 's,.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
sh makelinks && rm -f dontlink makelinks
-SRCS= ${_archdir}/arm/locore.S \
+SRCS= ${_archdir}/${_arch}/locore.S \
param.c ioconf.c ${CFILES} ${SFILES}
depend:: .depend
.depend: ${SRCS} assym.h param.c ${DB_STRUCTINFO}
- ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/arm/locore.S
+ ${MKDEP} ${AFLAGS} ${CPPFLAGS} ${_archdir}/${_arch}/locore.S
${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
.if ${SFILES} != ""
${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
@@ -177,7 +177,7 @@ db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
${_mach}_start.o: ${_machdir}/${_mach}/${_mach}_start.S assym.h
${NORMAL_S}
-locore.o: ${_archdir}/arm/locore.S assym.h
+locore.o: ${_archdir}/${_arch}/locore.S assym.h
${NORMAL_S}
# The install target can be redefined by putting a
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-21 18:39:35 +0000