A few adjustments.

5 files changed, 25 insertions, 20 deletions

diff --git a/sys/arch/powerpc/Makefile b/sys/arch/powerpc/Makefile
index ee2611fdecc..e32f7db8e15 100644
--- a/sys/arch/powerpc/Makefile
+++ b/sys/arch/powerpc/Makefile
@@ -1,7 +1,7 @@
 NOPROG=	noprog
 NOMAN=	noman
 
-SUBDIR=	stand
+SUBDIR=
 
 obj:	_SUBDIRUSE
 
diff --git a/sys/arch/powerpc/conf/DDB b/sys/arch/powerpc/conf/DDB
index 02566b89764..193a8e5c4b9 100644
--- a/sys/arch/powerpc/conf/DDB
+++ b/sys/arch/powerpc/conf/DDB
@@ -8,8 +8,7 @@ maxusers	32
 
 # Standard system options (should go into std.powerpc?)
 option		SWAPPAGER, VNODEPAGER, DEVPAGER
-option		EXEC_ELF
-option		EXEC_SCRIPT
+option		NATIVE_ELF
 
 # various hacks due to bugs in Openfirmware implementation
 option		FIREPOWERBUGS
diff --git a/sys/arch/powerpc/conf/Makefile.powerpc b/sys/arch/powerpc/conf/Makefile.powerpc
index 1b45426dbfa..b7edd6476c8 100644
--- a/sys/arch/powerpc/conf/Makefile.powerpc
+++ b/sys/arch/powerpc/conf/Makefile.powerpc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.powerpc,v 1.5 1997/10/13 09:39:32 pefo Exp $
+#	$OpenBSD: Makefile.powerpc,v 1.6 1997/10/13 13:49:56 pefo Exp $
 #
 # Makefile for OpenBSD PowerPC
 #
@@ -23,7 +23,9 @@
 # DEBUG is set to -g if debugging.
 # PROF is set to -pg if profiling.
 
+AS?=	as
 CC?=	cc
+CPP?=	cpp
 LD?=	ld
 MKDEP?=	mkdep
 STRIP?=	strip
@@ -34,7 +36,7 @@ SIZE?=	size
 #S!=	cd ../../../..; pwd
 #.endif
 S=	../../../..
-PPC=	$S/arch/powerpc
+PPC=	../..
 
 INCLUDES=	-I. -I$S/arch -I$S -nostdinc -L${DESTDIR}/usr/include
 CPPFLAGS=	${INCLUDES} ${IDENT} -D_KERNEL \
@@ -65,20 +67,23 @@ LIBCOMPAT=	${COMPATLIB}
 LIBCOMPAT=	${COMPATLIB_PROF}
 .endif
 
-# compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
-# HOSTED}, and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
+# compile rules: rules are named ${TYPE}_${SUFFIX}${CONFIG_DEP}
+# where TYPE is NORMAL, DRIVER, or PROFILE}; SUFFIX is the file suffix,
+# capitalized (e.g. C for a .c file), and CONFIG_DEP is _C if the file
+# is marked as config-dependent.
+
+USRLAND_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
+USRLAND_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
 
 NORMAL_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
+NORMAL_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
+
+DRIVER_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<
+DRIVER_C_C=	${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} ${PARAM} -c $<
 
 NORMAL_S=	${CC} ${AFLAGS} ${CPPFLAGS} -c $<
+NORMAL_S_C=	${AS}  ${COPTS} ${PARAM} $< -o $@
 
-HOSTED_C=	${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
-
-#.c.o:
-#	${NORMAL_C}
-#
-#.S.o:
-#	${NORMAL_S}
 
 %OBJS
 
@@ -91,8 +96,7 @@ HOSTED_C=	${HOSTCC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
-SYSTEM_OBJ=	locore.o \
-		param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
+SYSTEM_OBJ=	locore.o param.o ioconf.o ${OBJS} ${LIBKERN} ${LIBCOMPAT}
 SYSTEM_DEP=	Makefile ${SYSTEM_OBJ}
 SYSTEM_LD_HEAD=	rm -f $@
 SYSTEM_LD=	@echo ${LD} ${LINKFLAGS} -o $@ '$${SYSTEM_OBJ}' vers.o; \
@@ -121,7 +125,7 @@ param.c: $S/conf/param.c
 	cp $S/conf/param.c .
 
 param.o: param.c Makefile
-	${NORMAL_C}
+	${NORMAL_C_C}
 
 ioconf.o: ioconf.c
 	${NORMAL_C}
diff --git a/sys/arch/powerpc/include/db_machdep.h b/sys/arch/powerpc/include/db_machdep.h
index ffa033ee78d..adf9503e8b7 100644
--- a/sys/arch/powerpc/include/db_machdep.h
+++ b/sys/arch/powerpc/include/db_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.h,v 1.2 1997/03/21 00:48:48 niklas Exp $	*/
+/*	$OpenBSD: db_machdep.h,v 1.3 1997/10/13 13:49:57 pefo Exp $	*/
 /*	$NetBSD: db_machdep.h,v 1.13 1996/04/29 20:50:08 leo Exp $	*/
 
 /* 
@@ -33,6 +33,8 @@
 #ifndef	_PPC_DB_MACHDEP_H_
 #define	_PPC_DB_MACHDEP_H_
 
+#define	MID_MACHINE 0
+
 #include <vm/vm_prot.h>
 #include <vm/vm_param.h>
 #include <vm/vm_inherit.h>
diff --git a/sys/arch/powerpc/include/disklabel.h b/sys/arch/powerpc/include/disklabel.h
index 12fc143328a..d8f908231fc 100644
--- a/sys/arch/powerpc/include/disklabel.h
+++ b/sys/arch/powerpc/include/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.6 1997/10/13 10:53:42 pefo Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.7 1997/10/13 13:49:57 pefo Exp $	*/
 
 /*
  * Copyright (c) 1994 Christopher G. Demetriou
@@ -74,7 +74,7 @@ struct mbr_partition {
 
 #include <sys/dkbad.h>
 struct cpu_disklabel {
-	struct dos_partition dosparts[NDOSPART];
+	struct mbr_partition dosparts[NMBRPART];
 	struct dkbad bad;
 };