Use a split genassym.cf scheme on mips64 ports. Don't forget to rerun config(8).

5 files changed, 102 insertions, 180 deletions

diff --git a/sys/arch/loongson/conf/Makefile.loongson b/sys/arch/loongson/conf/Makefile.loongson
index bf6c56a10c7..134d7a5304a 100644
--- a/sys/arch/loongson/conf/Makefile.loongson
+++ b/sys/arch/loongson/conf/Makefile.loongson
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.loongson,v 1.1 2009/12/25 21:05:14 miod Exp $
+#	$OpenBSD: Makefile.loongson,v 1.2 2010/01/03 14:17:26 miod Exp $
 
 # Makefile for OpenBSD
 #
@@ -127,9 +127,11 @@ if_arp.o if_ether.o: Makefile
 ip_input.o ip_output.o in_pcb.o in_proto.o: Makefile
 tcp_subr.o tcp_timer.o tcp_output.o: Makefile
 
-assym.h: $S/kern/genassym.sh ${LOONGSON}/loongson/genassym.cf Makefile
-	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \
-	    ${PARAM} < ${LOONGSON}/loongson/genassym.cf > assym.h.tmp && \
+assym.h: $S/kern/genassym.sh \
+	 ${MIPS64}/mips64/genassym.cf ${LOONGSON}/loongson/genassym.cf Makefile
+	cat ${MIPS64}/mips64/genassym.cf ${LOONGSON}/loongson/genassym.cf | \
+	    sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} \
+	    > assym.h.tmp && \
 	    mv -f assym.h.tmp assym.h
 
 links:
@@ -167,8 +169,8 @@ depend:: .depend
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${LOONGSON}/loongson/locore.S
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
-	    ${CPPFLAGS} < ${LOONGSON}/loongson/genassym.cf
+	cat ${MIPS64}/mips64/genassym.cf ${LOONGSON}/loongson/genassym.cf | \
+	    sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS}
 	@sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \
 	    < assym.dep >> .depend
 	@rm -f assym.dep
diff --git a/sys/arch/loongson/loongson/genassym.cf b/sys/arch/loongson/loongson/genassym.cf
index 006c31bf809..8b39b50d5b7 100644
--- a/sys/arch/loongson/loongson/genassym.cf
+++ b/sys/arch/loongson/loongson/genassym.cf
@@ -1,84 +1 @@
-#	$OpenBSD: genassym.cf,v 1.2 2010/01/01 15:03:58 miod Exp $
-#
-# Copyright (c) 1997 Per Fogelstrom / Opsycon AB
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-
-
-include <sys/param.h>
-include <sys/buf.h>
-include <sys/proc.h>
-include <sys/mbuf.h>
-include <sys/user.h>
-include <sys/siginfo.h>
-
-include <uvm/uvm.h>
-
-include <machine/cpu.h>
-
-export	SONPROC
-
-struct	proc
-member	p_stat
-member	p_addr
-member	p_vmspace
-member	P_ASTPENDING	p_md.md_astpending
-member	P_PC_CTRL	p_md.md_pc_ctrl
-member	P_PC_COUNT	p_md.md_pc_count
-member	P_WATCH_1	p_md.md_watch_1
-member	P_WATCH_2	p_md.md_watch_2
-member	P_WATCH_M	p_md.md_watch_m
-
-struct	pcb
-member	pcb_regs
-member	PCB_FPREGS	pcb_regs.f0
-member	pcb_context
-member	pcb_onfault
-member	pcb_segtab
-
-struct	cpu_info
-member	ci_curproc
-member	ci_curprocpaddr
-member	ci_ipl
-
-export	CKSEG0_BASE
-export	CKSEG1_BASE
-export	VM_MIN_KERNEL_ADDRESS
-export	SIGFPE
-
-struct	vmspace
-member	VMSPACE_PMAP	vm_map.pmap
-
-struct	pmap
-member	pm_tlbpid
-export	NPTEPG
-export	PMAP_SEGTABSIZE
-export	SEGSHIFT
-
-export	CCA_CACHED
-
-export	FPE_FLTDIV
-export	FPE_FLTOVF
-export	FPE_FLTUND
-export	FPE_FLTRES
-export	FPE_FLTINV
+#	$OpenBSD: genassym.cf,v 1.3 2010/01/03 14:17:27 miod Exp $
diff --git a/sys/arch/mips64/mips64/genassym.cf b/sys/arch/mips64/mips64/genassym.cf
new file mode 100644
index 00000000000..c2f139e06de
--- /dev/null
+++ b/sys/arch/mips64/mips64/genassym.cf
@@ -0,0 +1,84 @@
+#	$OpenBSD: genassym.cf,v 1.1 2010/01/03 14:17:27 miod Exp $
+#
+# Copyright (c) 1997 Per Fogelstrom / Opsycon AB
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+
+
+include <sys/param.h>
+include <sys/buf.h>
+include <sys/proc.h>
+include <sys/mbuf.h>
+include <sys/user.h>
+include <sys/siginfo.h>
+
+include <uvm/uvm.h>
+
+include <machine/cpu.h>
+
+export	SONPROC
+
+struct	proc
+member	p_stat
+member	p_addr
+member	p_vmspace
+member	P_ASTPENDING	p_md.md_astpending
+member	P_PC_CTRL	p_md.md_pc_ctrl
+member	P_PC_COUNT	p_md.md_pc_count
+member	P_WATCH_1	p_md.md_watch_1
+member	P_WATCH_2	p_md.md_watch_2
+member	P_WATCH_M	p_md.md_watch_m
+
+struct	pcb
+member	pcb_regs
+member	PCB_FPREGS	pcb_regs.f0
+member	pcb_context
+member	pcb_onfault
+member	pcb_segtab
+
+struct	cpu_info
+member	ci_curproc
+member	ci_curprocpaddr
+member	ci_ipl
+
+export	CKSEG0_BASE
+export	CKSEG1_BASE
+export	VM_MIN_KERNEL_ADDRESS
+export	SIGFPE
+
+struct	vmspace
+member	VMSPACE_PMAP	vm_map.pmap
+
+struct	pmap
+member	pm_tlbpid
+export	NPTEPG
+export	PMAP_SEGTABSIZE
+export	SEGSHIFT
+
+export	CCA_CACHED
+
+export	FPE_FLTDIV
+export	FPE_FLTOVF
+export	FPE_FLTUND
+export	FPE_FLTRES
+export	FPE_FLTINV
diff --git a/sys/arch/sgi/conf/Makefile.sgi b/sys/arch/sgi/conf/Makefile.sgi
index 61cfe503b18..9175bacf386 100644
--- a/sys/arch/sgi/conf/Makefile.sgi
+++ b/sys/arch/sgi/conf/Makefile.sgi
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.sgi,v 1.25 2009/10/19 19:46:56 guenther Exp $
+#	$OpenBSD: Makefile.sgi,v 1.26 2010/01/03 14:17:27 miod Exp $
 
 # Makefile for OpenBSD
 #
@@ -134,9 +134,11 @@ if_arp.o if_ether.o: Makefile
 ip_input.o ip_output.o in_pcb.o in_proto.o: Makefile
 tcp_subr.o tcp_timer.o tcp_output.o: Makefile
 
-assym.h: $S/kern/genassym.sh ${SGI}/sgi/genassym.cf Makefile
-	sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} \
-	    ${PARAM} < ${SGI}/sgi/genassym.cf > assym.h.tmp && \
+assym.h: $S/kern/genassym.sh \
+	 ${MIPS64}/mips64/genassym.cf ${SGI}/sgi/genassym.cf Makefile
+	cat ${MIPS64}/mips64/genassym.cf ${SGI}/sgi/genassym.cf | \
+	    sh $S/kern/genassym.sh ${CC} ${CFLAGS} ${CPPFLAGS} ${PARAM} \
+	    > assym.h.tmp && \
 	    mv -f assym.h.tmp assym.h
 
 links:
@@ -174,8 +176,8 @@ depend:: .depend
 	${MKDEP} ${AFLAGS} ${CPPFLAGS} ${SGI}/sgi/locore.S
 	${MKDEP} -a ${CFLAGS} ${CPPFLAGS} param.c ioconf.c ${CFILES}
 	${MKDEP} -a ${AFLAGS} ${CPPFLAGS} ${SFILES}
-	sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} \
-	    ${CPPFLAGS} < ${SGI}/sgi/genassym.cf
+	cat ${MIPS64}/mips64/genassym.cf ${SGI}/sgi/genassym.cf | \
+	    sh $S/kern/genassym.sh ${MKDEP} -f assym.dep ${CFLAGS} ${CPPFLAGS}
 	@sed -e 's/.*\.o: /assym.h: /' -e 's/\/tmp\/genassym_c.[^ ]*//' \
 	    < assym.dep >> .depend
 	@rm -f assym.dep
diff --git a/sys/arch/sgi/sgi/genassym.cf b/sys/arch/sgi/sgi/genassym.cf
index 63d59099eae..b15a8532fc8 100644
--- a/sys/arch/sgi/sgi/genassym.cf
+++ b/sys/arch/sgi/sgi/genassym.cf
@@ -1,84 +1 @@
-#	$OpenBSD: genassym.cf,v 1.20 2010/01/01 15:04:00 miod Exp $
-#
-# Copyright (c) 1997 Per Fogelstrom / Opsycon AB
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-#
-
-
-include <sys/param.h>
-include <sys/buf.h>
-include <sys/proc.h>
-include <sys/mbuf.h>
-include <sys/user.h>
-include <sys/siginfo.h>
-
-include <uvm/uvm.h>
-
-include <machine/cpu.h>
-
-export	SONPROC
-
-struct	proc
-member	p_stat
-member	p_addr
-member	p_vmspace
-member	P_ASTPENDING	p_md.md_astpending
-member	P_PC_CTRL	p_md.md_pc_ctrl
-member	P_PC_COUNT	p_md.md_pc_count
-member	P_WATCH_1	p_md.md_watch_1
-member	P_WATCH_2	p_md.md_watch_2
-member	P_WATCH_M	p_md.md_watch_m
-
-struct	pcb
-member	pcb_regs
-member	PCB_FPREGS	pcb_regs.f0
-member	pcb_context
-member	pcb_onfault
-member	pcb_segtab
-
-struct	cpu_info
-member	ci_curproc
-member	ci_curprocpaddr
-member	ci_ipl
-
-export	CKSEG0_BASE
-export	CKSEG1_BASE
-export	VM_MIN_KERNEL_ADDRESS
-export	SIGFPE
-
-struct	vmspace
-member	VMSPACE_PMAP	vm_map.pmap
-
-struct	pmap
-member	pm_tlbpid
-export	NPTEPG
-export	PMAP_SEGTABSIZE
-export	SEGSHIFT
-
-export	CCA_CACHED
-
-export	FPE_FLTDIV
-export	FPE_FLTOVF
-export	FPE_FLTUND
-export	FPE_FLTRES
-export	FPE_FLTINV
+#	$OpenBSD: genassym.cf,v 1.21 2010/01/03 14:17:27 miod Exp $