From bce20da1b3148ad72d69fae1f2ce515d84c7125d Mon Sep 17 00:00:00 2001
From: KATO Takenori <kato@FreeBSD.org>
Date: Mon, 30 Jun 1997 09:57:33 +0000
Subject: [PATCH] Synchronize with sys/i386/conf/Makefile.i386 and files.i386
 revisions 1.100 and 1.166, respectively.

---
 sys/conf/Makefile.pc98      | 5 +++--
 sys/conf/files.pc98         | 4 ++--
 sys/pc98/conf/Makefile.pc98 | 5 +++--
 sys/pc98/conf/files.pc98    | 4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/sys/conf/Makefile.pc98 b/sys/conf/Makefile.pc98
index 744cd26a7f93..8ad826eabcb3 100644
--- a/sys/conf/Makefile.pc98
+++ b/sys/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.pc98,v 1.17 1997/05/31 12:39:08 kato Exp $
+#	$Id: Makefile.pc98,v 1.18 1997/06/02 09:20:46 kato Exp $
 #
 # Makefile for FreeBSD
 #
@@ -41,8 +41,9 @@ INCLUDES+= -I/usr/include
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 LOAD_ADDRESS?=	F0100000
+DEFINED_PROF=	${PROF}
 .if defined(PROF)
-PROF+=	-malign-functions=4
+CFLAGS+=	-malign-functions=4
 .if ${PROFLEVEL} >= 2
 IDENT+=	-DGPROF4 -DGUPROF
 PROF+=	-mprofiler-epilogue
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index b3133d73943a..6fd4c30b3316 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-#	$Id: files.pc98,v 1.26 1997/06/02 09:22:55 kato Exp $
+#	$Id: files.pc98,v 1.27 1997/06/02 15:45:27 kato Exp $
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
@@ -133,7 +133,7 @@ i386/isa/if_wl.c		optional	wl	device-driver
 #pc98/isa/if_ze.c		optional	ze	device-driver
 i386/isa/if_zp.c		optional	zp	device-driver
 i386/isa/ipl_funcs.c		standard				   \
-	compile-with	"${CC} -c ${CFLAGS} ${PROF:S/^$/-fomit-frame-pointer/} $<"
+	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} $<"
 i386/isa/intr_machdep.c		standard
 pc98/pc98/pc98.c		optional	isa	device-driver
 pc98/isa/istallion.c		optional	stli	device-driver
diff --git a/sys/pc98/conf/Makefile.pc98 b/sys/pc98/conf/Makefile.pc98
index 744cd26a7f93..8ad826eabcb3 100644
--- a/sys/pc98/conf/Makefile.pc98
+++ b/sys/pc98/conf/Makefile.pc98
@@ -3,7 +3,7 @@
 # Makefile.i386 -- with config changes.
 # Copyright 1990 W. Jolitz
 #	from: @(#)Makefile.i386	7.1 5/10/91
-#	$Id: Makefile.pc98,v 1.17 1997/05/31 12:39:08 kato Exp $
+#	$Id: Makefile.pc98,v 1.18 1997/06/02 09:20:46 kato Exp $
 #
 # Makefile for FreeBSD
 #
@@ -41,8 +41,9 @@ INCLUDES+= -I/usr/include
 COPTS=	${INCLUDES} ${IDENT} -DKERNEL -include opt_global.h
 CFLAGS=	${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS}
 LOAD_ADDRESS?=	F0100000
+DEFINED_PROF=	${PROF}
 .if defined(PROF)
-PROF+=	-malign-functions=4
+CFLAGS+=	-malign-functions=4
 .if ${PROFLEVEL} >= 2
 IDENT+=	-DGPROF4 -DGUPROF
 PROF+=	-mprofiler-epilogue
diff --git a/sys/pc98/conf/files.pc98 b/sys/pc98/conf/files.pc98
index b3133d73943a..6fd4c30b3316 100644
--- a/sys/pc98/conf/files.pc98
+++ b/sys/pc98/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-#	$Id: files.pc98,v 1.26 1997/06/02 09:22:55 kato Exp $
+#	$Id: files.pc98,v 1.27 1997/06/02 15:45:27 kato Exp $
 #
 aic7xxx_asm			optional	ahc	device-driver	   \
 	dependency 	"$S/dev/aic7xxx/*.[chyl]"			   \
@@ -133,7 +133,7 @@ i386/isa/if_wl.c		optional	wl	device-driver
 #pc98/isa/if_ze.c		optional	ze	device-driver
 i386/isa/if_zp.c		optional	zp	device-driver
 i386/isa/ipl_funcs.c		standard				   \
-	compile-with	"${CC} -c ${CFLAGS} ${PROF:S/^$/-fomit-frame-pointer/} $<"
+	compile-with	"${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} $<"
 i386/isa/intr_machdep.c		standard
 pc98/pc98/pc98.c		optional	isa	device-driver
 pc98/isa/istallion.c		optional	stli	device-driver