Better dependency rules in files.alpha, also point to cpuconf.c in the

source tree instead of copying it to the kernel compilation directory for
no good reason.

3 files changed, 12 insertions, 22 deletions

diff --git a/sys/arch/alpha/alpha/fp_complete.c b/sys/arch/alpha/alpha/fp_complete.c
index 4971c0f3add..d4304d48067 100644
--- a/sys/arch/alpha/alpha/fp_complete.c
+++ b/sys/arch/alpha/alpha/fp_complete.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fp_complete.c,v 1.4 2004/07/06 21:53:59 deraadt Exp $	*/
+/*	$OpenBSD: fp_complete.c,v 1.5 2006/02/23 23:54:56 miod Exp $	*/
 /*	$NetBSD: fp_complete.c,v 1.5 2002/01/18 22:15:56 ross Exp $	*/
 
 /*-
@@ -34,8 +34,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef NO_IEEE
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/proc.h>
@@ -694,4 +692,3 @@ done:
 	}
 	return 0;
 }
-#endif
diff --git a/sys/arch/alpha/conf/Makefile.alpha b/sys/arch/alpha/conf/Makefile.alpha
index 4ac3f1c4416..671cb13cf00 100644
--- a/sys/arch/alpha/conf/Makefile.alpha
+++ b/sys/arch/alpha/conf/Makefile.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.alpha,v 1.35 2005/06/17 21:53:06 miod Exp $
+#	$OpenBSD: Makefile.alpha,v 1.36 2006/02/23 23:54:59 miod Exp $
 #	$NetBSD: Makefile.alpha,v 1.27 1996/12/01 06:12:25 jonathan Exp $
 
 # Makefile for OpenBSD
@@ -84,8 +84,7 @@ HOSTED_C=	${HOSTED_CC} ${HOSTED_CFLAGS} ${HOSTED_CPPFLAGS} -c $<
 #	${SYSTEM_LD_HEAD}
 #	${SYSTEM_LD} swapxxx.o
 #	${SYSTEM_LD_TAIL}
-SYSTEM_OBJ=	locore.o cpuconf.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; \
@@ -144,12 +143,12 @@ links:
 	  sed 's,../.*/\(.*.o\),rm -f \1; ln -s ../GENERIC/\1 \1,' > makelinks
 	sh makelinks && rm -f dontlink
 
-SRCS=	${ALPHA}/alpha/locore.s ${ALPHA}/alpha/cpuconf.c \
-	param.c ioconf.c ${CFILES} ${SFILES}
+SRCS=	${ALPHA}/alpha/locore.s param.c ioconf.c ${CFILES} ${SFILES}
 depend:: .depend
-.depend: ${SRCS} assym.h param.c cpuconf.c
+.depend: ${SRCS} assym.h param.c ${ALPHA}/alpha/cpuconf.c
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${ALPHA}/alpha/locore.s
-	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} cpuconf.c param.c ioconf.c ${CFILES}
+	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} ${ALPHA}/alpha/cpuconf.c \
+	    param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
 	sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
 	    ${CPPFLAGS} < ${ALPHA}/alpha/genassym.cf
@@ -173,12 +172,6 @@ clock.o machdep.o apecs.o cia.o lca.o ioasic.o scc.o icasic.o: Makefile
 locore.o: ${ALPHA}/alpha/locore.s assym.h
 	${NORMAL_S}
 
-cpuconf.o: cpuconf.c
-	${NORMAL_C}
-
-cpuconf.c: ${ALPHA}/alpha/cpuconf.c
-	cp ${ALPHA}/alpha/cpuconf.c .
-
 # The install target can be redefined by putting a
 # install-kernel-${MACHINE_NAME} target into /etc/mk.conf
 MACHINE_NAME!=  uname -n
diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index 4e86f8de4f0..7c279208051 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.alpha,v 1.71 2006/02/23 20:14:14 miod Exp $
+#	$OpenBSD: files.alpha,v 1.72 2006/02/23 23:54:59 miod Exp $
 #	$NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
 #
 # alpha-specific configuration info
@@ -160,7 +160,7 @@ include	"dev/eisa/files.eisa"
 
 # include "dev/pci/files.pci" XXX SEE ABOVE
 
-file	arch/alpha/pci/pciide_machdep.c		pci
+file	arch/alpha/pci/pciide_machdep.c		pciide
 
 define	alpha_pci_sgmap_pte64
 file	arch/alpha/pci/pci_sgmap_pte64.c	alpha_pci_sgmap_pte64
@@ -201,7 +201,7 @@ file	arch/alpha/pci/irongate_pci.c		irongate
 
 device	tsc {}
 attach	tsc at mainbus
-file	arch/alpha/pci/tsc.c			dec_6600
+file	arch/alpha/pci/tsc.c			tsc
 
 device	tsp: pcibus, alpha_sgmap, alpha_pci_sgmap_pte64
 attach	tsp at tsc
@@ -275,7 +275,7 @@ file	arch/alpha/alpha/process_machdep.c
 file	arch/alpha/alpha/prom.c
 file	arch/alpha/alpha/sys_machdep.c
 file	arch/alpha/alpha/trap.c
-file	arch/alpha/alpha/fp_complete.c
+file	arch/alpha/alpha/fp_complete.c		!no_ieee
 file	arch/alpha/alpha/vm_machdep.c
 file	arch/alpha/alpha/disksubr.c
 file	arch/alpha/dev/bus_dma.c
@@ -291,7 +291,7 @@ file	arch/alpha/alpha/in_cksum.c		inet
 file	arch/alpha/alpha/promcons.c
 
 # XXX
-# file	arch/alpha/alpha/cpuconf.c
+file	arch/alpha/alpha/cpuconf.c
 file	arch/alpha/alpha/dec_2100_a50.c		dec_2100_a50	needs-flag
 file	arch/alpha/alpha/dec_21000.c		dec_21000	needs-flag
 file	arch/alpha/alpha/dec_3000_300.c		dec_3000_300	needs-flag