summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorDale Rahn <drahn@cvs.openbsd.org>2010-04-27 17:25:20 +0000
committerDale Rahn <drahn@cvs.openbsd.org>2010-04-27 17:25:20 +0000
commit996c599edb827abd37f911f42afb154c28f1cc5d (patch)
tree0b104fbcc4c6a8b7ebbafeb954ab9017e0c4d3c7 /sys/arch
parent147d62531a4c937c43d846e66b15dc926fb8d776 (diff)
Killing a few more diffs for theo, arm makes #LINKFLAGS, beagle cleanup,
INCLUDE= common.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/alpha/conf/Makefile.alpha4
-rw-r--r--sys/arch/armish/conf/Makefile.armish4
-rw-r--r--sys/arch/beagle/conf/Makefile.beagle17
-rw-r--r--sys/arch/gumstix/conf/Makefile.gumstix4
-rw-r--r--sys/arch/hp300/conf/Makefile.hp3004
-rw-r--r--sys/arch/hppa/conf/Makefile.hppa4
-rw-r--r--sys/arch/hppa64/conf/Makefile.hppa644
-rw-r--r--sys/arch/landisk/conf/Makefile.landisk4
-rw-r--r--sys/arch/loongson/conf/Makefile.loongson4
-rw-r--r--sys/arch/mac68k/conf/Makefile.mac68k4
-rw-r--r--sys/arch/macppc/conf/Makefile.macppc4
-rw-r--r--sys/arch/moko/conf/Makefile.moko4
-rw-r--r--sys/arch/mvme68k/conf/Makefile.mvme68k4
-rw-r--r--sys/arch/mvmeppc/conf/Makefile.mvmeppc4
-rw-r--r--sys/arch/palm/conf/Makefile.palm4
-rw-r--r--sys/arch/sgi/conf/Makefile.sgi4
-rw-r--r--sys/arch/socppc/conf/Makefile.socppc4
-rw-r--r--sys/arch/vax/conf/Makefile.vax4
-rw-r--r--sys/arch/zaurus/conf/Makefile.zaurus4
19 files changed, 40 insertions, 49 deletions
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index 9553c4f6f3f..599e7962d17 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.alpha,v 1.58 2010/04/27 16:54:52 deraadt Exp $
+# $OpenBSD: Makefile.alpha,v 1.59 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,7 +24,7 @@ _arch?= alpha
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D${_mach}
CDIAGFLAGS?= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/armish/conf/Makefile.armish b/sys/arch/armish/conf/Makefile.armish
index 48f2084053e..a6d28b69fae 100644
--- a/sys/arch/armish/conf/Makefile.armish
+++ b/sys/arch/armish/conf/Makefile.armish
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.armish,v 1.24 2010/04/27 16:50:14 jsg Exp $
+# $OpenBSD: Makefile.armish,v 1.25 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -41,8 +41,6 @@ CMACHFLAGS+= -msoft-float -fno-builtin-printf -fno-builtin-log \
COPTS?= -O2
CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
AFLAGS= -x assembler-with-cpp -D_LOCORE ${CMACHFLAGS}
-#LINKFLAGS= -Ttext 0xF0000020 -e start --warn-common
-#LINKFLAGS= -T ${_machdir}/conf/kern.ldscript
LINKFLAGS= -T ldscript
LINKFLAGS+= --warn-common
STRIPFLAGS= -g -X -x
diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle
index 0d18f48e975..e3c8ed65d99 100644
--- a/sys/arch/beagle/conf/Makefile.beagle
+++ b/sys/arch/beagle/conf/Makefile.beagle
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.beagle,v 1.19 2010/04/27 16:54:53 deraadt Exp $
+# $OpenBSD: Makefile.beagle,v 1.20 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,10 +24,11 @@ _arch?= arm
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -nostdinc -I. -I$S/arch -I$S
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
CDIAGFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wno-uninitialized -Wno-format -Wno-main
+ -Wno-uninitialized -Wno-format -Wno-main \
+ -Wstack-larger-than-2047 -Wvariable-decl
CMACHFLAGS= -ffreestanding
#CMACHFLAGS= -march=armv4 -mtune=strongarm -ffreestanding
@@ -40,8 +41,6 @@ CMACHFLAGS+= -msoft-float -fno-builtin-printf -fno-builtin-log \
COPTS?= -O2
CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
AFLAGS= -x assembler-with-cpp -D_LOCORE ${CMACHFLAGS}
-#LINKFLAGS= -Ttext 0xF0000020 -e start --warn-common
-#LINKFLAGS= -T ${_machdir}/conf/kern.ldscript
LINKFLAGS= -T ldscript
LINKFLAGS+= --warn-common
STRIPFLAGS= -g -X -x
@@ -100,8 +99,9 @@ DEBUG?=
.if ${DEBUG} == "-g"
LINKFLAGS+= -X
SYSTEM_LD_TAIL+=; \
- echo cp $@ $@.gdb; rm -f $@.gdb; cp $@ $@.gdb; \
- echo ${STRIP} ${STRIPFLAGS} $@; ${STRIP} ${STRIPFLAGS} $@
+ echo mv $@ $@.gdb; rm -f $@.gdb; mv $@ $@.gdb; \
+ echo ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb; \
+ ${STRIP} ${STRIPFLAGS} -o $@ $@.gdb
.else
LINKFLAGS+= -x
.endif
@@ -164,7 +164,8 @@ depend:: .depend
.endif
cat ${_archdir}/${_arch}/genassym.cf ${_machdir}/${_mach}/genassym.cf | \
sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS}
- @sed -e 's/.*\.o:.* /assym.h: /' < assym.dep >> .depend
+ @sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \
+ < assym.dep >> .depend
@rm -f assym.dep
db_structinfo.h: $S/ddb/db_structinfo.c $S/ddb/parse_structinfo.awk
diff --git a/sys/arch/gumstix/conf/Makefile.gumstix b/sys/arch/gumstix/conf/Makefile.gumstix
index 4980308c66a..9b216be1426 100644
--- a/sys/arch/gumstix/conf/Makefile.gumstix
+++ b/sys/arch/gumstix/conf/Makefile.gumstix
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.gumstix,v 1.17 2010/04/27 16:50:14 jsg Exp $
+# $OpenBSD: Makefile.gumstix,v 1.18 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -41,8 +41,6 @@ CMACHFLAGS+= -msoft-float -fno-builtin-printf -fno-builtin-log \
COPTS?= -O2
CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
AFLAGS= -x assembler-with-cpp -D_LOCORE ${CMACHFLAGS}
-#LINKFLAGS= -Ttext 0xF0000020 -e start --warn-common
-#LINKFLAGS= -T ${_machdir}/conf/kern.ldscript
LINKFLAGS= -T ldscript
LINKFLAGS+= --warn-common
STRIPFLAGS= -g -X -x
diff --git a/sys/arch/hp300/conf/Makefile.hp300 b/sys/arch/hp300/conf/Makefile.hp300
index 87f8e97da4e..3de1b6e21c1 100644
--- a/sys/arch/hp300/conf/Makefile.hp300
+++ b/sys/arch/hp300/conf/Makefile.hp300
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hp300,v 1.57 2010/04/27 16:54:53 deraadt Exp $
+# $OpenBSD: Makefile.hp300,v 1.58 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,7 +24,7 @@ _arch?= m68k
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D${_mach} -Dmc68020
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/hppa/conf/Makefile.hppa b/sys/arch/hppa/conf/Makefile.hppa
index 16158f6b6c1..b456fac85a3 100644
--- a/sys/arch/hppa/conf/Makefile.hppa
+++ b/sys/arch/hppa/conf/Makefile.hppa
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hppa,v 1.48 2010/04/27 16:54:53 deraadt Exp $
+# $OpenBSD: Makefile.hppa,v 1.49 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,7 +24,7 @@ _arch?= hppa
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D${_mach}
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wno-uninitialized \
-Wno-format -Wno-main \
diff --git a/sys/arch/hppa64/conf/Makefile.hppa64 b/sys/arch/hppa64/conf/Makefile.hppa64
index cf6384bcd60..b8deff05f22 100644
--- a/sys/arch/hppa64/conf/Makefile.hppa64
+++ b/sys/arch/hppa64/conf/Makefile.hppa64
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.hppa64,v 1.22 2010/04/27 16:54:53 deraadt Exp $
+# $OpenBSD: Makefile.hppa64,v 1.23 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,7 +24,7 @@ _arch?= hppa64
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D${_mach}
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wno-uninitialized \
-Wno-format -Wno-main \
diff --git a/sys/arch/landisk/conf/Makefile.landisk b/sys/arch/landisk/conf/Makefile.landisk
index e004b60c750..cda68eb9852 100644
--- a/sys/arch/landisk/conf/Makefile.landisk
+++ b/sys/arch/landisk/conf/Makefile.landisk
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.landisk,v 1.25 2010/04/27 16:54:53 deraadt Exp $
+# $OpenBSD: Makefile.landisk,v 1.26 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,7 +24,7 @@ _arch?= sh
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D${_mach}
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index 30b839fa9e3..0315c016523 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.loongson,v 1.15 2010/04/27 16:54:53 deraadt Exp $
+# $OpenBSD: Makefile.loongson,v 1.16 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -34,7 +34,7 @@ _arch?= mips64
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
CDIAGFLAGS= -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/mac68k/conf/Makefile.mac68k b/sys/arch/mac68k/conf/Makefile.mac68k
index 6dcba3c87bd..856f6c81b0b 100644
--- a/sys/arch/mac68k/conf/Makefile.mac68k
+++ b/sys/arch/mac68k/conf/Makefile.mac68k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mac68k,v 1.54 2010/04/27 16:54:54 deraadt Exp $
+# $OpenBSD: Makefile.mac68k,v 1.55 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,7 +24,7 @@ _arch?= m68k
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D${_mach} -Dmc68020
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/macppc/conf/Makefile.macppc b/sys/arch/macppc/conf/Makefile.macppc
index dad288fe168..6afcd999730 100644
--- a/sys/arch/macppc/conf/Makefile.macppc
+++ b/sys/arch/macppc/conf/Makefile.macppc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.macppc,v 1.45 2010/04/27 16:54:54 deraadt Exp $
+# $OpenBSD: Makefile.macppc,v 1.46 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,7 +24,7 @@ _arch?= powerpc
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/moko/conf/Makefile.moko b/sys/arch/moko/conf/Makefile.moko
index 679f04310bc..da51679d237 100644
--- a/sys/arch/moko/conf/Makefile.moko
+++ b/sys/arch/moko/conf/Makefile.moko
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.moko,v 1.17 2010/04/27 16:50:15 jsg Exp $
+# $OpenBSD: Makefile.moko,v 1.18 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -41,8 +41,6 @@ CMACHFLAGS+= -msoft-float -fno-builtin-printf -fno-builtin-log \
COPTS?= -O2
CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
AFLAGS= -x assembler-with-cpp -D_LOCORE ${CMACHFLAGS}
-#LINKFLAGS= -Ttext 0xF0000020 -e start --warn-common
-#LINKFLAGS= -T ${_machdir}/conf/kern.ldscript
LINKFLAGS= -T ldscript
LINKFLAGS+= --warn-common
STRIPFLAGS= -g -X -x
diff --git a/sys/arch/mvme68k/conf/Makefile.mvme68k b/sys/arch/mvme68k/conf/Makefile.mvme68k
index 6f3b04c0cd0..d109bd3be25 100644
--- a/sys/arch/mvme68k/conf/Makefile.mvme68k
+++ b/sys/arch/mvme68k/conf/Makefile.mvme68k
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mvme68k,v 1.46 2010/04/27 16:54:54 deraadt Exp $
+# $OpenBSD: Makefile.mvme68k,v 1.47 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,7 +24,7 @@ _arch?= m68k
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D${_mach} -Dmc68020
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/mvmeppc/conf/Makefile.mvmeppc b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
index c56f4badad4..7bee8479541 100644
--- a/sys/arch/mvmeppc/conf/Makefile.mvmeppc
+++ b/sys/arch/mvmeppc/conf/Makefile.mvmeppc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.mvmeppc,v 1.43 2010/04/27 16:54:54 deraadt Exp $
+# $OpenBSD: Makefile.mvmeppc,v 1.44 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,7 +24,7 @@ _arch?= powerpc
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/palm/conf/Makefile.palm b/sys/arch/palm/conf/Makefile.palm
index 171f65d5aa5..a5dcf1ea700 100644
--- a/sys/arch/palm/conf/Makefile.palm
+++ b/sys/arch/palm/conf/Makefile.palm
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.palm,v 1.14 2010/04/27 16:50:15 jsg Exp $
+# $OpenBSD: Makefile.palm,v 1.15 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -41,8 +41,6 @@ CMACHFLAGS+= -msoft-float -fno-builtin-printf -fno-builtin-log \
COPTS?= -O2
CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
AFLAGS= -x assembler-with-cpp -D_LOCORE ${CMACHFLAGS}
-#LINKFLAGS= -Ttext 0xF0000020 -e start --warn-common
-#LINKFLAGS= -T ${_machdir}/conf/kern.ldscript
LINKFLAGS= -T ldscript
LINKFLAGS+= --warn-common
STRIPFLAGS= -g -X -x
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index 29ae699b6a6..daf3111c27c 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.sgi,v 1.37 2010/04/27 16:54:54 deraadt Exp $
+# $OpenBSD: Makefile.sgi,v 1.38 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -34,7 +34,7 @@ _arch?= mips64
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
CDIAGFLAGS= -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/socppc/conf/Makefile.socppc b/sys/arch/socppc/conf/Makefile.socppc
index 18eb871d48e..d2d2b8a1282 100644
--- a/sys/arch/socppc/conf/Makefile.socppc
+++ b/sys/arch/socppc/conf/Makefile.socppc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.socppc,v 1.17 2010/04/27 16:54:54 deraadt Exp $
+# $OpenBSD: Makefile.socppc,v 1.18 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,7 +24,7 @@ _arch?= powerpc
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} -D_KERNEL -D__${_mach}__
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-uninitialized -Wno-format -Wno-main \
diff --git a/sys/arch/vax/conf/Makefile.vax b/sys/arch/vax/conf/Makefile.vax
index 472b1df2916..adace42e9bb 100644
--- a/sys/arch/vax/conf/Makefile.vax
+++ b/sys/arch/vax/conf/Makefile.vax
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.vax,v 1.45 2010/04/27 16:40:55 deraadt Exp $
+# $OpenBSD: Makefile.vax,v 1.46 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,7 +24,7 @@ _arch?= vax
_machdir?= $S/arch/${_mach}
_archdir?= $S/arch/${_arch}
-INCLUDES= -I. -I$S -I$S/arch -nostdinc
+INCLUDES= -nostdinc -I. -I$S -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_VAX_INLINE_
CWARNFLAGS?= -Werror -Wall -Wmissing-prototypes -Wstrict-prototypes \
-Wno-main -Wno-format -Wno-uninitialized \
diff --git a/sys/arch/zaurus/conf/Makefile.zaurus b/sys/arch/zaurus/conf/Makefile.zaurus
index 85a5d2d8b14..0e24c2f044b 100644
--- a/sys/arch/zaurus/conf/Makefile.zaurus
+++ b/sys/arch/zaurus/conf/Makefile.zaurus
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.zaurus,v 1.27 2010/04/27 16:50:15 jsg Exp $
+# $OpenBSD: Makefile.zaurus,v 1.28 2010/04/27 17:25:19 drahn Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -41,8 +41,6 @@ CMACHFLAGS+= -msoft-float -fno-builtin-printf -fno-builtin-log \
COPTS?= -O2
CFLAGS= ${DEBUG} ${CDIAGFLAGS} ${CMACHFLAGS} ${COPTS} ${PIPE}
AFLAGS= -x assembler-with-cpp -D_LOCORE ${CMACHFLAGS}
-#LINKFLAGS= -Ttext 0xF0000020 -e start --warn-common
-#LINKFLAGS= -T ${_machdir}/conf/kern.ldscript
LINKFLAGS= -T ldscript
LINKFLAGS+= --warn-common
STRIPFLAGS= -g -X -x
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 02:04:48 +0000