Module Name: src
Committed By: skrll
Date: Wed Jan 24 09:04:46 UTC 2018
Modified Files:
src: build.sh
src/distrib/cdrom: Makefile current.conf
src/distrib/notes: Makefile
src/distrib/notes/common: contents macros main postinstall sysinst
src/distrib/sets/lists/base: ad.arm mi
src/distrib/sets/lists/comp: ad.aarch64 ad.arm
src/distrib/sets/lists/man: mi
src/distrib/utils/x_disklabel: Makefile
src/doc: RESPONSIBLE
src/etc/mtree: NetBSD.dist.base
src/external/gpl2/groff/dist/tmac: doc-common groff_mdoc.man
src/external/gpl2/send-pr/dist/send-pr: categories
src/external/gpl3/gdb/dist/gdb: arm-nbsd-nat.c
src/sbin/disklabel: Makefile main.c
src/share/examples/disktab: disktab
src/share/man/man4: Makefile ddb.4 iic.4 podulebus.4
src/share/man/man7: hier.7
src/share/man/man8: Makefile
src/share/mk: bsd.own.mk
src/sys/arch: Makefile README
src/sys/arch/acorn32/stand/boot32: boot32.c
src/sys/arch/arm/arm: arm_machdep.c ast.c bcopyinout.S
compat_16_machdep.c copystr.S cpu_in_cksum.S db_trace.c fiq.c
fiq_subr.S fusu.S lock_cas.S process_machdep.c sig_machdep.c
syscall.c undefined.c
src/sys/arch/arm/arm32: genassym.cf
src/sys/arch/arm/conf: files.arm
src/sys/arch/arm/include: armreg.h cpu.h cpufunc.h db_machdep.h frame.h
locore.h pcb.h profile.h
src/sys/arch/arm/include/arm32: pmap.h types.h
src/sys/arch/arm/xscale: becc_intr.h i80321_intr.h pxa2x0_intr.h
src/sys/arch/iyonix: TODO
src/sys/arch/usermode/usermode: vm_machdep.c
src/sys/compat/linux/arch/arm: linux_sys_machdep.c
src/sys/dev/ic: ncr5380var.h
src/sys/modules: Makefile.assym
src/sys/sys: mman.h
src/tools: headerlist
src/usr.sbin/crash: Makefile
src/usr.sbin/sysinst: Makefile
src/usr.sbin/sysinst/arch/acorn32: md.c
Removed Files:
src/distrib/acorn26: Makefile
src/distrib/acorn26/cdroms: Makefile
src/distrib/acorn26/cdroms/installcd: Makefile
src/distrib/acorn26/instkernel: Makefile dot.profile list
src/distrib/notes/acorn26: Makefile contents hardware install prep
upgrade xfer
src/etc/etc.acorn26: MAKEDEV.conf Makefile.inc ttys
src/share/man/man4/man4.acorn26: Makefile arckbd.4 cpu.4 eca.4 eh.4
iobus.4 unixbp.4
src/share/man/man8/man8.acorn26: Makefile boot26.8
src/sys/arch/acorn26: Makefile
src/sys/arch/acorn26/acorn26: autoconf.c bus.c bus_asm.S conf.c
cons_machdep.c cpu.c cpuswitch.c cpuvar.h db_interface.c
db_machdep.c except.c fpu.c fpu_asm.S fpuvar.h genassym.cf irq.c
locore.S machdep.c pmap.c rscons.c start.c stubs.c sys_machdep.c
vm_machdep.c
src/sys/arch/acorn26/compile: Makefile
src/sys/arch/acorn26/conf: FOURMEG GENERIC INSTALL Makefile.acorn26
TESTING files.acorn26 majors.acorn26 std.acorn26
src/sys/arch/acorn26/include: Makefile ansi.h aout_machdep.h asm.h
boot.h bootconfig.h bswap.h bus_defs.h bus_funcs.h cdefs.h cpu.h
db_machdep.h disklabel.h elf_machdep.h endian.h endian_machdep.h
fiq.h float.h fpureg.h frame.h ieee.h ieeefp.h int_const.h
int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h intr.h irq.h
limits.h loadfile_machdep.h lock.h machdep.h math.h mcontext.h
memcreg.h mutex.h param.h pcb.h pmap.h pmc.h podulebus_machdep.h
proc.h profile.h ptrace.h reg.h rwlock.h setjmp.h signal.h
softintr.h stdarg.h sysarch.h trap.h types.h vmparam.h
wchar_limits.h
src/sys/arch/acorn26/iobus: iobus.c iobusvar.h ioc.c iocreg.h iocvar.h
upc_iobus.c
src/sys/arch/acorn26/ioc: arckbd.c arckbdmap.c arckbdreg.h arckbdvar.h
arcpp.c arcppreg.h if_eca.c if_eca_fiq.S if_ecavar.h ioc_fiq_util.S
iociic.c iociicvar.h ioeb.c ioebreg.h ioebvar.h latches.c
latchreg.h latchvar.h ssn.c
src/sys/arch/acorn26/podulebus: if_eh.c if_ehreg.h podloader_asm.S
podulebus.c podulebusreg.h powerrom.c unixbp.c unixbpreg.h
unixbpvar.h
src/sys/arch/acorn26/stand: Makefile Makefile.buildboot
src/sys/arch/acorn26/stand/boot26: Makefile boot26.c rmheader.S start.S
version
src/sys/arch/acorn26/stand/lib: Makefile Makefile.inc devopen.c
newvers_rm.sh riscoscalls.S riscoscalls.h riscoscons.c riscosdisk.c
riscosdisk.h riscoserrors.c riscosfile.c riscosfile.h srt0.S srt1.c
src/sys/arch/acorn26/vidc: arcvideo.c arcvideovar.h vidcreg.h
vidmodes.c
src/sys/arch/arm/include/arm26: Makefile types.h
src/usr.sbin/sysinst/arch/acorn26: Makefile md.c md.h menus.md.en
menus.md.es menus.md.fr menus.md.pl msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl
Log Message:
Remove port-acorn26
OK core@
To generate a diff of this commit:
cvs rdiff -u -r1.323 -r1.324 src/build.sh
cvs rdiff -u -r1.4 -r0 src/distrib/acorn26/Makefile
cvs rdiff -u -r1.1 -r0 src/distrib/acorn26/cdroms/Makefile
cvs rdiff -u -r1.1 -r0 src/distrib/acorn26/cdroms/installcd/Makefile
cvs rdiff -u -r1.17 -r0 src/distrib/acorn26/instkernel/Makefile
cvs rdiff -u -r1.3 -r0 src/distrib/acorn26/instkernel/dot.profile
cvs rdiff -u -r1.21 -r0 src/distrib/acorn26/instkernel/list
cvs rdiff -u -r1.51 -r1.52 src/distrib/cdrom/Makefile
cvs rdiff -u -r1.12 -r1.13 src/distrib/cdrom/current.conf
cvs rdiff -u -r1.44 -r1.45 src/distrib/notes/Makefile
cvs rdiff -u -r1.2 -r0 src/distrib/notes/acorn26/Makefile \
src/distrib/notes/acorn26/contents src/distrib/notes/acorn26/upgrade
cvs rdiff -u -r1.4 -r0 src/distrib/notes/acorn26/hardware \
src/distrib/notes/acorn26/prep
cvs rdiff -u -r1.3 -r0 src/distrib/notes/acorn26/install \
src/distrib/notes/acorn26/xfer
cvs rdiff -u -r1.171 -r1.172 src/distrib/notes/common/contents
cvs rdiff -u -r1.42 -r1.43 src/distrib/notes/common/macros
cvs rdiff -u -r1.539 -r1.540 src/distrib/notes/common/main
cvs rdiff -u -r1.81 -r1.82 src/distrib/notes/common/postinstall
cvs rdiff -u -r1.106 -r1.107 src/distrib/notes/common/sysinst
cvs rdiff -u -r1.77 -r1.78 src/distrib/sets/lists/base/ad.arm
cvs rdiff -u -r1.1168 -r1.1169 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/comp/ad.aarch64
cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/comp/ad.arm
cvs rdiff -u -r1.1571 -r1.1572 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/x_disklabel/Makefile
cvs rdiff -u -r1.119 -r1.120 src/doc/RESPONSIBLE
cvs rdiff -u -r1.6 -r0 src/etc/etc.acorn26/MAKEDEV.conf
cvs rdiff -u -r1.10 -r0 src/etc/etc.acorn26/Makefile.inc
cvs rdiff -u -r1.4 -r0 src/etc/etc.acorn26/ttys
cvs rdiff -u -r1.166 -r1.167 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/groff/dist/tmac/doc-common
cvs rdiff -u -r1.4 -r1.5 src/external/gpl2/groff/dist/tmac/groff_mdoc.man
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/send-pr/dist/send-pr/categories
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c
cvs rdiff -u -r1.72 -r1.73 src/sbin/disklabel/Makefile
cvs rdiff -u -r1.47 -r1.48 src/sbin/disklabel/main.c
cvs rdiff -u -r1.2 -r1.3 src/share/examples/disktab/disktab
cvs rdiff -u -r1.650 -r1.651 src/share/man/man4/Makefile
cvs rdiff -u -r1.170 -r1.171 src/share/man/man4/ddb.4
cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/iic.4
cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/podulebus.4
cvs rdiff -u -r1.6 -r0 src/share/man/man4/man4.acorn26/Makefile
cvs rdiff -u -r1.4 -r0 src/share/man/man4/man4.acorn26/arckbd.4 \
src/share/man/man4/man4.acorn26/iobus.4
cvs rdiff -u -r1.2 -r0 src/share/man/man4/man4.acorn26/cpu.4 \
src/share/man/man4/man4.acorn26/eca.4 \
src/share/man/man4/man4.acorn26/unixbp.4
cvs rdiff -u -r1.3 -r0 src/share/man/man4/man4.acorn26/eh.4
cvs rdiff -u -r1.127 -r1.128 src/share/man/man7/hier.7
cvs rdiff -u -r1.104 -r1.105 src/share/man/man8/Makefile
cvs rdiff -u -r1.3 -r0 src/share/man/man8/man8.acorn26/Makefile
cvs rdiff -u -r1.8 -r0 src/share/man/man8/man8.acorn26/boot26.8
cvs rdiff -u -r1.1027 -r1.1028 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/Makefile
cvs rdiff -u -r1.62 -r1.63 src/sys/arch/README
cvs rdiff -u -r1.3 -r0 src/sys/arch/acorn26/Makefile
cvs rdiff -u -r1.10 -r0 src/sys/arch/acorn26/acorn26/autoconf.c \
src/sys/arch/acorn26/acorn26/stubs.c
cvs rdiff -u -r1.7 -r0 src/sys/arch/acorn26/acorn26/bus.c
cvs rdiff -u -r1.6 -r0 src/sys/arch/acorn26/acorn26/bus_asm.S
cvs rdiff -u -r1.9 -r0 src/sys/arch/acorn26/acorn26/conf.c \
src/sys/arch/acorn26/acorn26/db_machdep.c
cvs rdiff -u -r1.13 -r0 src/sys/arch/acorn26/acorn26/cons_machdep.c \
src/sys/arch/acorn26/acorn26/genassym.cf
cvs rdiff -u -r1.29 -r0 src/sys/arch/acorn26/acorn26/cpu.c \
src/sys/arch/acorn26/acorn26/vm_machdep.c
cvs rdiff -u -r1.18 -r0 src/sys/arch/acorn26/acorn26/cpuswitch.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/acorn26/acorn26/cpuvar.h \
src/sys/arch/acorn26/acorn26/fpuvar.h \
src/sys/arch/acorn26/acorn26/rscons.c
cvs rdiff -u -r1.21 -r0 src/sys/arch/acorn26/acorn26/db_interface.c \
src/sys/arch/acorn26/acorn26/start.c
cvs rdiff -u -r1.31 -r0 src/sys/arch/acorn26/acorn26/except.c
cvs rdiff -u -r1.14 -r0 src/sys/arch/acorn26/acorn26/fpu.c
cvs rdiff -u -r1.3 -r0 src/sys/arch/acorn26/acorn26/fpu_asm.S
cvs rdiff -u -r1.17 -r0 src/sys/arch/acorn26/acorn26/irq.c
cvs rdiff -u -r1.23 -r0 src/sys/arch/acorn26/acorn26/locore.S
cvs rdiff -u -r1.38 -r0 src/sys/arch/acorn26/acorn26/machdep.c
cvs rdiff -u -r1.39 -r0 src/sys/arch/acorn26/acorn26/pmap.c
cvs rdiff -u -r1.5 -r0 src/sys/arch/acorn26/acorn26/sys_machdep.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/acorn26/compile/Makefile
cvs rdiff -u -r1.50 -r0 src/sys/arch/acorn26/conf/FOURMEG
cvs rdiff -u -r1.85 -r0 src/sys/arch/acorn26/conf/GENERIC
cvs rdiff -u -r1.45 -r0 src/sys/arch/acorn26/conf/INSTALL
cvs rdiff -u -r1.12 -r0 src/sys/arch/acorn26/conf/Makefile.acorn26
cvs rdiff -u -r1.3 -r0 src/sys/arch/acorn26/conf/TESTING
cvs rdiff -u -r1.16 -r0 src/sys/arch/acorn26/conf/files.acorn26
cvs rdiff -u -r1.21 -r0 src/sys/arch/acorn26/conf/majors.acorn26
cvs rdiff -u -r1.4 -r0 src/sys/arch/acorn26/conf/std.acorn26
cvs rdiff -u -r1.13 -r0 src/sys/arch/acorn26/include/Makefile \
src/sys/arch/acorn26/include/types.h
cvs rdiff -u -r1.1 -r0 src/sys/arch/acorn26/include/ansi.h \
src/sys/arch/acorn26/include/aout_machdep.h \
src/sys/arch/acorn26/include/asm.h \
src/sys/arch/acorn26/include/bootconfig.h \
src/sys/arch/acorn26/include/bswap.h \
src/sys/arch/acorn26/include/bus_defs.h \
src/sys/arch/acorn26/include/bus_funcs.h \
src/sys/arch/acorn26/include/cdefs.h src/sys/arch/acorn26/include/cpu.h \
src/sys/arch/acorn26/include/elf_machdep.h \
src/sys/arch/acorn26/include/endian.h \
src/sys/arch/acorn26/include/endian_machdep.h \
src/sys/arch/acorn26/include/fiq.h src/sys/arch/acorn26/include/float.h \
src/sys/arch/acorn26/include/fpureg.h src/sys/arch/acorn26/include/ieee.h \
src/sys/arch/acorn26/include/ieeefp.h \
src/sys/arch/acorn26/include/int_const.h \
src/sys/arch/acorn26/include/int_fmtio.h \
src/sys/arch/acorn26/include/int_limits.h \
src/sys/arch/acorn26/include/int_mwgwtypes.h \
src/sys/arch/acorn26/include/int_types.h \
src/sys/arch/acorn26/include/limits.h src/sys/arch/acorn26/include/lock.h \
src/sys/arch/acorn26/include/math.h src/sys/arch/acorn26/include/pcb.h \
src/sys/arch/acorn26/include/pmc.h src/sys/arch/acorn26/include/profile.h \
src/sys/arch/acorn26/include/ptrace.h src/sys/arch/acorn26/include/reg.h \
src/sys/arch/acorn26/include/setjmp.h \
src/sys/arch/acorn26/include/signal.h \
src/sys/arch/acorn26/include/stdarg.h \
src/sys/arch/acorn26/include/sysarch.h \
src/sys/arch/acorn26/include/trap.h
cvs rdiff -u -r1.4 -r0 src/sys/arch/acorn26/include/boot.h \
src/sys/arch/acorn26/include/frame.h \
src/sys/arch/acorn26/include/memcreg.h \
src/sys/arch/acorn26/include/param.h src/sys/arch/acorn26/include/proc.h
cvs rdiff -u -r1.10 -r0 src/sys/arch/acorn26/include/db_machdep.h \
src/sys/arch/acorn26/include/pmap.h
cvs rdiff -u -r1.5 -r0 src/sys/arch/acorn26/include/disklabel.h \
src/sys/arch/acorn26/include/loadfile_machdep.h
cvs rdiff -u -r1.12 -r0 src/sys/arch/acorn26/include/intr.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/acorn26/include/irq.h \
src/sys/arch/acorn26/include/mcontext.h \
src/sys/arch/acorn26/include/mutex.h \
src/sys/arch/acorn26/include/rwlock.h \
src/sys/arch/acorn26/include/softintr.h \
src/sys/arch/acorn26/include/wchar_limits.h
cvs rdiff -u -r1.7 -r0 src/sys/arch/acorn26/include/machdep.h
cvs rdiff -u -r1.3 -r0 src/sys/arch/acorn26/include/podulebus_machdep.h
cvs rdiff -u -r1.14 -r0 src/sys/arch/acorn26/include/vmparam.h
cvs rdiff -u -r1.16 -r0 src/sys/arch/acorn26/iobus/iobus.c
cvs rdiff -u -r1.3 -r0 src/sys/arch/acorn26/iobus/iobusvar.h
cvs rdiff -u -r1.22 -r0 src/sys/arch/acorn26/iobus/ioc.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/acorn26/iobus/iocreg.h
cvs rdiff -u -r1.7 -r0 src/sys/arch/acorn26/iobus/iocvar.h
cvs rdiff -u -r1.10 -r0 src/sys/arch/acorn26/iobus/upc_iobus.c
cvs rdiff -u -r1.24 -r0 src/sys/arch/acorn26/ioc/arckbd.c
cvs rdiff -u -r1.5 -r0 src/sys/arch/acorn26/ioc/arckbdmap.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/acorn26/ioc/arckbdreg.h \
src/sys/arch/acorn26/ioc/if_eca_fiq.S \
src/sys/arch/acorn26/ioc/ioc_fiq_util.S \
src/sys/arch/acorn26/ioc/iociicvar.h src/sys/arch/acorn26/ioc/latchreg.h
cvs rdiff -u -r1.3 -r0 src/sys/arch/acorn26/ioc/arckbdvar.h \
src/sys/arch/acorn26/ioc/ioebvar.h src/sys/arch/acorn26/ioc/latchvar.h
cvs rdiff -u -r1.15 -r0 src/sys/arch/acorn26/ioc/arcpp.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/acorn26/ioc/arcppreg.h \
src/sys/arch/acorn26/ioc/ioebreg.h
cvs rdiff -u -r1.14 -r0 src/sys/arch/acorn26/ioc/if_eca.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/acorn26/ioc/if_ecavar.h
cvs rdiff -u -r1.10 -r0 src/sys/arch/acorn26/ioc/iociic.c
cvs rdiff -u -r1.8 -r0 src/sys/arch/acorn26/ioc/ioeb.c
cvs rdiff -u -r1.9 -r0 src/sys/arch/acorn26/ioc/latches.c
cvs rdiff -u -r1.12 -r0 src/sys/arch/acorn26/ioc/ssn.c
cvs rdiff -u -r1.17 -r0 src/sys/arch/acorn26/podulebus/if_eh.c
cvs rdiff -u -r1.1 -r0 src/sys/arch/acorn26/podulebus/if_ehreg.h \
src/sys/arch/acorn26/podulebus/unixbpreg.h
cvs rdiff -u -r1.3 -r0 src/sys/arch/acorn26/podulebus/podloader_asm.S
cvs rdiff -u -r1.21 -r0 src/sys/arch/acorn26/podulebus/podulebus.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/acorn26/podulebus/podulebusreg.h
cvs rdiff -u -r1.5 -r0 src/sys/arch/acorn26/podulebus/powerrom.c
cvs rdiff -u -r1.8 -r0 src/sys/arch/acorn26/podulebus/unixbp.c
cvs rdiff -u -r1.4 -r0 src/sys/arch/acorn26/podulebus/unixbpvar.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/acorn26/stand/Makefile
cvs rdiff -u -r1.23 -r0 src/sys/arch/acorn26/stand/Makefile.buildboot
cvs rdiff -u -r1.3 -r0 src/sys/arch/acorn26/stand/boot26/Makefile
cvs rdiff -u -r1.7 -r0 src/sys/arch/acorn26/stand/boot26/boot26.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/acorn26/stand/boot26/rmheader.S
cvs rdiff -u -r1.1 -r0 src/sys/arch/acorn26/stand/boot26/start.S
cvs rdiff -u -r1.4 -r0 src/sys/arch/acorn26/stand/boot26/version
cvs rdiff -u -r1.4 -r0 src/sys/arch/acorn26/stand/lib/Makefile \
src/sys/arch/acorn26/stand/lib/Makefile.inc \
src/sys/arch/acorn26/stand/lib/newvers_rm.sh
cvs rdiff -u -r1.1 -r0 src/sys/arch/acorn26/stand/lib/devopen.c \
src/sys/arch/acorn26/stand/lib/riscoscons.c \
src/sys/arch/acorn26/stand/lib/riscosdisk.h \
src/sys/arch/acorn26/stand/lib/riscoserrors.c \
src/sys/arch/acorn26/stand/lib/srt0.S
cvs rdiff -u -r1.5 -r0 src/sys/arch/acorn26/stand/lib/riscoscalls.S \
src/sys/arch/acorn26/stand/lib/riscoscalls.h \
src/sys/arch/acorn26/stand/lib/riscosfile.c \
src/sys/arch/acorn26/stand/lib/srt1.c
cvs rdiff -u -r1.2 -r0 src/sys/arch/acorn26/stand/lib/riscosdisk.c
cvs rdiff -u -r1.3 -r0 src/sys/arch/acorn26/stand/lib/riscosfile.h
cvs rdiff -u -r1.17 -r0 src/sys/arch/acorn26/vidc/arcvideo.c
cvs rdiff -u -r1.3 -r0 src/sys/arch/acorn26/vidc/arcvideovar.h \
src/sys/arch/acorn26/vidc/vidcreg.h src/sys/arch/acorn26/vidc/vidmodes.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/acorn32/stand/boot32/boot32.c
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/arm/arm_machdep.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/arm/ast.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/arm/bcopyinout.S
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/arm/compat_16_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/arm/copystr.S \
src/sys/arch/arm/arm/cpu_in_cksum.S src/sys/arch/arm/arm/lock_cas.S
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/arm/arm/db_trace.c \
src/sys/arch/arm/arm/process_machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/fiq.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/arm/fiq_subr.S
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/arm/fusu.S
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/arm/sig_machdep.c
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/arm/arm/syscall.c
cvs rdiff -u -r1.60 -r1.61 src/sys/arch/arm/arm/undefined.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/arm/arm32/genassym.cf
cvs rdiff -u -r1.137 -r1.138 src/sys/arch/arm/conf/files.arm
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/arm/include/armreg.h
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/arm/include/cpu.h
cvs rdiff -u -r1.77 -r1.78 src/sys/arch/arm/include/cpufunc.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/arm/include/db_machdep.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/include/frame.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/include/locore.h
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/arm/include/pcb.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/include/profile.h
cvs rdiff -u -r1.2 -r0 src/sys/arch/arm/include/arm26/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/include/arm26/types.h
cvs rdiff -u -r1.153 -r1.154 src/sys/arch/arm/include/arm32/pmap.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/include/arm32/types.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/xscale/becc_intr.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/xscale/i80321_intr.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/xscale/pxa2x0_intr.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/iyonix/TODO
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/usermode/usermode/vm_machdep.c
cvs rdiff -u -r1.14 -r1.15 src/sys/compat/linux/arch/arm/linux_sys_machdep.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/ic/ncr5380var.h
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/Makefile.assym
cvs rdiff -u -r1.52 -r1.53 src/sys/sys/mman.h
cvs rdiff -u -r1.14 -r1.15 src/tools/headerlist
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/crash/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/Makefile
cvs rdiff -u -r1.1 -r0 src/usr.sbin/sysinst/arch/acorn26/Makefile \
src/usr.sbin/sysinst/arch/acorn26/md.c \
src/usr.sbin/sysinst/arch/acorn26/md.h \
src/usr.sbin/sysinst/arch/acorn26/menus.md.en \
src/usr.sbin/sysinst/arch/acorn26/menus.md.es \
src/usr.sbin/sysinst/arch/acorn26/menus.md.fr \
src/usr.sbin/sysinst/arch/acorn26/menus.md.pl \
src/usr.sbin/sysinst/arch/acorn26/msg.md.de \
src/usr.sbin/sysinst/arch/acorn26/msg.md.en \
src/usr.sbin/sysinst/arch/acorn26/msg.md.es \
src/usr.sbin/sysinst/arch/acorn26/msg.md.fr \
src/usr.sbin/sysinst/arch/acorn26/msg.md.pl
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/acorn32/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/build.sh
diff -u src/build.sh:1.323 src/build.sh:1.324
--- src/build.sh:1.323 Mon Jan 15 20:39:53 2018
+++ src/build.sh Wed Jan 24 09:04:40 2018
@@ -1,5 +1,5 @@
#! /usr/bin/env sh
-# $NetBSD: build.sh,v 1.323 2018/01/15 20:39:53 uwe Exp $
+# $NetBSD: build.sh,v 1.324 2018/01/24 09:04:40 skrll Exp $
#
# Copyright (c) 2001-2011 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -614,7 +614,6 @@ level of source directory"
# and with a blank MACHINE_ARCH.
#
valid_MACHINE_ARCH='
-MACHINE=acorn26 MACHINE_ARCH=arm
MACHINE=acorn32 MACHINE_ARCH=arm
MACHINE=algor MACHINE_ARCH=mips64el ALIAS=algor64
MACHINE=algor MACHINE_ARCH=mipsel DEFAULT
@@ -1933,7 +1932,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
-# Generated from: \$NetBSD: build.sh,v 1.323 2018/01/15 20:39:53 uwe Exp $
+# Generated from: \$NetBSD: build.sh,v 1.324 2018/01/24 09:04:40 skrll Exp $
# with these arguments: ${_args}
#
Index: src/distrib/cdrom/Makefile
diff -u src/distrib/cdrom/Makefile:1.51 src/distrib/cdrom/Makefile:1.52
--- src/distrib/cdrom/Makefile:1.51 Sat Feb 11 03:07:06 2017
+++ src/distrib/cdrom/Makefile Wed Jan 24 09:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2017/02/11 03:07:06 christos Exp $
+# $NetBSD: Makefile,v 1.52 2018/01/24 09:04:40 skrll Exp $
#
# Consult "*.conf" for the configuration variables; this Makefile is typically
# not edited for basic configuration changes.
@@ -144,7 +144,6 @@ EASTER_EGG?= /dev/null
##### MACHINE_ARCH for possible shared sets for each (shared) port #####
-MACHINE_ARCH.acorn26= arm
MACHINE_ARCH.acorn32= arm
MACHINE_ARCH.algor= mipsel
MACHINE_ARCH.amiga= m68k
Index: src/distrib/cdrom/current.conf
diff -u src/distrib/cdrom/current.conf:1.12 src/distrib/cdrom/current.conf:1.13
--- src/distrib/cdrom/current.conf:1.12 Mon Feb 24 07:23:38 2014
+++ src/distrib/cdrom/current.conf Wed Jan 24 09:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: current.conf,v 1.12 2014/02/24 07:23:38 skrll Exp $
+# $NetBSD: current.conf,v 1.13 2018/01/24 09:04:40 skrll Exp $
#
# Makefile fragment for CD sets; includes config information.
@@ -29,7 +29,6 @@ CD_IMAGES= ${targetcd}-${ISO_RELEASE}
CD_IMAGES+= multi-cd1-${ISO_RELEASE}
CD_IMAGES+= multi-cd2-${ISO_RELEASE}
CD_IMAGES+= multi-cd3-${ISO_RELEASE}
-CD_IMAGES+= acorn26cd-${ISO_RELEASE}
CD_IMAGES+= acorn32cd-${ISO_RELEASE}
CD_IMAGES+= algorcd-${ISO_RELEASE}
CD_IMAGES+= alphacd-${ISO_RELEASE}
@@ -157,7 +156,6 @@ BASE_PORTS.multi-cd2-${ISO_RELEASE} = al
BASE_PORTS.multi-cd3-${ISO_RELEASE}= cobalt hpcmips pmax # vax
-BASE_PORTS.acorn26cd-${ISO_RELEASE}=acorn26
BASE_PORTS.acorn32cd-${ISO_RELEASE}=acorn32
BASE_PORTS.algorcd-${ISO_RELEASE}=algor
BASE_PORTS.alphacd-${ISO_RELEASE}=alpha
Index: src/distrib/notes/Makefile
diff -u src/distrib/notes/Makefile:1.44 src/distrib/notes/Makefile:1.45
--- src/distrib/notes/Makefile:1.44 Mon Feb 24 07:23:39 2014
+++ src/distrib/notes/Makefile Wed Jan 24 09:04:40 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2014/02/24 07:23:39 skrll Exp $
+# $NetBSD: Makefile,v 1.45 2018/01/24 09:04:40 skrll Exp $
#
.include <bsd.own.mk>
@@ -10,7 +10,6 @@ TARGETS+= release
SUBDIR= ${RELEASEMACHINE}
.endif
.else
-SUBDIR+= acorn26
SUBDIR+= acorn32
SUBDIR+= alpha
SUBDIR+= amd64
Index: src/distrib/notes/common/contents
diff -u src/distrib/notes/common/contents:1.171 src/distrib/notes/common/contents:1.172
--- src/distrib/notes/common/contents:1.171 Sun Jan 11 04:03:47 2015
+++ src/distrib/notes/common/contents Wed Jan 24 09:04:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: contents,v 1.171 2015/01/11 04:03:47 snj Exp $
+.\" $NetBSD: contents,v 1.172 2018/01/24 09:04:41 skrll Exp $
.\"
.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -121,12 +121,6 @@ and 2.4 systems (i.e. those that have fl
It has a RAM-disk installer.
.\}
.
-.if \n[acorn26] \{\
-. It Pa netbsd-FOURMEG.gz
-A somewhat smaller kernel, intended to be usable on systems with
-four megabytes of RAM.
-.\}
-.
.if \n[acorn32] \{\
. It Pa netbsd-NC.gz
A kernel intended for Acorn Network Computers.
@@ -982,19 +976,6 @@ command from the root directory (
.\" ---------------------------- MD DISCUSSION
.
.
-.if \n[acorn26] \{\
-.Pp
-There is a copy of the
-.Nx Ns /acorn26
-bootloader,
-.Ic boot26 ,
-in the
-.Pa installation/misc
-subdirectory.
-This is a RISC OS relocatable module, and should have its file
-type set to ffa (Module) once it's been copied to a RISC OS system.
-.\}
-.
.
.if \n[atari] \{\
.Pp
Index: src/distrib/notes/common/macros
diff -u src/distrib/notes/common/macros:1.42 src/distrib/notes/common/macros:1.43
--- src/distrib/notes/common/macros:1.42 Tue May 19 19:45:57 2015
+++ src/distrib/notes/common/macros Wed Jan 24 09:04:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: macros,v 1.42 2015/05/19 19:45:57 snj Exp $
+.\" $NetBSD: macros,v 1.43 2018/01/24 09:04:41 skrll Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -369,7 +369,7 @@
.\" Define registers for MACHINE_ARCHs with multiple or different MACHINEs
.
.ds A \*M
-.if \n[acorn26]:\n[acorn32]:\n[cats]:\n[evbarm]:\n[hpcarm]:\n[iyonix]:\n[netwinder]:\n[shark]:\n[zaurus] .ds A arm
+.if \n[acorn32]:\n[cats]:\n[evbarm]:\n[hpcarm]:\n[iyonix]:\n[netwinder]:\n[shark]:\n[zaurus] .ds A arm
.if \n[sun2] .ds A m68000
.if \n[amiga]:\n[atari]:\n[cesfic]:\n[hp300]:\n[luna68k]:\n[mac68k]:\n[mvme68k]:\n[news68k]:\n[next68k]:\n[sun3]:\n[x68k] .ds A m68k
.if \n[emips]:\n[ews4800mips]:\n[mipsco]:\n[newsmips]:\n[sbmips]:\n[sgimips] .ds A mipseb
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.539 src/distrib/notes/common/main:1.540
--- src/distrib/notes/common/main:1.539 Wed Oct 25 18:07:33 2017
+++ src/distrib/notes/common/main Wed Jan 24 09:04:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: main,v 1.539 2017/10/25 18:07:33 utkarsh009 Exp $
+.\" $NetBSD: main,v 1.540 2018/01/24 09:04:41 skrll Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -41,7 +41,7 @@
.
.nr FOR_RELEASE 1
.nr DOC_XR 1
-.ds MACHINE_LIST acorn26 acorn32 algor alpha amd64 amiga amigappc arc atari
+.ds MACHINE_LIST acorn32 algor alpha amd64 amiga amigappc arc atari
.as MACHINE_LIST " bebox cats cesfic cobalt dreamcast emips evbarm evbmips
.as MACHINE_LIST " evbppc evbsh3 ews4800mips hp300 hppa hpcarm hpcmips hpcsh
.as MACHINE_LIST " i386 ibmnws iyonix landisk luna68k mac68k macppc mipsco
@@ -751,7 +751,7 @@ section near the beginning of this docum
.Pp
In
.Nx
-7.0, most ARM ports (all but acorn26, acorn32, and epoc32) have switched
+7.0, most ARM ports (all but acorn32, and epoc32) have switched
to the official standard ABI
.Pq EABI5
which is recommended by ARM for ELF binaries.
Index: src/distrib/notes/common/postinstall
diff -u src/distrib/notes/common/postinstall:1.81 src/distrib/notes/common/postinstall:1.82
--- src/distrib/notes/common/postinstall:1.81 Tue May 19 19:30:27 2015
+++ src/distrib/notes/common/postinstall Wed Jan 24 09:04:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: postinstall,v 1.81 2015/05/19 19:30:27 snj Exp $
+.\" $NetBSD: postinstall,v 1.82 2018/01/24 09:04:41 skrll Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -160,7 +160,6 @@ For example:
.Pp
.
.ds IFname le0
-.if \n[acorn26] .ds IFname ei0
.if \n[acorn32] .ds IFname ei0
.if \n[amd64] .ds IFname wm0
.if \n[arc] .ds IFname sn0
Index: src/distrib/notes/common/sysinst
diff -u src/distrib/notes/common/sysinst:1.106 src/distrib/notes/common/sysinst:1.107
--- src/distrib/notes/common/sysinst:1.106 Tue May 19 19:30:27 2015
+++ src/distrib/notes/common/sysinst Wed Jan 24 09:04:41 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: sysinst,v 1.106 2015/05/19 19:30:27 snj Exp $
+.\" $NetBSD: sysinst,v 1.107 2018/01/24 09:04:41 skrll Exp $
.\"
.\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -52,7 +52,7 @@
\n[playstation2]:\n[sandpoint]:\n[sbmips]:\n[sgimips]:\n[x86_64] \{\
. ds part_max p
.\}
-.if \n[acorn26]:\n[acorn32]:\n[cats]:\n[evbarm]:\n[evbppc]:\n[ews4800mips]:\
+.if \n[acorn32]:\n[cats]:\n[evbarm]:\n[evbppc]:\n[ews4800mips]:\
\n[sandpoint]:\n[shark] \{\
. ds part_usr e
.\}
@@ -83,7 +83,7 @@ covers many details for the sake of comp
Do not let this discourage you; the install program is not hard
to use.
.
-.if !\n[acorn26]:\n[acorn32]:\n[atari]:\n[ews4800mips]:\n[hppa]:\n[mac68k]:\n[macppc]:\n[mvme68k]:\n[news68k]:\n[newsmips]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64]:\n[x68k] \{\
+.if !\n[acorn32]:\n[atari]:\n[ews4800mips]:\n[hppa]:\n[mac68k]:\n[macppc]:\n[mvme68k]:\n[news68k]:\n[newsmips]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64]:\n[x68k] \{\
.It
.To 2 "Possible hardware problems"
.Em Possible hardware problems
@@ -97,7 +97,7 @@ Non-removable devices can be disabled wi
.Ic boot
.Fl c
to enter it).
-.\} \" !\n[acorn26]:\n[acorn32]:\n[atari]:\n[ews4800mips]:\n[hppa]:\n[mac68k]\:[macppc]:\n[mvme68k]:\n[news68k]:\n[newsmips]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64]:\n[x68k]
+.\} \" !\n[acorn32]:\n[atari]:\n[ews4800mips]:\n[hppa]:\n[mac68k]\:[macppc]:\n[mvme68k]:\n[news68k]:\n[newsmips]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64]:\n[x68k]
.if \n[mac68k] \{\
.It
.To 2 "Possible hardware-specific issues"
@@ -189,7 +189,7 @@ volume on a netboot server as described
.el \{\
.ie \n[mac68k] The Mac OS Booter application and an Installation Kernel
.el \{\
-.ie \n[acorn26]:\n[arc]:\n[cats]:\n[evbppc]:\n[macppc]:\n[sparc] \{\
+.ie \n[arc]:\n[cats]:\n[evbppc]:\n[macppc]:\n[sparc] \{\
Some form of bootable media, described above.
.\}
.el \{\
@@ -210,7 +210,6 @@ An FPU is not required but will be used
.ie !\n[amd64] \{\
.It
A minimum of
-.if \n[acorn26] 8 MB
.if \n[alpha] 32 MB
.if \n[arc] 16 MB
.if \n[atari] 4 MB (TT030/Falcon) or 16 MB (Hades/Milan)
@@ -233,7 +232,6 @@ of memory installed.
An optical drive.
.It
A hard drive with at least
-.if \n[acorn26] 500
.if \n[acorn32] 500
.if \n[alpha] 700
.if \n[amd64] 700
@@ -344,7 +342,7 @@ kernels while booting.
.It
The Quick Installation
.(bullet
-.ie \n[acorn26]:\n[atari]:\n[cats]:\n[evbppc]:\n[hppa]:\n[macppc]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64] \{\
+.ie \n[atari]:\n[cats]:\n[evbppc]:\n[hppa]:\n[macppc]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64] \{\
Boot the system as described above.
You should be at the
.Ic sysinst
@@ -640,13 +638,13 @@ As an alternative, try using the Traditi
method of installation described in the next section.
.\} \" \n[mac68k]
.el \{\
-.ie \n[acorn26]:\n[cats]:\n[evbppc]:\n[macppc]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64] \{\
+.ie \n[cats]:\n[evbppc]:\n[macppc]:\n[pmax]:\n[sgimips]:\n[sparc]:\n[sparc64] \{\
.Pp
You may want to read the
boot messages, to notice your disk's name and capacity.
Its name will be something like
.Li sd0
-.if \n[acorn26]:\n[cats]:\n[evbppc]:\n[macppc]:\n[sparc64] \{\
+.if \n[cats]:\n[evbppc]:\n[macppc]:\n[sparc64] \{\
or
.Li wd0
.\}
@@ -659,7 +657,7 @@ You will also need to know the name, to
.Ic sysinst
which disk to use.
The most important thing to know is that
-.if \n[acorn26]:\n[cats]:\n[evbppc]:\n[macppc]:\n[sparc64] \{\
+.if \n[cats]:\n[evbppc]:\n[macppc]:\n[sparc64] \{\
.Li wd0
is
.Nx Ns 's
@@ -966,7 +964,7 @@ or
.Li rz1
.\}
.el \{\
-.if \n[acorn26]:\n[alpha]:\n[amd64]:\n[cats]:\n[i386]:\n[mac68k]:\n[macppc]:\n[sparc64] \{\
+.if \n[alpha]:\n[amd64]:\n[cats]:\n[i386]:\n[mac68k]:\n[macppc]:\n[sparc64] \{\
.Li wd0 ,
.Li wd1 ,
.\}
Index: src/distrib/sets/lists/base/ad.arm
diff -u src/distrib/sets/lists/base/ad.arm:1.77 src/distrib/sets/lists/base/ad.arm:1.78
--- src/distrib/sets/lists/base/ad.arm:1.77 Fri Jul 3 15:11:04 2015
+++ src/distrib/sets/lists/base/ad.arm Wed Jan 24 09:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.77 2015/07/03 15:11:04 matt Exp $
+# $NetBSD: ad.arm,v 1.78 2018/01/24 09:04:41 skrll Exp $
./libexec/ld.elf_so-oabi base-sysutil-bin compat,pic
./sbin/ldconfig base-sysutil-root pic,endian=1234
./usr/bin/fdformat base-util-bin
@@ -13,8 +13,8 @@
./usr/libexec/ld.elf_so-oabi base-sysutil-bin compat,pic
./usr/libexec/ld.so base-sys-shlib pic,endian=1234
./usr/mdec/BBBB base-obsolete obsolete
-./usr/mdec/boot26 base-sysutil-bin endian=1234,!eabi
-./usr/mdec/boot26,ffa base-sysutil-bin endian=1234,!eabi
+./usr/mdec/boot26 base-obsolete obsolete
+./usr/mdec/boot26,ffa base-obsolete obsolete
./usr/mdec/boot32 base-sysutil-bin endian=1234,!eabi
./usr/mdec/boot32,ffa base-sysutil-bin endian=1234,!eabi
./usr/mdec/bootimx23 base-sysutil-bin endian=1234
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1168 src/distrib/sets/lists/base/mi:1.1169
--- src/distrib/sets/lists/base/mi:1.1168 Sun Jan 14 22:46:09 2018
+++ src/distrib/sets/lists/base/mi Wed Jan 24 09:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1168 2018/01/14 22:46:09 christos Exp $
+# $NetBSD: mi,v 1.1169 2018/01/24 09:04:41 skrll Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -4360,7 +4360,7 @@
./usr/share/man/cat3f base-obsolete obsolete
./usr/share/man/cat3lua base-man-share
./usr/share/man/cat4 base-man-share
-./usr/share/man/cat4/acorn26 base-man-share
+./usr/share/man/cat4/acorn26 base-man-share obsolete
./usr/share/man/cat4/acorn32 base-man-share
./usr/share/man/cat4/alpha base-man-share
./usr/share/man/cat4/amiga base-man-share
@@ -4402,7 +4402,7 @@
./usr/share/man/cat6 base-man-share
./usr/share/man/cat7 base-man-share
./usr/share/man/cat8 base-man-share
-./usr/share/man/cat8/acorn26 base-man-share
+./usr/share/man/cat8/acorn26 base-man-share obsolete
./usr/share/man/cat8/acorn32 base-man-share
./usr/share/man/cat8/algor base-man-share
./usr/share/man/cat8/alpha base-man-share
@@ -4463,7 +4463,7 @@
./usr/share/man/cat8/x86 base-man-share
./usr/share/man/cat8/x86_64 base-obsolete obsolete
./usr/share/man/cat9 base-man-share
-./usr/share/man/cat9/acorn26 base-man-share
+./usr/share/man/cat9/acorn26 base-man-share obsolete
./usr/share/man/cat9/alpha base-man-share
./usr/share/man/cat9/amiga base-man-share
./usr/share/man/cat9/arm26 base-obsolete obsolete
@@ -4490,7 +4490,7 @@
./usr/share/man/html3f base-man-share
./usr/share/man/html3lua base-man-share
./usr/share/man/html4 base-man-share
-./usr/share/man/html4/acorn26 base-man-share
+./usr/share/man/html4/acorn26 base-man-share obsolete
./usr/share/man/html4/acorn32 base-man-share
./usr/share/man/html4/alpha base-man-share
./usr/share/man/html4/amiga base-man-share
@@ -4531,7 +4531,7 @@
./usr/share/man/html6 base-man-share
./usr/share/man/html7 base-man-share
./usr/share/man/html8 base-man-share
-./usr/share/man/html8/acorn26 base-man-share
+./usr/share/man/html8/acorn26 base-man-share obsolete
./usr/share/man/html8/acorn32 base-man-share
./usr/share/man/html8/algor base-man-share
./usr/share/man/html8/alpha base-man-share
@@ -4592,7 +4592,7 @@
./usr/share/man/html8/x86 base-man-share
./usr/share/man/html8/x86_64 base-obsolete obsolete
./usr/share/man/html9 base-man-share
-./usr/share/man/html9/acorn26 base-man-share
+./usr/share/man/html9/acorn26 base-man-share obsolete
./usr/share/man/html9/alpha base-man-share
./usr/share/man/html9/amiga base-man-share
./usr/share/man/html9/arm26 base-obsolete obsolete
@@ -4621,7 +4621,7 @@
./usr/share/man/man3f base-man-share
./usr/share/man/man3lua base-man-share
./usr/share/man/man4 base-man-share
-./usr/share/man/man4/acorn26 base-man-share
+./usr/share/man/man4/acorn26 base-man-share obsolete
./usr/share/man/man4/acorn32 base-man-share
./usr/share/man/man4/alpha base-man-share
./usr/share/man/man4/amiga base-man-share
@@ -4663,7 +4663,7 @@
./usr/share/man/man6 base-man-share
./usr/share/man/man7 base-man-share
./usr/share/man/man8 base-man-share
-./usr/share/man/man8/acorn26 base-man-share
+./usr/share/man/man8/acorn26 base-man-share obsolete
./usr/share/man/man8/acorn32 base-man-share
./usr/share/man/man8/algor base-man-share
./usr/share/man/man8/alpha base-man-share
@@ -4724,7 +4724,7 @@
./usr/share/man/man8/x86 base-man-share
./usr/share/man/man8/x86_64 base-obsolete obsolete
./usr/share/man/man9 base-man-share
-./usr/share/man/man9/acorn26 base-man-share
+./usr/share/man/man9/acorn26 base-man-share obsolete
./usr/share/man/man9/alpha base-man-share
./usr/share/man/man9/amiga base-man-share
./usr/share/man/man9/arm26 base-obsolete obsolete
Index: src/distrib/sets/lists/comp/ad.aarch64
diff -u src/distrib/sets/lists/comp/ad.aarch64:1.14 src/distrib/sets/lists/comp/ad.aarch64:1.15
--- src/distrib/sets/lists/comp/ad.aarch64:1.14 Thu Jan 5 13:45:51 2017
+++ src/distrib/sets/lists/comp/ad.aarch64 Wed Jan 24 09:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.14 2017/01/05 13:45:51 wiz Exp $
+# $NetBSD: ad.aarch64,v 1.15 2018/01/24 09:04:41 skrll Exp $
./usr/include/aarch64 comp-c-include
./usr/include/aarch64/ansi.h comp-c-include
./usr/include/aarch64/aout_machdep.h comp-c-include
@@ -52,8 +52,8 @@
./usr/include/arm/ansi.h comp-c-include
./usr/include/arm/aout_machdep.h comp-c-include
./usr/include/arm/apmvar.h comp-c-include
-./usr/include/arm/arm26 comp-c-include
-./usr/include/arm/arm26/types.h comp-c-include
+./usr/include/arm/arm26 comp-c-include obsolete
+./usr/include/arm/arm26/types.h comp-c-include obsolete
./usr/include/arm/arm32 comp-c-include
./usr/include/arm/arm32/frame.h comp-c-include
./usr/include/arm/arm32/katelib.h comp-obsolete obsolete
Index: src/distrib/sets/lists/comp/ad.arm
diff -u src/distrib/sets/lists/comp/ad.arm:1.79 src/distrib/sets/lists/comp/ad.arm:1.80
--- src/distrib/sets/lists/comp/ad.arm:1.79 Tue Aug 1 20:07:43 2017
+++ src/distrib/sets/lists/comp/ad.arm Wed Jan 24 09:04:41 2018
@@ -1,5 +1,5 @@
-# $NetBSD: ad.arm,v 1.79 2017/08/01 20:07:43 joerg Exp $
-./usr/include/acorn26 comp-c-include
+# $NetBSD: ad.arm,v 1.80 2018/01/24 09:04:41 skrll Exp $
+./usr/include/acorn26 comp-c-include obsolete
./usr/include/acorn26/ansi.h comp-obsolete obsolete
./usr/include/acorn26/aout_machdep.h comp-obsolete obsolete
./usr/include/acorn26/asm.h comp-obsolete obsolete
@@ -9,7 +9,7 @@
./usr/include/acorn26/cdefs.h comp-obsolete obsolete
./usr/include/acorn26/cpu.h comp-obsolete obsolete
./usr/include/acorn26/db_machdep.h comp-obsolete obsolete
-./usr/include/acorn26/disklabel.h comp-c-include
+./usr/include/acorn26/disklabel.h comp-c-include obsolete
./usr/include/acorn26/elf_machdep.h comp-obsolete obsolete
./usr/include/acorn26/endian.h comp-obsolete obsolete
./usr/include/acorn26/endian_machdep.h comp-obsolete obsolete
@@ -24,7 +24,7 @@
./usr/include/acorn26/int_limits.h comp-obsolete obsolete
./usr/include/acorn26/int_mwgwtypes.h comp-obsolete obsolete
./usr/include/acorn26/int_types.h comp-obsolete obsolete
-./usr/include/acorn26/intr.h comp-c-include
+./usr/include/acorn26/intr.h comp-c-include obsolete
./usr/include/acorn26/ipkdb.h comp-obsolete obsolete
./usr/include/acorn26/irq.h comp-obsolete obsolete
./usr/include/acorn26/limits.h comp-obsolete obsolete
@@ -48,7 +48,7 @@
./usr/include/acorn26/trap.h comp-obsolete obsolete
./usr/include/acorn26/types.h comp-obsolete obsolete
./usr/include/acorn26/varargs.h comp-obsolete obsolete
-./usr/include/acorn26/vmparam.h comp-c-include
+./usr/include/acorn26/vmparam.h comp-c-include obsolete
./usr/include/acorn26/wchar_limits.h comp-obsolete obsolete
./usr/include/acorn32 comp-c-include
./usr/include/acorn32/ansi.h comp-obsolete obsolete
@@ -110,8 +110,8 @@
./usr/include/arm/ansi.h comp-c-include
./usr/include/arm/aout_machdep.h comp-c-include
./usr/include/arm/apmvar.h comp-c-include
-./usr/include/arm/arm26 comp-c-include
-./usr/include/arm/arm26/types.h comp-c-include
+./usr/include/arm/arm26 comp-c-include obsolete
+./usr/include/arm/arm26/types.h comp-c-include obsolete
./usr/include/arm/arm32 comp-c-include
./usr/include/arm/arm32/bus.h comp-obsolete obsolete
./usr/include/arm/arm32/frame.h comp-c-include
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1571 src/distrib/sets/lists/man/mi:1.1572
--- src/distrib/sets/lists/man/mi:1.1571 Mon Jan 22 09:45:32 2018
+++ src/distrib/sets/lists/man/mi Wed Jan 24 09:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1571 2018/01/22 09:45:32 kamil Exp $
+# $NetBSD: mi,v 1.1572 2018/01/24 09:04:41 skrll Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -678,16 +678,16 @@
./usr/share/man/cat4/ac97.0 man-sys-catman .cat
./usr/share/man/cat4/acardide.0 man-sys-catman .cat
./usr/share/man/cat4/aceride.0 man-sys-catman .cat
-./usr/share/man/cat4/acorn26/arckbd.0 man-sys-catman .cat
+./usr/share/man/cat4/acorn26/arckbd.0 man-sys-catman obsolete
./usr/share/man/cat4/acorn26/arcwskbd.0 man-obsolete obsolete
./usr/share/man/cat4/acorn26/arcwsmouse.0 man-obsolete obsolete
-./usr/share/man/cat4/acorn26/cpu.0 man-sys-catman .cat
-./usr/share/man/cat4/acorn26/eca.0 man-sys-catman .cat
-./usr/share/man/cat4/acorn26/eh.0 man-sys-catman .cat
+./usr/share/man/cat4/acorn26/cpu.0 man-sys-catman obsolete
+./usr/share/man/cat4/acorn26/eca.0 man-sys-catman obsolete
+./usr/share/man/cat4/acorn26/eh.0 man-sys-catman obsolete
./usr/share/man/cat4/acorn26/ei.0 man-obsolete obsolete
-./usr/share/man/cat4/acorn26/iobus.0 man-sys-catman .cat
+./usr/share/man/cat4/acorn26/iobus.0 man-sys-catman obsolete
./usr/share/man/cat4/acorn26/podulebus.0 man-obsolete obsolete
-./usr/share/man/cat4/acorn26/unixbp.0 man-sys-catman .cat
+./usr/share/man/cat4/acorn26/unixbp.0 man-sys-catman obsolete
./usr/share/man/cat4/acorn32/asc.0 man-sys-catman .cat
./usr/share/man/cat4/acorn32/autoconf.0 man-sys-catman .cat
./usr/share/man/cat4/acorn32/beep.0 man-obsolete obsolete
@@ -2312,11 +2312,11 @@
./usr/share/man/cat8/ac.0 man-sysutil-catman .cat
./usr/share/man/cat8/accton.0 man-sysutil-catman .cat
./usr/share/man/cat8/acorn26/MAKEDEV.0 man-obsolete obsolete
-./usr/share/man/cat8/acorn26/boot.0 man-sys-catman .cat
-./usr/share/man/cat8/acorn26/boot26.0 man-sys-catman .cat
+./usr/share/man/cat8/acorn26/boot.0 man-sys-catman obsolete
+./usr/share/man/cat8/acorn26/boot26.0 man-sys-catman obsolete
./usr/share/man/cat8/acorn26/makedev.0 man-obsolete obsolete
-./usr/share/man/cat8/acorn32/MAKEDEV.0 man-obsolete obsolete
-./usr/share/man/cat8/acorn32/boot.0 man-sys-catman .cat
+./usr/share/man/cat8/acorn32/MAKEDEV.0 man-obsolete .cat
+./usr/share/man/cat8/acorn32/boot.0 man-sys-catman obsolete
./usr/share/man/cat8/acorn32/boot32.0 man-sys-catman .cat
./usr/share/man/cat8/acorn32/makedev.0 man-obsolete obsolete
./usr/share/man/cat8/acorn32/nbfs.0 man-sys-catman .cat
@@ -3860,14 +3860,14 @@
./usr/share/man/html4/ac97.html man-sys-htmlman html
./usr/share/man/html4/acardide.html man-sys-htmlman html
./usr/share/man/html4/aceride.html man-sys-htmlman html
-./usr/share/man/html4/acorn26/arckbd.html man-sys-htmlman html
+./usr/share/man/html4/acorn26/arckbd.html man-sys-htmlman obsolete
./usr/share/man/html4/acorn26/arcwskbd.html man-obsolete obsolete
./usr/share/man/html4/acorn26/arcwsmouse.html man-obsolete obsolete
-./usr/share/man/html4/acorn26/cpu.html man-sys-htmlman html
-./usr/share/man/html4/acorn26/eca.html man-sys-htmlman html
-./usr/share/man/html4/acorn26/eh.html man-sys-htmlman html
-./usr/share/man/html4/acorn26/iobus.html man-sys-htmlman html
-./usr/share/man/html4/acorn26/unixbp.html man-sys-htmlman html
+./usr/share/man/html4/acorn26/cpu.html man-sys-htmlman obsolete
+./usr/share/man/html4/acorn26/eca.html man-sys-htmlman obsolete
+./usr/share/man/html4/acorn26/eh.html man-sys-htmlman obsolete
+./usr/share/man/html4/acorn26/iobus.html man-sys-htmlman obsolete
+./usr/share/man/html4/acorn26/unixbp.html man-sys-htmlman obsolete
./usr/share/man/html4/acorn32/asc.html man-sys-htmlman html
./usr/share/man/html4/acorn32/autoconf.html man-sys-htmlman html
./usr/share/man/html4/acorn32/cosc.html man-sys-htmlman html
@@ -5342,8 +5342,8 @@
./usr/share/man/html8/MAKEDEV.local.html man-sysutil-htmlman html
./usr/share/man/html8/ac.html man-sysutil-htmlman html
./usr/share/man/html8/accton.html man-sysutil-htmlman html
-./usr/share/man/html8/acorn26/boot.html man-sys-htmlman html
-./usr/share/man/html8/acorn26/boot26.html man-sys-htmlman html
+./usr/share/man/html8/acorn26/boot.html man-sys-htmlman obsolete
+./usr/share/man/html8/acorn26/boot26.html man-sys-htmlman obsolete
./usr/share/man/html8/acorn32/boot.html man-sys-htmlman html
./usr/share/man/html8/acorn32/boot32.html man-sys-htmlman html
./usr/share/man/html8/acorn32/nbfs.html man-sys-htmlman html
@@ -6718,16 +6718,16 @@
./usr/share/man/man4/ac97.4 man-sys-man .man
./usr/share/man/man4/acardide.4 man-sys-man .man
./usr/share/man/man4/aceride.4 man-sys-man .man
-./usr/share/man/man4/acorn26/arckbd.4 man-sys-man .man
+./usr/share/man/man4/acorn26/arckbd.4 man-sys-man obsolete
./usr/share/man/man4/acorn26/arcwskbd.4 man-obsolete obsolete
./usr/share/man/man4/acorn26/arcwsmouse.4 man-obsolete obsolete
-./usr/share/man/man4/acorn26/cpu.4 man-sys-man .man
-./usr/share/man/man4/acorn26/eca.4 man-sys-man .man
-./usr/share/man/man4/acorn26/eh.4 man-sys-man .man
+./usr/share/man/man4/acorn26/cpu.4 man-sys-man obsolete
+./usr/share/man/man4/acorn26/eca.4 man-sys-man obsolete
+./usr/share/man/man4/acorn26/eh.4 man-sys-man obsolete
./usr/share/man/man4/acorn26/ei.4 man-obsolete obsolete
-./usr/share/man/man4/acorn26/iobus.4 man-sys-man .man
+./usr/share/man/man4/acorn26/iobus.4 man-sys-man obsolete
./usr/share/man/man4/acorn26/podulebus.4 man-obsolete obsolete
-./usr/share/man/man4/acorn26/unixbp.4 man-sys-man .man
+./usr/share/man/man4/acorn26/unixbp.4 man-sys-man obsolete
./usr/share/man/man4/acorn32/asc.4 man-sys-man .man
./usr/share/man/man4/acorn32/autoconf.4 man-sys-man .man
./usr/share/man/man4/acorn32/beep.4 man-obsolete obsolete
@@ -8351,8 +8351,8 @@
./usr/share/man/man8/ac.8 man-sysutil-man .man
./usr/share/man/man8/accton.8 man-sysutil-man .man
./usr/share/man/man8/acorn26/MAKEDEV.8 man-obsolete obsolete
-./usr/share/man/man8/acorn26/boot.8 man-sys-man .man
-./usr/share/man/man8/acorn26/boot26.8 man-sys-man .man
+./usr/share/man/man8/acorn26/boot.8 man-sys-man obsolete
+./usr/share/man/man8/acorn26/boot26.8 man-sys-man obsolete
./usr/share/man/man8/acorn26/makedev.8 man-obsolete obsolete
./usr/share/man/man8/acorn32/MAKEDEV.8 man-obsolete obsolete
./usr/share/man/man8/acorn32/boot.8 man-sys-man .man
Index: src/distrib/utils/x_disklabel/Makefile
diff -u src/distrib/utils/x_disklabel/Makefile:1.1 src/distrib/utils/x_disklabel/Makefile:1.2
--- src/distrib/utils/x_disklabel/Makefile:1.1 Sun Jan 31 18:56:49 2016
+++ src/distrib/utils/x_disklabel/Makefile Wed Jan 24 09:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2016/01/31 18:56:49 christos Exp $
+# $NetBSD: Makefile,v 1.2 2018/01/24 09:04:41 skrll Exp $
# Build a small disklabel (for tiny boot media)
SRCDIR= ${.CURDIR}/../../../sbin/disklabel
@@ -20,7 +20,7 @@ LDADD+= -lutil
CPPFLAGS+= -DSTRICT_CYLINDER_ALIGNMENT
.endif
-.if (${MACHINE} == "acorn32" || ${MACHINE} == "acorn26")
+.if ${MACHINE} == "acorn32"
# Support FileCore boot block
CPPFLAGS+= -DUSE_ACORN
.endif
Index: src/doc/RESPONSIBLE
diff -u src/doc/RESPONSIBLE:1.119 src/doc/RESPONSIBLE:1.120
--- src/doc/RESPONSIBLE:1.119 Sat Dec 16 08:01:34 2017
+++ src/doc/RESPONSIBLE Wed Jan 24 09:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: RESPONSIBLE,v 1.119 2017/12/16 08:01:34 mrg Exp $
+# $NetBSD: RESPONSIBLE,v 1.120 2018/01/24 09:04:41 skrll Exp $
List of sections of the system, and who is responsible for them (or at
least considered an expert on them).
@@ -263,7 +263,6 @@ ppp(sync) martin
Portmasters:
[should be synced with src/distrib/notes/common/main]
-acorn26 core
acorn32 reinoud
amd64 dsl
algor core
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.166 src/etc/mtree/NetBSD.dist.base:1.167
--- src/etc/mtree/NetBSD.dist.base:1.166 Tue Jan 9 03:31:14 2018
+++ src/etc/mtree/NetBSD.dist.base Wed Jan 24 09:04:41 2018
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.166 2018/01/09 03:31:14 christos Exp $
+# $NetBSD: NetBSD.dist.base,v 1.167 2018/01/24 09:04:41 skrll Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -872,7 +872,6 @@
./usr/share/man/cat3
./usr/share/man/cat3lua
./usr/share/man/cat4
-./usr/share/man/cat4/acorn26
./usr/share/man/cat4/acorn32
./usr/share/man/cat4/alpha
./usr/share/man/cat4/amiga
@@ -908,7 +907,6 @@
./usr/share/man/cat6
./usr/share/man/cat7
./usr/share/man/cat8
-./usr/share/man/cat8/acorn26
./usr/share/man/cat8/acorn32
./usr/share/man/cat8/algor
./usr/share/man/cat8/alpha
@@ -961,7 +959,6 @@
./usr/share/man/cat8/x86
./usr/share/man/cat9
./usr/share/man/cat9lua
-./usr/share/man/cat9/acorn26
./usr/share/man/cat9/alpha
./usr/share/man/cat9/amiga
./usr/share/man/cat9/atari
@@ -984,7 +981,6 @@
./usr/share/man/html3f
./usr/share/man/html3lua
./usr/share/man/html4
-./usr/share/man/html4/acorn26
./usr/share/man/html4/acorn32
./usr/share/man/html4/alpha
./usr/share/man/html4/amiga
@@ -1020,7 +1016,6 @@
./usr/share/man/html6
./usr/share/man/html7
./usr/share/man/html8
-./usr/share/man/html8/acorn26
./usr/share/man/html8/acorn32
./usr/share/man/html8/algor
./usr/share/man/html8/alpha
@@ -1073,7 +1068,6 @@
./usr/share/man/html8/x86
./usr/share/man/html9
./usr/share/man/html9lua
-./usr/share/man/html9/acorn26
./usr/share/man/html9/alpha
./usr/share/man/html9/amiga
./usr/share/man/html9/atari
@@ -1096,7 +1090,6 @@
./usr/share/man/man3f
./usr/share/man/man3lua
./usr/share/man/man4
-./usr/share/man/man4/acorn26
./usr/share/man/man4/acorn32
./usr/share/man/man4/alpha
./usr/share/man/man4/amiga
@@ -1132,7 +1125,6 @@
./usr/share/man/man6
./usr/share/man/man7
./usr/share/man/man8
-./usr/share/man/man8/acorn26
./usr/share/man/man8/acorn32
./usr/share/man/man8/algor
./usr/share/man/man8/alpha
@@ -1185,7 +1177,6 @@
./usr/share/man/man8/x86
./usr/share/man/man9
./usr/share/man/man9lua
-./usr/share/man/man9/acorn26
./usr/share/man/man9/alpha
./usr/share/man/man9/amiga
./usr/share/man/man9/atari
Index: src/external/gpl2/groff/dist/tmac/doc-common
diff -u src/external/gpl2/groff/dist/tmac/doc-common:1.2 src/external/gpl2/groff/dist/tmac/doc-common:1.3
--- src/external/gpl2/groff/dist/tmac/doc-common:1.2 Wed Jan 13 19:01:59 2016
+++ src/external/gpl2/groff/dist/tmac/doc-common Wed Jan 24 09:04:41 2018
@@ -257,7 +257,6 @@
.
.ds doc-volume-as-alpha alpha
.als doc-volume-as-Alpha doc-volume-as-alpha
-.ds doc-volume-as-acorn26 acorn26
.ds doc-volume-as-acorn32 acorn32
.ds doc-volume-as-algor algor
.ds doc-volume-as-amd64 amd64
Index: src/external/gpl2/groff/dist/tmac/groff_mdoc.man
diff -u src/external/gpl2/groff/dist/tmac/groff_mdoc.man:1.4 src/external/gpl2/groff/dist/tmac/groff_mdoc.man:1.5
--- src/external/gpl2/groff/dist/tmac/groff_mdoc.man:1.4 Mon Nov 21 20:43:25 2016
+++ src/external/gpl2/groff/dist/tmac/groff_mdoc.man Wed Jan 24 09:04:41 2018
@@ -769,7 +769,7 @@ By default, the following architecture k
.
\# we use `No' to avoid hyphenation
.Bd -ragged -offset indent
-.No alpha , acorn26 , acorn32 , algor , amd64 , amiga , arc , arm26 ,
+.No alpha , acorn32 , algor , amd64 , amiga , arc , arm26 ,
.No arm32 , atari , bebox , cats , cesfic , cobalt , dreamcast , evbarm ,
.No evbmips , evbppc , evbsh3 , hp300 , hpcmips , hppa , i386 , luna68k ,
.No m68k , mac68k , macppc , mips , mmeye , mvme68k , mvmeppc , netwinder ,
Index: src/external/gpl2/send-pr/dist/send-pr/categories
diff -u src/external/gpl2/send-pr/dist/send-pr/categories:1.2 src/external/gpl2/send-pr/dist/send-pr/categories:1.3
--- src/external/gpl2/send-pr/dist/send-pr/categories:1.2 Thu Jan 14 21:13:20 2016
+++ src/external/gpl2/send-pr/dist/send-pr/categories Wed Jan 24 09:04:42 2018
@@ -4,7 +4,6 @@ kern
lib
misc
pkg
-port-acorn26
port-acorn32
port-algor
port-alpha
Index: src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c
diff -u src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c:1.4 src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c:1.5
--- src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c:1.4 Thu Nov 30 15:26:54 2017
+++ src/external/gpl3/gdb/dist/gdb/arm-nbsd-nat.c Wed Jan 24 09:04:42 2018
@@ -78,18 +78,18 @@ armnbsd_supply_pcb (struct regcache *reg
return 0;
/* The stack pointer shouldn't be zero. */
- if (pcb->pcb_un.un_32.pcb32_sp == 0)
+ if (pcb->pcb_sp == 0)
return 0;
- read_memory (pcb->pcb_un.un_32.pcb32_sp, (gdb_byte *) &sf, sizeof sf);
+ read_memory (pcb->pcb_sp, (gdb_byte *) &sf, sizeof sf);
regcache_raw_supply (regcache, ARM_PC_REGNUM, &sf.sf_pc);
- regcache_raw_supply (regcache, ARM_SP_REGNUM, &pcb->pcb_un.un_32.pcb32_sp);
- regcache_raw_supply (regcache, 12, &pcb->pcb_un.un_32.pcb32_r12);
- regcache_raw_supply (regcache, 11, &pcb->pcb_un.un_32.pcb32_r11);
- regcache_raw_supply (regcache, 10, &pcb->pcb_un.un_32.pcb32_r10);
- regcache_raw_supply (regcache, 9, &pcb->pcb_un.un_32.pcb32_r9);
- regcache_raw_supply (regcache, 8, &pcb->pcb_un.un_32.pcb32_r8);
+ regcache_raw_supply (regcache, ARM_SP_REGNUM, &pcb->pcb_sp);
+ regcache_raw_supply (regcache, 12, &pcb->pcb_r12);
+ regcache_raw_supply (regcache, 11, &pcb->pcb_r11);
+ regcache_raw_supply (regcache, 10, &pcb->pcb_r10);
+ regcache_raw_supply (regcache, 9, &pcb->pcb_r9);
+ regcache_raw_supply (regcache, 8, &pcb->pcb_r8);
regcache_raw_supply (regcache, 7, &sf.sf_r7);
regcache_raw_supply (regcache, 6, &sf.sf_r6);
regcache_raw_supply (regcache, 5, &sf.sf_r5);
Index: src/sbin/disklabel/Makefile
diff -u src/sbin/disklabel/Makefile:1.72 src/sbin/disklabel/Makefile:1.73
--- src/sbin/disklabel/Makefile:1.72 Sun Jan 31 23:11:49 2016
+++ src/sbin/disklabel/Makefile Wed Jan 24 09:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2016/01/31 23:11:49 christos Exp $
+# $NetBSD: Makefile,v 1.73 2018/01/24 09:04:42 skrll Exp $
# @(#)Makefile 8.2 (Berkeley) 3/17/94
PROG= disklabel
@@ -15,7 +15,7 @@ LDADD+= -lutil
CPPFLAGS+= -DSTRICT_CYLINDER_ALIGNMENT
.endif
-.if (${MACHINE} == "acorn32" || ${MACHINE} == "acorn26")
+.if ${MACHINE} == "acorn32"
# Support FileCore boot block
CPPFLAGS+= -DUSE_ACORN
.endif
Index: src/sbin/disklabel/main.c
diff -u src/sbin/disklabel/main.c:1.47 src/sbin/disklabel/main.c:1.48
--- src/sbin/disklabel/main.c:1.47 Thu Mar 9 00:18:23 2017
+++ src/sbin/disklabel/main.c Wed Jan 24 09:04:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.47 2017/03/09 00:18:23 chs Exp $ */
+/* $NetBSD: main.c,v 1.48 2018/01/24 09:04:42 skrll Exp $ */
/*
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
static char sccsid[] = "@(#)disklabel.c 8.4 (Berkeley) 5/4/95";
/* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */
#else
-__RCSID("$NetBSD: main.c,v 1.47 2017/03/09 00:18:23 chs Exp $");
+__RCSID("$NetBSD: main.c,v 1.48 2018/01/24 09:04:42 skrll Exp $");
#endif
#endif /* not lint */
@@ -271,7 +271,6 @@ static const struct disklabel_params {
{ "or1k", 1, 1, 16, 2, 0, 0, BIG_ENDIAN }, /* or1k */
{ "riscv", 1, 1, 16, 2, 0, 0, LITTLE_ENDIAN }, /* riscv */
- { "acorn26", 1, 1, 16, 2, 8, 0, LITTLE_ENDIAN }, /* arm */
{ "acorn32", 1, 1, 16, 2, 8, 0, LITTLE_ENDIAN }, /* arm */
{ "cats", 1, 1, 16, 2, 8, 0, LITTLE_ENDIAN }, /* arm */
{ "evbarm", 1, 1, 16, 2, 8, 0, 0 }, /* arm */
Index: src/share/examples/disktab/disktab
diff -u src/share/examples/disktab/disktab:1.2 src/share/examples/disktab/disktab:1.3
--- src/share/examples/disktab/disktab:1.2 Mon Apr 19 12:44:10 2004
+++ src/share/examples/disktab/disktab Wed Jan 24 09:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: disktab,v 1.2 2004/04/19 12:44:10 wiz Exp $
+# $NetBSD: disktab,v 1.3 2018/01/24 09:04:42 skrll Exp $
#
# Example disktab, containing example entries for historic disks
# and/or entries showing special features of disktab entries.
@@ -49,7 +49,7 @@ floppy288|2.88MB 3.5in Extra High Densit
:pb#5760:ob#0:\
:pc#5760:oc#0:
-# From former acorn26/acorn32 disktab
+# From former acorn32 disktab
cfs420a|Conner Peripherals 420MB IDE:\
:dt=ESDI:ty=winchester:se#512:nt#16:ns#63:nc#826: \
Index: src/share/man/man4/Makefile
diff -u src/share/man/man4/Makefile:1.650 src/share/man/man4/Makefile:1.651
--- src/share/man/man4/Makefile:1.650 Wed Jan 10 11:08:55 2018
+++ src/share/man/man4/Makefile Wed Jan 24 09:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.650 2018/01/10 11:08:55 knakahara Exp $
+# $NetBSD: Makefile,v 1.651 2018/01/24 09:04:42 skrll Exp $
# @(#)Makefile 8.1 (Berkeley) 6/18/93
MAN= aac.4 ac97.4 acardide.4 aceride.4 acphy.4 \
@@ -248,7 +248,7 @@ MLINKS+=zstty.4 zs.4 zstty.4 zsc.4
# This is a hack
MLINKS+=edc.4 i386/ed.4
-SUBDIR= man4.acorn26 man4.acorn32 man4.alpha man4.amiga man4.arc man4.atari \
+SUBDIR= man4.acorn32 man4.alpha man4.amiga man4.arc man4.atari \
man4.cobalt man4.dreamcast man4.emips man4.evbarm man4.evbmips \
man4.evbppc \
man4.hp300 man4.hpcarm man4.hpcmips man4.hpcsh man4.hppa man4.i386 \
Index: src/share/man/man4/ddb.4
diff -u src/share/man/man4/ddb.4:1.170 src/share/man/man4/ddb.4:1.171
--- src/share/man/man4/ddb.4:1.170 Thu Dec 28 23:16:42 2017
+++ src/share/man/man4/ddb.4 Wed Jan 24 09:04:42 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: ddb.4,v 1.170 2017/12/28 23:16:42 wiz Exp $
+.\" $NetBSD: ddb.4,v 1.171 2018/01/24 09:04:42 skrll Exp $
.\"
.\" Copyright (c) 1997 - 2009 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -953,21 +953,6 @@ to indicate that they are part of the ma
set (e.g.
.Ic machine reboot ) .
Some of these commands are:
-.Ss ACORN26
-.Bl -tag -width "traptrace" -compact
-.It Ic bsw
-Writes one or two bytes to the IObus.
-Takes an address and a value.
-Use the
-.Dq b
-modifier to write a single byte and the
-.Dq h
-modifier to write two bytes.
-.It Ic frame
-Given a trap frame address, print out the trap frame.
-.It Ic irqstat
-Display the IRQ statistics
-.El
.Ss ALPHA
.Bl -tag -width "traptrace" -compact
.It Ic cpu
Index: src/share/man/man4/iic.4
diff -u src/share/man/man4/iic.4:1.13 src/share/man/man4/iic.4:1.14
--- src/share/man/man4/iic.4:1.13 Tue Jul 26 11:08:59 2016
+++ src/share/man/man4/iic.4 Wed Jan 24 09:04:42 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: iic.4,v 1.13 2016/07/26 11:08:59 msaitoh Exp $
+.\" $NetBSD: iic.4,v 1.14 2018/01/24 09:04:42 skrll Exp $
.\" $OpenBSD: iic.4,v 1.74 2008/09/10 16:13:43 reyk Exp $
.\"
.\" Copyright (c) 2004, 2006 Alexander Yurchenko <gra...@openbsd.org>
@@ -51,7 +51,6 @@
.Cd "iic* at i2cbus? # evbarm "
.Cd "iic* at ichsmb? # amd64 i386 "
.Cd "iic* at imxi2c? # evbarm "
-.Cd "iic0 at iociic0 # acorn26 "
.Cd "iic0 at iomdiic? # acorn32 "
.Cd "iic0 at iopiic? # evbarm iyonix "
.Cd "iic* at ismt? # amd64 i386 "
Index: src/share/man/man4/podulebus.4
diff -u src/share/man/man4/podulebus.4:1.3 src/share/man/man4/podulebus.4:1.4
--- src/share/man/man4/podulebus.4:1.3 Mon Mar 9 19:24:28 2009
+++ src/share/man/man4/podulebus.4 Wed Jan 24 09:04:42 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: podulebus.4,v 1.3 2009/03/09 19:24:28 joerg Exp $
+.\" $NetBSD: podulebus.4,v 1.4 2018/01/24 09:04:42 skrll Exp $
.\"
.\" Copyright (c) 2000, 2006 Ben Harris
.\" All rights reserved.
@@ -32,8 +32,6 @@
.Nm podulebus
.Nd Acorn Expansion Card bus driver
.Sh SYNOPSIS
-.Cd podulebus0 at ioc0 bank 4
-.Pq Nx Ns /acorn26
.Cd podulebus0 at root
.Pq Nx Ns /acorn32
.Sh DESCRIPTION
@@ -52,8 +50,6 @@ device.
.Nx
includes several machine-independent expansion card device drivers.
There are also some device drivers which are specific to
-.Nx Ns /acorn26
-or
.Nx Ns /acorn32 .
.Sh HARDWARE
The following devices are supported by
Index: src/share/man/man7/hier.7
diff -u src/share/man/man7/hier.7:1.127 src/share/man/man7/hier.7:1.128
--- src/share/man/man7/hier.7:1.127 Tue Jan 9 09:22:25 2018
+++ src/share/man/man7/hier.7 Wed Jan 24 09:04:42 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: hier.7,v 1.127 2018/01/09 09:22:25 wiz Exp $
+.\" $NetBSD: hier.7,v 1.128 2018/01/24 09:04:42 skrll Exp $
.\"
.\" Copyright (c) 1990, 1993, 1994
.\" The Regents of the University of California. All rights reserved.
@@ -744,8 +744,6 @@ Kernel source files.
Architecture-specific support.
.Pp
.Bl -tag -width "playstation2/" -compact
-.It Pa acorn26/
-Acorn Archimedes, A-series and R-series systems.
.It Pa acorn32/
Acorn RiscPC/A7000 and VLSI RC7500.
.It Pa algor/
Index: src/share/man/man8/Makefile
diff -u src/share/man/man8/Makefile:1.104 src/share/man/man8/Makefile:1.105
--- src/share/man/man8/Makefile:1.104 Mon Feb 24 07:23:41 2014
+++ src/share/man/man8/Makefile Wed Jan 24 09:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.104 2014/02/24 07:23:41 skrll Exp $
+# $NetBSD: Makefile,v 1.105 2018/01/24 09:04:42 skrll Exp $
# from: @(#)Makefile 8.1 (Berkeley) 6/5/93
MAN= MAKEDEV.8 MAKEDEV.local.8 afterboot.8 boot.8 compat_30.8 \
@@ -20,7 +20,7 @@ MLINKS+=rc.8 rc.d.8
MLINKS+=rc.8 rc.local.8
MLINKS+=rc.8 rc.shutdown.8
-SUBDIR= man8.acorn26 man8.acorn32 man8.alpha man8.amiga man8.atari \
+SUBDIR= man8.acorn32 man8.alpha man8.amiga man8.atari \
man8.cobalt man8.dreamcast man8.emips man8.evbarm \
man8.hp300 man8.hpcarm man8.hpcmips man8.hpcsh man8.hppa \
man8.mac68k man8.macppc \
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1027 src/share/mk/bsd.own.mk:1.1028
--- src/share/mk/bsd.own.mk:1.1027 Mon Jan 22 17:33:01 2018
+++ src/share/mk/bsd.own.mk Wed Jan 24 09:04:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1027 2018/01/22 17:33:01 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.1028 2018/01/24 09:04:42 skrll Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -579,7 +579,7 @@ OBJC= ${TOOL_OBJC.${ACTIVE_OBJC}}
# For each ${MACHINE_CPU}, list the ports that use it.
MACHINES.aarch64= evbarm64
MACHINES.alpha= alpha
-MACHINES.arm= acorn26 acorn32 cats epoc32 evbarm hpcarm \
+MACHINES.arm= acorn32 cats epoc32 evbarm hpcarm \
iyonix netwinder shark zaurus
MACHINES.coldfire= evbcf
MACHINES.i386= i386
@@ -1073,9 +1073,6 @@ MKGCCCMDS?= ${MKGCC}
#
# Exceptions to the above:
#
-.if ${MACHINE} == "acorn26" # page size is prohibitive
-MKKMOD= no
-.endif
# Rump doesn't work yet on ia64
.if ${MACHINE} == "ia64"
Index: src/sys/arch/Makefile
diff -u src/sys/arch/Makefile:1.45 src/sys/arch/Makefile:1.46
--- src/sys/arch/Makefile:1.45 Wed Sep 3 19:27:53 2014
+++ src/sys/arch/Makefile Wed Jan 24 09:04:43 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2014/09/03 19:27:53 matt Exp $
+# $NetBSD: Makefile,v 1.46 2018/01/24 09:04:43 skrll Exp $
# For now, we install the machine and arch includes, and symlink 'machine'
# to the location of the machine includes (usually).
@@ -19,7 +19,7 @@ ARCHSUBDIR= powerpc
.if ${MACHINE_CPU} == "aarch64"
SUBDIR= evbarm64
.elif ${MACHINE_CPU} == "arm"
-SUBDIR= acorn26 acorn32 cats epoc32 evbarm hpcarm iyonix netwinder shark zaurus
+SUBDIR= acorn32 cats epoc32 evbarm hpcarm iyonix netwinder shark zaurus
.else
SUBDIR= ${MACHINE}
.endif
@@ -45,7 +45,7 @@ SUBDIR+= sun68k
SUBDIR+= xen
.endif
-#SUBDIR=aarch64 acorn26 acorn32 algor alpha amiga amigappc arm arc atari \
+#SUBDIR=aarch64 acorn32 algor alpha amiga amigappc arm arc atari \
# bebox \
# cats cesfic cobalt \
# dreamcast \
Index: src/sys/arch/README
diff -u src/sys/arch/README:1.62 src/sys/arch/README:1.63
--- src/sys/arch/README:1.62 Mon Mar 31 11:25:48 2014
+++ src/sys/arch/README Wed Jan 24 09:04:43 2018
@@ -1,6 +1,5 @@
-$NetBSD: README,v 1.62 2014/03/31 11:25:48 martin Exp $
+$NetBSD: README,v 1.63 2018/01/24 09:04:43 skrll Exp $
-acorn26 arm 20000509 Acorn ARM2- and ARM3-based machines
acorn32 arm 20011118 Acorn computers Ltd. ARM 6/7/SA based machines
algor mipsel,mips64el 20010528 Algorithmics, Ltd. MIPS evaluation boards
alpha alpha 19950213 Compaq (formerly Digital Equipment Corp.) Alpha
Index: src/sys/arch/acorn32/stand/boot32/boot32.c
diff -u src/sys/arch/acorn32/stand/boot32/boot32.c:1.42 src/sys/arch/acorn32/stand/boot32/boot32.c:1.43
--- src/sys/arch/acorn32/stand/boot32/boot32.c:1.42 Sat Jun 11 06:25:21 2016
+++ src/sys/arch/acorn32/stand/boot32/boot32.c Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: boot32.c,v 1.42 2016/06/11 06:25:21 dholland Exp $ */
+/* $NetBSD: boot32.c,v 1.43 2018/01/24 09:04:44 skrll Exp $ */
/*-
* Copyright (c) 2002 Reinoud Zandijk
@@ -29,7 +29,6 @@
* Thanks a bunch for Ben's framework for the bootloader and its suporting
* libs. This file tries to actually boot NetBSD/acorn32 !
*
- * XXX eventually to be partly merged back with boot26 ? XXX
*/
#include <lib/libsa/stand.h>
Index: src/sys/arch/arm/arm/arm_machdep.c
diff -u src/sys/arch/arm/arm/arm_machdep.c:1.52 src/sys/arch/arm/arm/arm_machdep.c:1.53
--- src/sys/arch/arm/arm/arm_machdep.c:1.52 Sun Jul 23 13:35:15 2017
+++ src/sys/arch/arm/arm/arm_machdep.c Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_machdep.c,v 1.52 2017/07/23 13:35:15 skrll Exp $ */
+/* $NetBSD: arm_machdep.c,v 1.53 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.52 2017/07/23 13:35:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_machdep.c,v 1.53 2018/01/24 09:04:44 skrll Exp $");
#include <sys/exec.h>
#include <sys/proc.h>
@@ -104,20 +104,16 @@ __KERNEL_RCSID(0, "$NetBSD: arm_machdep.
char machine[] = MACHINE; /* from <machine/param.h> */
char machine_arch[] = MACHINE_ARCH; /* from <machine/param.h> */
-#ifdef __PROG32
extern const uint32_t undefinedinstruction_bounce[];
-#endif
/* Our exported CPU info; we can have only one. */
struct cpu_info cpu_info_store = {
.ci_cpl = IPL_HIGH,
.ci_curlwp = &lwp0,
-#ifdef __PROG32
.ci_undefsave[2] = (register_t) undefinedinstruction_bounce,
#if defined(ARM_MMU_EXTENDED) && KERNEL_PID != 0
.ci_pmap_asid_cur = KERNEL_PID,
#endif
-#endif
};
#ifdef MULTIPROCESSOR
@@ -182,7 +178,6 @@ setregs(struct lwp *l, struct exec_packa
tf->tf_usr_lr = pack->ep_entry;
tf->tf_svc_lr = 0x77777777; /* Something we can see */
tf->tf_pc = pack->ep_entry;
-#ifdef __PROG32
#if defined(__ARMEB__)
/*
* If we are running on ARMv7, we need to set the E bit to force
@@ -197,7 +192,6 @@ setregs(struct lwp *l, struct exec_packa
if (pack->ep_entry & 1)
tf->tf_spsr |= PSR_T_bit;
#endif
-#endif /* __PROG32 */
l->l_md.md_flags = 0;
#ifdef EXEC_AOUT
Index: src/sys/arch/arm/arm/ast.c
diff -u src/sys/arch/arm/arm/ast.c:1.29 src/sys/arch/arm/arm/ast.c:1.30
--- src/sys/arch/arm/arm/ast.c:1.29 Fri May 12 05:46:39 2017
+++ src/sys/arch/arm/arm/ast.c Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ast.c,v 1.29 2017/05/12 05:46:39 skrll Exp $ */
+/* $NetBSD: ast.c,v 1.30 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright (c) 1994,1995 Mark Brinicombe
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.29 2017/05/12 05:46:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.30 2018/01/24 09:04:44 skrll Exp $");
#include "opt_ddb.h"
@@ -60,10 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: ast.c,v 1.29
#include <uvm/uvm_extern.h>
-#ifdef acorn26
-#include <machine/machdep.h>
-#endif
-
/*
* Prototypes
*/
@@ -72,7 +68,7 @@ void ast(struct trapframe *);
void
userret(struct lwp *l)
{
-#if defined(__PROG32) && defined(ARM_MMU_EXTENDED)
+#if defined(ARM_MMU_EXTENDED)
/*
* If our ASID got released, access via TTBR0 will have been disabled.
* So if it is disabled, activate the lwp again to get a new ASID.
@@ -95,10 +91,8 @@ userret(struct lwp *l)
/* Invoke MI userret code */
mi_userret(l);
-#if defined(__PROG32) && defined(DIAGNOSTIC)
KASSERT(VALID_R15_PSR(lwp_trapframe(l)->tf_pc,
lwp_trapframe(l)->tf_spsr));
-#endif
}
@@ -113,17 +107,9 @@ ast(struct trapframe *tf)
{
struct lwp * const l = curlwp;
-#ifdef acorn26
- /* Enable interrupts if they were enabled before the trap. */
- if ((tf->tf_r15 & R15_IRQ_DISABLE) == 0)
- int_on();
-#else
/* Interrupts were restored by exception_exit. */
-#endif
-#ifdef __PROG32
KASSERT(VALID_R15_PSR(tf->tf_pc, tf->tf_spsr));
-#endif
#ifdef __HAVE_PREEMPTION
kpreempt_disable();
Index: src/sys/arch/arm/arm/bcopyinout.S
diff -u src/sys/arch/arm/arm/bcopyinout.S:1.20 src/sys/arch/arm/arm/bcopyinout.S:1.21
--- src/sys/arch/arm/arm/bcopyinout.S:1.20 Sun Aug 18 06:28:18 2013
+++ src/sys/arch/arm/arm/bcopyinout.S Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopyinout.S,v 1.20 2013/08/18 06:28:18 matt Exp $ */
+/* $NetBSD: bcopyinout.S,v 1.21 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -52,19 +52,13 @@
#include "bcopyinout_xscale.S"
#else
-RCSID("$NetBSD: bcopyinout.S,v 1.20 2013/08/18 06:28:18 matt Exp $")
+RCSID("$NetBSD: bcopyinout.S,v 1.21 2018/01/24 09:04:44 skrll Exp $")
.text
.align 0
-#ifdef __PROG32
#define SAVE_REGS stmfd sp!, {r4-r11}
#define RESTORE_REGS ldmfd sp!, {r4-r11}
-#else
-/* Need to save R14_svc because it'll get trampled if we take a page fault. */
-#define SAVE_REGS stmfd sp!, {r4-r11, r14}
-#define RESTORE_REGS ldmfd sp!, {r4-r11, r14}
-#endif
#if defined(__XSCALE__) || defined(_ARM_ARCH_6)
#define HELLOCPP #
@@ -682,7 +676,6 @@ ENTRY(kcopy)
END(kcopy)
#endif /* !__XSCALE__ */
-#ifdef __PROG32
/*
* int badaddr_read_1(const uint8_t *src, uint8_t *dest)
*
@@ -754,4 +747,3 @@ ENTRY(badaddr_read_4)
1: str ip, [r2, #PCB_ONFAULT]
RET
END(badaddr_read_4)
-#endif /* __PROG32 */
Index: src/sys/arch/arm/arm/compat_16_machdep.c
diff -u src/sys/arch/arm/arm/compat_16_machdep.c:1.17 src/sys/arch/arm/arm/compat_16_machdep.c:1.18
--- src/sys/arch/arm/arm/compat_16_machdep.c:1.17 Sun Aug 18 06:50:31 2013
+++ src/sys/arch/arm/arm/compat_16_machdep.c Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.17 2013/08/18 06:50:31 matt Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.18 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.17 2013/08/18 06:50:31 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.18 2018/01/24 09:04:44 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -63,9 +63,7 @@ __KERNEL_RCSID(0, "$NetBSD: compat_16_ma
#include <machine/cpu.h>
#include <machine/frame.h>
-#ifndef acorn26
#include <arm/cpufunc.h>
-#endif
/*
* Send an interrupt to process.
@@ -178,10 +176,8 @@ sendsig_sigcontext(const ksiginfo_t *ksi
switch (ps->sa_sigdesc[sig].sd_vers) {
case 0: /* legacy on-stack sigtramp */
tf->tf_usr_lr = (int)p->p_sigctx.ps_sigcode;
-#ifndef acorn26
/* XXX This should not be needed. */
cpu_icache_sync_all();
-#endif
break;
case 1:
tf->tf_usr_lr = (int)ps->sa_sigdesc[sig].sd_tramp;
Index: src/sys/arch/arm/arm/copystr.S
diff -u src/sys/arch/arm/arm/copystr.S:1.11 src/sys/arch/arm/arm/copystr.S:1.12
--- src/sys/arch/arm/arm/copystr.S:1.11 Sun Aug 18 06:28:18 2013
+++ src/sys/arch/arm/arm/copystr.S Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: copystr.S,v 1.11 2013/08/18 06:28:18 matt Exp $ */
+/* $NetBSD: copystr.S,v 1.12 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright (c) 1995 Mark Brinicombe.
@@ -47,7 +47,7 @@
#include <arm/locore.h>
-RCSID("$NetBSD: copystr.S,v 1.11 2013/08/18 06:28:18 matt Exp $")
+RCSID("$NetBSD: copystr.S,v 1.12 2018/01/24 09:04:44 skrll Exp $")
#include <sys/errno.h>
@@ -86,14 +86,8 @@ ENTRY(copystr)
RET
END(copystr)
-#ifdef __PROG32
#define SAVE_REGS push {r3-r6}
#define RESTORE_REGS pop {r3-r6}
-#else
-/* Need to save R14_svc because it'll get trampled if we take a page fault. */
-#define SAVE_REGS stmfd sp!, {r4-r6, r14}
-#define RESTORE_REGS ldmfd sp!, {r4-r6, r14}
-#endif
/*
* r0 - user space address
Index: src/sys/arch/arm/arm/cpu_in_cksum.S
diff -u src/sys/arch/arm/arm/cpu_in_cksum.S:1.11 src/sys/arch/arm/arm/cpu_in_cksum.S:1.12
--- src/sys/arch/arm/arm/cpu_in_cksum.S:1.11 Sun Feb 15 17:21:08 2015
+++ src/sys/arch/arm/arm/cpu_in_cksum.S Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_in_cksum.S,v 1.11 2015/02/15 17:21:08 skrll Exp $ */
+/* $NetBSD: cpu_in_cksum.S,v 1.12 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <machine/asm.h>
-RCSID("$NetBSD: cpu_in_cksum.S,v 1.11 2015/02/15 17:21:08 skrll Exp $")
+RCSID("$NetBSD: cpu_in_cksum.S,v 1.12 2018/01/24 09:04:44 skrll Exp $")
#include "assym.h"
@@ -156,9 +156,6 @@ END(cpu_in_cksum)
*/
/* LINTSTUB: Ignore */
ASENTRY_NP(arm_cksumdata)
-#ifdef __PROG26
- str lr, [sp, #-4]! /* for SVC26 mode */
-#endif
#ifdef __XSCALE__
pld [r0] /* Pre-fetch the start of the buffer */
#endif
@@ -185,11 +182,7 @@ ASENTRY_NP(arm_cksumdata)
rsb r7, r7, #0x04
subs r1, r1, r7 /* Enough bytes left to make it? */
bgt .Lcksumdata_wordaligned
-#ifdef __PROG26
- ldreq pc, [sp], #4 /* done */
-#else
RETc(eq) /* done */
-#endif
adds r1, r1, r7 /* undo sub */
subs r7, r7, r1
lsls r7, r7, #3
@@ -200,11 +193,7 @@ ASENTRY_NP(arm_cksumdata)
lsls r2, r2, r7
lsrs r2, r2, r7
#endif
-#ifdef __PROG26
- ldr pc, [sp], #4 /* done */
-#else
RET /* done */
-#endif
/* Buffer is now word aligned */
.Lcksumdata_wordaligned:
@@ -296,11 +285,7 @@ ASENTRY_NP(arm_cksumdata)
#endif
adds r1, r1, #0x40
-#ifdef __PROG26
- ldreq pc, [sp], #4
-#else
RETc(eq)
-#endif
cmp r1, #0x20
#ifdef __XSCALE__
@@ -333,11 +318,7 @@ ASENTRY_NP(arm_cksumdata)
#endif
adcs r2, r2, #0x00
subs r1, r1, #0x20
-#ifdef __PROG26
- ldreq pc, [sp], #4
-#else
RETc(eq)
-#endif
.Lcksumdata_less_than_32:
/* There are less than 32 bytes left */
@@ -383,11 +364,7 @@ ASENTRY_NP(arm_cksumdata)
/* Deal with < 4 bytes remaining */
.Lcksumdata_lessthan4:
adds r1, r1, #0x04
-#ifdef __PROG26
- ldreq pc, [sp], #4
-#else
RETc(eq)
-#endif
/* Deal with 1 to 3 remaining bytes, possibly misaligned */
.Lcksumdata_endgame:
@@ -403,9 +380,5 @@ ASENTRY_NP(arm_cksumdata)
#endif
adds r2, r2, r3
adcs r2, r2, #0x00
-#ifdef __PROG26
- ldr pc, [sp], #4
-#else
RET
-#endif
ASEND(arm_cksumdata)
Index: src/sys/arch/arm/arm/lock_cas.S
diff -u src/sys/arch/arm/arm/lock_cas.S:1.11 src/sys/arch/arm/arm/lock_cas.S:1.12
--- src/sys/arch/arm/arm/lock_cas.S:1.11 Sun Aug 18 06:28:18 2013
+++ src/sys/arch/arm/arm/lock_cas.S Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_cas.S,v 1.11 2013/08/18 06:28:18 matt Exp $ */
+/* $NetBSD: lock_cas.S,v 1.12 2018/01/24 09:04:44 skrll Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -109,14 +109,8 @@ STRONG_ALIAS(_atomic_cas_ptr_ni,_lock_ca
STRONG_ALIAS(atomic_cas_ptr_ni,_lock_cas)
#endif /* !_ARM_ARCH_6 */
-#ifdef __PROG32
#define SAVE_REGS push {r4-r5}
#define RESTORE_REGS pop {r4-r5}
-#else
-/* Need to save R14_svc because it'll get trampled if we take a page fault. */
-#define SAVE_REGS stmfd sp!, {r4-r6, r14}
-#define RESTORE_REGS ldmfd sp!, {r4-r6, r14}
-#endif
/*
* int ucas_32(volatile int32_t *uptr, int32_t old, int32_t new, int32_t *ret);
Index: src/sys/arch/arm/arm/db_trace.c
diff -u src/sys/arch/arm/arm/db_trace.c:1.32 src/sys/arch/arm/arm/db_trace.c:1.33
--- src/sys/arch/arm/arm/db_trace.c:1.32 Tue Apr 25 09:02:04 2017
+++ src/sys/arch/arm/arm/db_trace.c Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.32 2017/04/25 09:02:04 skrll Exp $ */
+/* $NetBSD: db_trace.c,v 1.33 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.32 2017/04/25 09:02:04 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.33 2018/01/24 09:04:44 skrll Exp $");
#include <sys/proc.h>
#include <arm/armreg.h>
@@ -148,11 +148,7 @@ db_stack_trace_print(db_expr_t addr, boo
(char *)&pcbb);
pcb = &pcbb;
#endif
-#ifdef acorn26
- frame = (uint32_t *)(pcb->pcb_sf->sf_r11);
-#else
- frame = (uint32_t *)(pcb->pcb_un.un_32.pcb32_r11);
-#endif
+ frame = (uint32_t *)(pcb->pcb_r11);
(*pr)("at %p\n", frame);
} else
frame = (uint32_t *)(addr);
@@ -174,11 +170,7 @@ db_stack_trace_print(db_expr_t addr, boo
* In theory, the SCP isn't guaranteed to be in the function
* that generated the stack frame. We hope for the best.
*/
-#ifdef __PROG26
- scp = frame[FR_SCP] & R15_PC;
-#else
scp = frame[FR_SCP];
-#endif
pc = scp;
while (count--) {
@@ -187,26 +179,15 @@ db_stack_trace_print(db_expr_t addr, boo
uint32_t *rp;
const char *sep;
-#ifdef __PROG26
- scp = frame[FR_SCP] & R15_PC;
-#else
scp = frame[FR_SCP];
-#endif
(*pr)("%p: ", lastframe);
db_printsym(pc, DB_STGY_PROC, pr);
if (trace_full) {
(*pr)("\n\t");
-#ifdef __PROG26
- (*pr)("pc =0x%08x rlv=0x%08x (", pc,
- frame[FR_RLV] & R15_PC);
- db_printsym(frame[FR_RLV] & R15_PC, DB_STGY_PROC, pr);
- (*pr)(")\n");
-#else
(*pr)("pc =0x%08x rlv=0x%08x (", pc, frame[FR_RLV]);
db_printsym(frame[FR_RLV], DB_STGY_PROC, pr);
(*pr)(")\n");
-#endif
(*pr)("\trsp=0x%08x rfp=0x%08x", frame[FR_RSP],
frame[FR_RFP]);
}
@@ -242,11 +223,7 @@ db_stack_trace_print(db_expr_t addr, boo
*/
if (frame[FR_RFP] == 0)
break; /* Top of stack */
-#ifdef __PROG26
- pc = frame[FR_RLV] & R15_PC;
-#else
pc = frame[FR_RLV];
-#endif
frame = (uint32_t *)(frame[FR_RFP]);
Index: src/sys/arch/arm/arm/process_machdep.c
diff -u src/sys/arch/arm/arm/process_machdep.c:1.32 src/sys/arch/arm/arm/process_machdep.c:1.33
--- src/sys/arch/arm/arm/process_machdep.c:1.32 Thu Mar 16 16:13:20 2017
+++ src/sys/arch/arm/arm/process_machdep.c Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.32 2017/03/16 16:13:20 chs Exp $ */
+/* $NetBSD: process_machdep.c,v 1.33 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright (c) 1993 The Regents of the University of California.
@@ -133,7 +133,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.32 2017/03/16 16:13:20 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.33 2018/01/24 09:04:44 skrll Exp $");
#include <sys/proc.h>
#include <sys/ptrace.h>
@@ -193,7 +193,6 @@ process_write_regs(struct lwp *l, const
memcpy(&tf->tf_r0, regs->r, sizeof(regs->r));
tf->tf_usr_sp = regs->r_sp;
tf->tf_usr_lr = regs->r_lr;
-#ifdef __PROG32
tf->tf_pc = regs->r_pc;
tf->tf_spsr &= ~(PSR_FLAGS | PSR_T_bit);
tf->tf_spsr |= regs->r_cpsr & PSR_FLAGS;
@@ -202,12 +201,6 @@ process_write_regs(struct lwp *l, const
tf->tf_spsr |= PSR_T_bit;
#endif
KASSERT(VALID_R15_PSR(tf->tf_pc, tf->tf_spsr));
-#else /* __PROG26 */
- if ((regs->r_pc & (R15_MODE | R15_IRQ_DISABLE | R15_FIQ_DISABLE)) != 0)
- return EPERM;
-
- tf->tf_r15 = regs->r_pc;
-#endif
return 0;
}
@@ -233,7 +226,6 @@ process_set_pc(struct lwp *l, void *addr
struct trapframe * const tf = lwp_trapframe(l);
KASSERT(tf != NULL);
-#ifdef __PROG32
tf->tf_pc = (int)addr;
#ifdef THUMB_CODE
if (((int)addr) & 1)
@@ -241,12 +233,6 @@ process_set_pc(struct lwp *l, void *addr
else
tf->tf_spsr &= ~PSR_T_bit;
#endif
-#else /* __PROG26 */
- /* Only set the PC, not the PSR */
- if (((register_t)addr & R15_PC) != (register_t)addr)
- return EINVAL;
- tf->tf_r15 = (tf->tf_r15 & ~R15_PC) | (register_t)addr;
-#endif
return 0;
}
Index: src/sys/arch/arm/arm/fiq.c
diff -u src/sys/arch/arm/arm/fiq.c:1.7 src/sys/arch/arm/arm/fiq.c:1.8
--- src/sys/arch/arm/arm/fiq.c:1.7 Wed Jun 12 21:34:12 2013
+++ src/sys/arch/arm/arm/fiq.c Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fiq.c,v 1.7 2013/06/12 21:34:12 matt Exp $ */
+/* $NetBSD: fiq.c,v 1.8 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fiq.c,v 1.7 2013/06/12 21:34:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fiq.c,v 1.8 2018/01/24 09:04:44 skrll Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,9 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: fiq.c,v 1.7
#include <arm/cpufunc.h>
#include <arm/fiq.h>
-#ifdef __PROG32
#include <uvm/uvm.h>
-#endif
TAILQ_HEAD(, fiqhandler) fiqhandler_stack =
TAILQ_HEAD_INITIALIZER(fiqhandler_stack);
@@ -54,13 +52,8 @@ TAILQ_HEAD(, fiqhandler) fiqhandler_stac
extern char fiqvector[];
extern char fiq_nullhandler[], fiq_nullhandler_end[];
-#ifdef __PROG32
#define IRQ_BIT I32_bit
#define FIQ_BIT F32_bit
-#else
-#define IRQ_BIT R15_IRQ_DISABLE
-#define FIQ_BIT R15_FIQ_DISABLE
-#endif /* __PROG32 */
#ifndef ARM_HAS_VBAR
/*
@@ -76,18 +69,16 @@ extern char fiq_nullhandler[], fiq_nullh
static void
fiq_installhandler(void *func, size_t size)
{
-#if defined(__PROG32) && !defined(__ARM_FIQ_INDIRECT)
+#if !defined(__ARM_FIQ_INDIRECT)
vector_page_setprot(VM_PROT_READ|VM_PROT_WRITE);
#endif
memcpy(fiqvector, func, size);
-#ifdef __PROG32
#if !defined(__ARM_FIQ_INDIRECT)
vector_page_setprot(VM_PROT_READ);
#endif
cpu_icache_sync_range((vaddr_t) fiqvector, size);
-#endif
}
/*
Index: src/sys/arch/arm/arm/fiq_subr.S
diff -u src/sys/arch/arm/arm/fiq_subr.S:1.6 src/sys/arch/arm/arm/fiq_subr.S:1.7
--- src/sys/arch/arm/arm/fiq_subr.S:1.6 Mon Dec 2 18:36:10 2013
+++ src/sys/arch/arm/arm/fiq_subr.S Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fiq_subr.S,v 1.6 2013/12/02 18:36:10 joerg Exp $ */
+/* $NetBSD: fiq_subr.S,v 1.7 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -51,7 +51,6 @@
#define MODE_CHANGE_NOP /* Data sheet says ARM3 doesn't need it */
#endif
-#ifdef __PROG32
#ifdef _ARM_ARCH_6
#define SWITCH_TO_FIQ_MODE \
cps #PSR_FIQ32_MODE
@@ -63,15 +62,7 @@
orr r2, r2, #(PSR_FIQ32_MODE) ; \
msr cpsr_all, r2
#endif
-#else
-#define SWITCH_TO_FIQ_MODE ; \
- mov r1, r15 ; \
- bic r2, r1, #(R15_MODE) ; \
- teqp r2, #(R15_MODE_FIQ) ; \
- MODE_CHANGE_NOP
-#endif /* __PROG32 */
-#ifdef __PROG32
#ifdef _ARM_ARCH_6
#define BACK_TO_SVC_MODE \
cps #PSR_SVC32_MODE
@@ -79,11 +70,6 @@
#define BACK_TO_SVC_MODE \
msr cpsr_all, r3
#endif
-#else
-#define BACK_TO_SVC_MODE ; \
- teqp r1, #0 ; \
- MODE_CHANGE_NOP
-#endif /* __PROG32 */
/*
* fiq_getregs:
Index: src/sys/arch/arm/arm/fusu.S
diff -u src/sys/arch/arm/arm/fusu.S:1.3 src/sys/arch/arm/arm/fusu.S:1.4
--- src/sys/arch/arm/arm/fusu.S:1.3 Sun Aug 18 06:28:18 2013
+++ src/sys/arch/arm/arm/fusu.S Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: fusu.S,v 1.3 2013/08/18 06:28:18 matt Exp $ */
+/* $NetBSD: fusu.S,v 1.4 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright (c) 1996-1998 Mark Brinicombe.
@@ -41,17 +41,7 @@
#include <arm/locore.h>
-/*
- * On PROG26 systems (i.e. acorn26) taking a page fault corrupts R14_svc.
- * To prevent this causing a problem, we save R14 in R12 in these functions.
- */
-#ifdef __PROG26
-#define SAVE_R14 mov ip, lr
-#define FUSU_RET mov pc, ip
-#else
-#define SAVE_R14 /* do nothing */
#define FUSU_RET mov pc, lr
-#endif
/*
* fuword(void *uaddr);
@@ -59,7 +49,6 @@
*/
ENTRY(fuword)
- SAVE_R14
GET_CURPCB(r2)
#ifdef DIAGNOSTIC
@@ -84,7 +73,6 @@ END(fuword)
*/
ENTRY(fusword)
- SAVE_R14
GET_CURPCB(r2)
#ifdef DIAGNOSTIC
@@ -120,7 +108,6 @@ ENTRY(fuswintr)
mvnne r0, #0x00000000
movne pc, lr
- SAVE_R14
GET_CURPCB(r2)
#ifdef DIAGNOSTIC
@@ -160,7 +147,6 @@ _C_LABEL(block_userspace_access):
*/
ENTRY(fubyte)
- SAVE_R14
GET_CURPCB(r2)
#ifdef DIAGNOSTIC
@@ -224,7 +210,6 @@ END(fusubailout)
*/
ENTRY(suword)
- SAVE_R14
GET_CURPCB(r2)
#ifdef DIAGNOSTIC
@@ -255,7 +240,6 @@ ENTRY(suswintr)
mvnne r0, #0x00000000
movne pc, lr
- SAVE_R14
GET_CURPCB(r2)
#ifdef DIAGNOSTIC
@@ -286,7 +270,6 @@ END(suswintr)
*/
ENTRY(susword)
- SAVE_R14
GET_CURPCB(r2)
#ifdef DIAGNOSTIC
@@ -317,7 +300,6 @@ END(susword)
*/
ENTRY(subyte)
- SAVE_R14
GET_CURPCB(r2)
#ifdef DIAGNOSTIC
Index: src/sys/arch/arm/arm/sig_machdep.c
diff -u src/sys/arch/arm/arm/sig_machdep.c:1.49 src/sys/arch/arm/arm/sig_machdep.c:1.50
--- src/sys/arch/arm/arm/sig_machdep.c:1.49 Tue Mar 24 08:38:29 2015
+++ src/sys/arch/arm/arm/sig_machdep.c Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.49 2015/03/24 08:38:29 matt Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.50 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.49 2015/03/24 08:38:29 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.50 2018/01/24 09:04:44 skrll Exp $");
#include <sys/mount.h> /* XXX only needed by syscallargs.h */
#include <sys/cpu.h>
@@ -58,9 +58,7 @@ __KERNEL_RCSID(0, "$NetBSD: sig_machdep.
#include <arm/locore.h>
#include <machine/pcb.h>
-#ifndef acorn26
#include <arm/cpufunc.h>
-#endif
void *
getframe(struct lwp *l, int sig, int *onstack)
@@ -200,10 +198,8 @@ cpu_getmcontext(struct lwp *l, mcontext_
mcp->_mc_tlsbase = (uintptr_t)l->l_private;
*flags |= _UC_TLSBASE;
-#ifdef __PROG32
const struct pcb * const pcb = lwp_getpcb(l);
mcp->_mc_user_tpid = pcb->pcb_user_pid_rw;
-#endif
}
int
@@ -273,10 +269,8 @@ cpu_setmcontext(struct lwp *l, const mco
l->l_sigstk.ss_flags &= ~SS_ONSTACK;
mutex_exit(p->p_lock);
-#ifdef __PROG32
struct pcb * const pcb = lwp_getpcb(l);
pcb->pcb_user_pid_rw = mcp->_mc_user_tpid;
-#endif
return (0);
}
Index: src/sys/arch/arm/arm/syscall.c
diff -u src/sys/arch/arm/arm/syscall.c:1.63 src/sys/arch/arm/arm/syscall.c:1.64
--- src/sys/arch/arm/arm/syscall.c:1.63 Thu Jan 18 14:18:23 2018
+++ src/sys/arch/arm/arm/syscall.c Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.63 2018/01/18 14:18:23 skrll Exp $ */
+/* $NetBSD: syscall.c,v 1.64 2018/01/24 09:04:44 skrll Exp $ */
/*-
* Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.63 2018/01/18 14:18:23 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.64 2018/01/24 09:04:44 skrll Exp $");
#include <sys/cpu.h>
#include <sys/device.h>
@@ -90,10 +90,6 @@ __KERNEL_RCSID(0, "$NetBSD: syscall.c,v
#include <arm/swi.h>
#include <arm/locore.h>
-#ifdef acorn26
-#include <machine/machdep.h>
-#endif
-
void
swi_handler(trapframe_t *tf)
{
@@ -105,17 +101,8 @@ swi_handler(trapframe_t *tf)
* Since all syscalls *should* come from user mode it will always
* be safe to enable them, but check anyway.
*/
-#ifdef acorn26
- if ((tf->tf_r15 & R15_IRQ_DISABLE) == 0)
- int_on();
-#else
KASSERT(VALID_R15_PSR(tf->tf_pc, tf->tf_spsr));
restore_interrupts(tf->tf_spsr & IF32_bits);
-#endif
-
-#ifdef acorn26
- tf->tf_pc += INSN_SIZE;
-#endif
#ifndef THUMB_CODE
/*
@@ -148,11 +135,7 @@ swi_handler(trapframe_t *tf)
else
#endif
{
-#ifdef __PROG32
insn = read_insn(tf->tf_pc - INSN_SIZE, true);
-#else
- insn = read_insn((tf->tf_r15 & R15_PC) - INSN_SIZE, true);
-#endif
}
KASSERTMSG(tf == lwp_trapframe(l), "tf %p vs %p", tf, lwp_trapframe(l));
@@ -258,11 +241,7 @@ syscall(struct trapframe *tf, lwp_t *l,
tf->tf_r0 = rval[0];
tf->tf_r1 = rval[1];
-#ifdef __PROG32
tf->tf_spsr &= ~PSR_C_bit; /* carry bit */
-#else
- tf->tf_r15 &= ~R15_FLAG_C; /* carry bit */
-#endif
break;
case ERESTART:
@@ -284,11 +263,7 @@ syscall(struct trapframe *tf, lwp_t *l,
default:
bad:
tf->tf_r0 = error;
-#ifdef __PROG32
tf->tf_spsr |= PSR_C_bit; /* carry bit */
-#else
- tf->tf_r15 |= R15_FLAG_C; /* carry bit */
-#endif
break;
}
@@ -302,11 +277,7 @@ child_return(void *arg)
struct trapframe * const tf = lwp_trapframe(l);
tf->tf_r0 = 0;
-#ifdef __PROG32
tf->tf_spsr &= ~PSR_C_bit; /* carry bit */
-#else
- tf->tf_r15 &= ~R15_FLAG_C; /* carry bit */
-#endif
userret(l);
ktrsysret(SYS_fork, 0, 0);
Index: src/sys/arch/arm/arm/undefined.c
diff -u src/sys/arch/arm/arm/undefined.c:1.60 src/sys/arch/arm/arm/undefined.c:1.61
--- src/sys/arch/arm/arm/undefined.c:1.60 Sun Jul 2 16:16:44 2017
+++ src/sys/arch/arm/arm/undefined.c Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: undefined.c,v 1.60 2017/07/02 16:16:44 skrll Exp $ */
+/* $NetBSD: undefined.c,v 1.61 2018/01/24 09:04:44 skrll Exp $ */
/*
* Copyright (c) 2001 Ben Harris.
@@ -55,7 +55,7 @@
#include <sys/kgdb.h>
#endif
-__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.60 2017/07/02 16:16:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: undefined.c,v 1.61 2018/01/24 09:04:44 skrll Exp $");
#include <sys/kmem.h>
#include <sys/queue.h>
@@ -85,10 +85,6 @@ __KERNEL_RCSID(0, "$NetBSD: undefined.c,
#include <machine/db_machdep.h>
#endif
-#ifdef acorn26
-#include <machine/machdep.h>
-#endif
-
static int gdb_trapper(u_int, u_int, struct trapframe *, int);
LIST_HEAD(, undefined_handler) undefined_handlers[NUM_UNKNOWN_HANDLERS];
@@ -305,14 +301,8 @@ undefinedinstruction(trapframe_t *tf)
#endif
/* Enable interrupts if they were enabled before the exception. */
-#ifdef acorn26
- if ((tf->tf_r15 & R15_IRQ_DISABLE) == 0)
- int_on();
-#else
restore_interrupts(tf->tf_spsr & IF32_bits);
-#endif
-#ifndef acorn26
#ifdef THUMB_CODE
if (tf->tf_spsr & PSR_T_bit)
tf->tf_pc -= THUMB_INSN_SIZE;
@@ -321,22 +311,13 @@ undefinedinstruction(trapframe_t *tf)
{
tf->tf_pc -= INSN_SIZE;
}
-#endif
-#ifdef __PROG26
- fault_pc = tf->tf_r15 & R15_PC;
-#else
fault_pc = tf->tf_pc;
-#endif
/* Get the current lwp/proc structure or lwp0/proc0 if there is none. */
l = curlwp;
-#ifdef __PROG26
- if ((tf->tf_r15 & R15_MODE) == R15_MODE_USR) {
-#else
if ((tf->tf_spsr & PSR_MODE) == PSR_USR32_MODE) {
-#endif
user = 1;
LWP_CACHE_CREDS(l, l->l_proc);
} else
Index: src/sys/arch/arm/arm32/genassym.cf
diff -u src/sys/arch/arm/arm32/genassym.cf:1.76 src/sys/arch/arm/arm32/genassym.cf:1.77
--- src/sys/arch/arm/arm32/genassym.cf:1.76 Wed Jul 12 09:49:08 2017
+++ src/sys/arch/arm/arm32/genassym.cf Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.76 2017/07/12 09:49:08 skrll Exp $
+# $NetBSD: genassym.cf,v 1.77 2018/01/24 09:04:44 skrll Exp $
# Copyright (c) 1982, 1990 The Regents of the University of California.
# All rights reserved.
@@ -168,15 +168,15 @@ define LW_SYSTEM LW_SYSTEM
define P_RASLIST offsetof(struct proc, p_raslist)
-define PCB_R8 offsetof(struct pcb, pcb_un.un_32.pcb32_r8)
-define PCB_R9 offsetof(struct pcb, pcb_un.un_32.pcb32_r9)
-define PCB_R10 offsetof(struct pcb, pcb_un.un_32.pcb32_r10)
-define PCB_R11 offsetof(struct pcb, pcb_un.un_32.pcb32_r11)
-define PCB_R12 offsetof(struct pcb, pcb_un.un_32.pcb32_r12)
-define PCB_KSP offsetof(struct pcb, pcb_un.un_32.pcb32_sp)
-define PCB_LR offsetof(struct pcb, pcb_un.un_32.pcb32_lr)
-define PCB_PC offsetof(struct pcb, pcb_un.un_32.pcb32_pc)
-define PCB_USER_PID_RW offsetof(struct pcb, pcb_un.un_32.pcb32_user_pid_rw)
+define PCB_R8 offsetof(struct pcb, pcb_r8)
+define PCB_R9 offsetof(struct pcb, pcb_r9)
+define PCB_R10 offsetof(struct pcb, pcb_r10)
+define PCB_R11 offsetof(struct pcb, pcb_r11)
+define PCB_R12 offsetof(struct pcb, pcb_r12)
+define PCB_KSP offsetof(struct pcb, pcb_sp)
+define PCB_LR offsetof(struct pcb, pcb_lr)
+define PCB_PC offsetof(struct pcb, pcb_pc)
+define PCB_USER_PID_RW offsetof(struct pcb, pcb_user_pid_rw)
define PCB_ONFAULT offsetof(struct pcb, pcb_onfault)
define PCB_VFP_FPEXC offsetof(struct pcb, pcb_vfp.vfp_fpexc)
Index: src/sys/arch/arm/conf/files.arm
diff -u src/sys/arch/arm/conf/files.arm:1.137 src/sys/arch/arm/conf/files.arm:1.138
--- src/sys/arch/arm/conf/files.arm:1.137 Wed Jan 17 20:30:16 2018
+++ src/sys/arch/arm/conf/files.arm Wed Jan 24 09:04:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.arm,v 1.137 2018/01/17 20:30:16 skrll Exp $
+# $NetBSD: files.arm,v 1.138 2018/01/24 09:04:44 skrll Exp $
# temporary define to allow easy moving to ../arch/arm/arm32
defflag ARM32
@@ -198,8 +198,6 @@ file arch/arm/arm/sig_machdep.c
file arch/arm/arm/sigcode.S
file arch/arm/arm/syscall.c
file arch/arm/arm/undefined.c
-# vectors.S gets included manually by Makefile.acorn26, since it needs
-# to be at the start of the text segment on those machines.
file arch/arm/arm/vectors.S arm32
# files common to arm32 implementations
Index: src/sys/arch/arm/include/armreg.h
diff -u src/sys/arch/arm/include/armreg.h:1.116 src/sys/arch/arm/include/armreg.h:1.117
--- src/sys/arch/arm/include/armreg.h:1.116 Wed Dec 20 15:22:14 2017
+++ src/sys/arch/arm/include/armreg.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: armreg.h,v 1.116 2017/12/20 15:22:14 skrll Exp $ */
+/* $NetBSD: armreg.h,v 1.117 2018/01/24 09:04:45 skrll Exp $ */
/*
* Copyright (c) 1998, 2001 Ben Harris
@@ -78,10 +78,6 @@
#define PSR_T_bit (1 << 5) /* Thumb state */
#define PSR_MODE 0x0000001f /* mode mask */
-#define PSR_USR26_MODE 0x00000000
-#define PSR_FIQ26_MODE 0x00000001
-#define PSR_IRQ26_MODE 0x00000002
-#define PSR_SVC26_MODE 0x00000003
#define PSR_USR32_MODE 0x00000010
#define PSR_FIQ32_MODE 0x00000011
#define PSR_IRQ32_MODE 0x00000012
@@ -93,22 +89,6 @@
#define PSR_SYS32_MODE 0x0000001f
#define PSR_32_MODE 0x00000010
-#define PSR_IN_USR_MODE(psr) (!((psr) & 3)) /* XXX */
-#define PSR_IN_32_MODE(psr) ((psr) & PSR_32_MODE)
-
-/* In 26-bit modes, the PSR is stuffed into R15 along with the PC. */
-
-#define R15_MODE 0x00000003
-#define R15_MODE_USR 0x00000000
-#define R15_MODE_FIQ 0x00000001
-#define R15_MODE_IRQ 0x00000002
-#define R15_MODE_SVC 0x00000003
-
-#define R15_PC 0x03fffffc
-
-#define R15_FIQ_DISABLE 0x04000000
-#define R15_IRQ_DISABLE 0x08000000
-
#define R15_FLAGS 0xf0000000
#define R15_FLAG_N 0x80000000
#define R15_FLAG_Z 0x40000000
Index: src/sys/arch/arm/include/cpu.h
diff -u src/sys/arch/arm/include/cpu.h:1.94 src/sys/arch/arm/include/cpu.h:1.95
--- src/sys/arch/arm/include/cpu.h:1.94 Sat Dec 16 00:37:51 2017
+++ src/sys/arch/arm/include/cpu.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.94 2017/12/16 00:37:51 mrg Exp $ */
+/* $NetBSD: cpu.h,v 1.95 2018/01/24 09:04:45 skrll Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -88,17 +88,13 @@ extern int cpu_fpu_present;
* CLKF_USERMODE: Return TRUE/FALSE (1/0) depending on whether the
* frame came from USR mode or not.
*/
-#ifdef __PROG32
#define CLKF_USERMODE(cf) (((cf)->cf_tf.tf_spsr & PSR_MODE) == PSR_USR32_MODE)
-#else
-#define CLKF_USERMODE(cf) (((cf)->cf_if.if_r15 & R15_MODE) == R15_MODE_USR)
-#endif
/*
* CLKF_INTR: True if we took the interrupt from inside another
* interrupt handler.
*/
-#if defined(__PROG32) && !defined(__ARM_EABI__)
+#if !defined(__ARM_EABI__)
/* Hack to treat FPE time as interrupt time so we can measure it */
#define CLKF_INTR(cf) \
((curcpu()->ci_intr_depth > 1) || \
@@ -110,20 +106,12 @@ extern int cpu_fpu_present;
/*
* CLKF_PC: Extract the program counter from a clockframe
*/
-#ifdef __PROG32
#define CLKF_PC(frame) (frame->cf_tf.tf_pc)
-#else
-#define CLKF_PC(frame) (frame->cf_if.if_r15 & R15_PC)
-#endif
/*
* LWP_PC: Find out the program counter for the given lwp.
*/
-#ifdef __PROG32
#define LWP_PC(l) (lwp_trapframe(l)->tf_pc)
-#else
-#define LWP_PC(l) (lwp_trapframe(l)->tf_r15 & R15_PC)
-#endif
/*
* Per-CPU information. For now we assume one CPU.
@@ -275,11 +263,7 @@ cpu_dosoftints(void)
#endif
}
-#ifdef __PROG32
void cpu_proc_fork(struct proc *, struct proc *);
-#else
-#define cpu_proc_fork(p1, p2)
-#endif
/*
* Scheduling glue
@@ -315,12 +299,10 @@ void cpu_set_curpri(int);
*/
vaddr_t cpu_uarea_alloc_idlelwp(struct cpu_info *);
-#ifndef acorn26
/*
* cpu device glue (belongs in cpuvar.h)
*/
void cpu_attach(device_t, cpuid_t);
-#endif
#endif /* !_LOCORE */
Index: src/sys/arch/arm/include/cpufunc.h
diff -u src/sys/arch/arm/include/cpufunc.h:1.77 src/sys/arch/arm/include/cpufunc.h:1.78
--- src/sys/arch/arm/include/cpufunc.h:1.77 Sat Jul 16 01:49:42 2016
+++ src/sys/arch/arm/include/cpufunc.h Wed Jan 24 09:04:45 2018
@@ -245,7 +245,6 @@ u_int cpufunc_faultaddress (void);
/*
* Macros for manipulating CPU interrupts
*/
-#ifdef __PROG32
static __inline uint32_t __set_cpsr_c(uint32_t bic, uint32_t eor) __attribute__((__unused__));
static __inline uint32_t disable_interrupts(uint32_t mask) __attribute__((__unused__));
static __inline uint32_t enable_interrupts(uint32_t mask) __attribute__((__unused__));
@@ -360,28 +359,10 @@ cpsid(register_t psw)
#endif
}
-#else /* ! __PROG32 */
-#define disable_interrupts(mask) \
- (set_r15((mask) & (R15_IRQ_DISABLE | R15_FIQ_DISABLE), \
- (mask) & (R15_IRQ_DISABLE | R15_FIQ_DISABLE)))
-
-#define enable_interrupts(mask) \
- (set_r15((mask) & (R15_IRQ_DISABLE | R15_FIQ_DISABLE), 0))
-
-#define restore_interrupts(old_r15) \
- (set_r15((R15_IRQ_DISABLE | R15_FIQ_DISABLE), \
- (old_r15) & (R15_IRQ_DISABLE | R15_FIQ_DISABLE)))
-#endif /* __PROG32 */
-#ifdef __PROG32
/* Functions to manipulate the CPSR. */
u_int SetCPSR(u_int, u_int);
u_int GetCPSR(void);
-#else
-/* Functions to manipulate the processor control bits in r15. */
-u_int set_r15(u_int, u_int);
-u_int get_r15(void);
-#endif /* __PROG32 */
/*
Index: src/sys/arch/arm/include/db_machdep.h
diff -u src/sys/arch/arm/include/db_machdep.h:1.25 src/sys/arch/arm/include/db_machdep.h:1.26
--- src/sys/arch/arm/include/db_machdep.h:1.25 Mon Nov 6 03:47:45 2017
+++ src/sys/arch/arm/include/db_machdep.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.25 2017/11/06 03:47:45 christos Exp $ */
+/* $NetBSD: db_machdep.h,v 1.26 2018/01/24 09:04:45 skrll Exp $ */
/*
* Copyright (c) 1996 Scott K Stevens
@@ -57,13 +57,8 @@ extern db_regs_t *ddb_regp;
#define ddb_regs (*ddb_regp)
#endif
-#ifdef __PROG26
-#define PC_REGS(regs) ((regs)->tf_r15 & R15_PC)
-#define PC_ADVANCE(regs) ((regs)->tf_r15 += BKPT_SIZE)
-#else
#define PC_REGS(regs) ((regs)->tf_pc)
#define PC_ADVANCE(r) ((r)->tf_r15 += BKPT_SIZE)
-#endif
#define BKPT_ADDR(addr) (addr) /* breakpoint address */
#if defined(DDB)
Index: src/sys/arch/arm/include/frame.h
diff -u src/sys/arch/arm/include/frame.h:1.19 src/sys/arch/arm/include/frame.h:1.20
--- src/sys/arch/arm/include/frame.h:1.19 Tue Apr 25 09:01:38 2017
+++ src/sys/arch/arm/include/frame.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.19 2017/04/25 09:01:38 skrll Exp $ */
+/* $NetBSD: frame.h,v 1.20 2018/01/24 09:04:45 skrll Exp $ */
/*
* Copyright (c) 1994-1997 Mark Brinicombe.
@@ -79,11 +79,7 @@ typedef struct trapframe {
#define tf_r14 tf_usr_lr
#define tf_r15 tf_pc
-#ifdef __PROG32
#define TRAP_USERMODE(tf) (((tf)->tf_spsr & PSR_MODE) == PSR_USR32_MODE)
-#elif defined(__PROG26)
-#define TRAP_USERMODE(tf) (((tf)->tf_r15 & R15_MODE) == R15_MODE_USR)
-#endif
/*
* Signal frame. Pushed onto user stack before calling sigcode.
Index: src/sys/arch/arm/include/locore.h
diff -u src/sys/arch/arm/include/locore.h:1.28 src/sys/arch/arm/include/locore.h:1.29
--- src/sys/arch/arm/include/locore.h:1.28 Thu Aug 24 14:19:36 2017
+++ src/sys/arch/arm/include/locore.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.28 2017/08/24 14:19:36 jmcneill Exp $ */
+/* $NetBSD: locore.h,v 1.29 2018/01/24 09:04:45 skrll Exp $ */
/*
* Copyright (c) 1994-1996 Mark Brinicombe.
@@ -66,7 +66,7 @@
#if defined(_ARM_ARCH_6)
#define IRQdisable cpsid i
#define IRQenable cpsie i
-#elif defined(__PROG32)
+#else
#define IRQdisable \
stmfd sp!, {r0} ; \
mrs r0, cpsr ; \
@@ -80,8 +80,6 @@
bic r0, r0, #(I32_bit) ; \
msr cpsr_c, r0 ; \
ldmfd sp!, {r0}
-#else
-/* Not yet used in 26-bit code */
#endif
#if defined (TPIDRPRW_IS_CURCPU)
@@ -106,20 +104,14 @@
#include <arm/cpufunc.h>
-#ifdef __PROG32
#define IRQdisable __set_cpsr_c(I32_bit, I32_bit);
#define IRQenable __set_cpsr_c(I32_bit, 0);
-#else
-#define IRQdisable set_r15(R15_IRQ_DISABLE, R15_IRQ_DISABLE);
-#define IRQenable set_r15(R15_IRQ_DISABLE, 0);
-#endif
/*
* Validate a PC or PSR for a user process. Used by various system calls
* that take a context passed by the user and restore it.
*/
-#ifdef __PROG32
#ifdef __NO_FIQ
#define VALID_R15_PSR(r15,psr) \
(((psr) & PSR_MODE) == PSR_USR32_MODE && ((psr) & I32_bit) == 0)
@@ -127,11 +119,6 @@
#define VALID_R15_PSR(r15,psr) \
(((psr) & PSR_MODE) == PSR_USR32_MODE && ((psr) & IF32_bits) == 0)
#endif
-#else
-#define VALID_R15_PSR(r15,psr) \
- (((r15) & R15_MODE) == R15_MODE_USR && \
- ((r15) & (R15_IRQ_DISABLE | R15_FIQ_DISABLE)) == 0)
-#endif
/*
* Translation Table Base Register Share/Cache settings
@@ -141,7 +128,6 @@
/* The address of the vector page. */
extern vaddr_t vector_page;
-#ifdef __PROG32
void arm32_vector_init(vaddr_t, int);
#define ARM_VEC_RESET (1 << 0)
@@ -155,14 +141,11 @@ void arm32_vector_init(vaddr_t, int);
#define ARM_NVEC 8
#define ARM_VEC_ALL 0xffffffff
-#endif /* __PROG32 */
-#ifndef acorn26
/*
* cpu device glue (belongs in cpuvar.h)
*/
void cpu_attach(device_t, cpuid_t);
-#endif
/* 1 == use cpu_sleep(), 0 == don't */
extern int cpu_do_powersave;
Index: src/sys/arch/arm/include/pcb.h
diff -u src/sys/arch/arm/include/pcb.h:1.27 src/sys/arch/arm/include/pcb.h:1.28
--- src/sys/arch/arm/include/pcb.h:1.27 Fri Jan 11 14:04:55 2013
+++ src/sys/arch/arm/include/pcb.h Wed Jan 24 09:04:45 2018
@@ -41,55 +41,30 @@
#include <arm/arm32/pte.h>
#include <arm/reg.h>
-struct pcb_arm32 {
+#define pcb_ksp pcb_sp
+
+struct pcb {
/*
* WARNING!
- * cpuswitchto.S relies on pcb32_r8 being quad-aligned in struct pcb
+ * cpuswitchto.S relies on pcb_r8 being quad-aligned
* (due to the use of "strd" when compiled for XSCALE)
*/
- u_int pcb32_r8 __aligned(8); /* used */
- u_int pcb32_r9; /* used */
- u_int pcb32_r10; /* used */
- u_int pcb32_r11; /* used */
- u_int pcb32_r12; /* used */
- u_int pcb32_sp; /* used */
- u_int pcb32_lr;
- u_int pcb32_pc;
+ u_int pcb_r8 __aligned(8); /* used */
+ u_int pcb_r9; /* used */
+ u_int pcb_r10; /* used */
+ u_int pcb_r11; /* used */
+ u_int pcb_r12; /* used */
+ u_int pcb_sp; /* used */
+ u_int pcb_lr;
+ u_int pcb_pc;
/*
* ARMv6 has two user thread/process id registers which can hold
* any 32bit quanttiies.
*/
- u_int pcb32_user_pid_rw; /* p15, 0, Rd, c13, c0, 2 */
- u_int pcb32_user_pid_ro; /* p15, 0, Rd, c13, c0, 3 */
-};
-#define pcb_pagedir pcb_un.un_32.pcb32_pagedir
-#define pcb_pl1vec pcb_un.un_32.pcb32_pl1vec
-#define pcb_l1vec pcb_un.un_32.pcb32_l1vec
-#define pcb_dacr pcb_un.un_32.pcb32_dacr
-#define pcb_cstate pcb_un.un_32.pcb32_cstate
-#define pcb_user_pid_rw pcb_un.un_32.pcb32_user_pid_rw
-#ifdef __PROG32
-#define pcb_ksp pcb_un.un_32.pcb32_sp
-#endif
-
-struct pcb_arm26 {
- struct switchframe *pcb26_sf;
-};
-#define pcb_sf pcb_un.un_26.pcb26_sf
-#ifdef __PROG26
-#define pcb_ksp pcb_sf.sf_r13
-#endif
+ u_int pcb_user_pid_rw; /* p15, 0, Rd, c13, c0, 2 */
+ u_int pcb_user_pid_ro; /* p15, 0, Rd, c13, c0, 3 */
-/*
- * WARNING!
- * See warning for struct pcb_arm32, above, before changing struct pcb!
- */
-struct pcb {
- union {
- struct pcb_arm32 un_32;
- struct pcb_arm26 un_26;
- } pcb_un;
void * pcb_onfault; /* On fault handler */
struct vfpreg pcb_vfp; /* VFP registers */
struct vfpreg pcb_kernel_vfp; /* kernel VFP state */
Index: src/sys/arch/arm/include/profile.h
diff -u src/sys/arch/arm/include/profile.h:1.17 src/sys/arch/arm/include/profile.h:1.18
--- src/sys/arch/arm/include/profile.h:1.17 Sun Jan 11 20:52:57 2015
+++ src/sys/arch/arm/include/profile.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: profile.h,v 1.17 2015/01/11 20:52:57 joerg Exp $ */
+/* $NetBSD: profile.h,v 1.18 2018/01/24 09:04:45 skrll Exp $ */
/*
* Copyright (c) 2001 Ben Harris
@@ -169,12 +169,6 @@
#endif
#ifdef _KERNEL
-#ifdef __PROG26
-extern int int_off_save(void);
-extern void int_restore(int);
-#define MCOUNT_ENTER (s = int_off_save())
-#define MCOUNT_EXIT int_restore(s)
-#else
#include <arm/cpufunc.h>
/*
* splhigh() and splx() are heavyweight, and call mcount(). Therefore
@@ -184,5 +178,4 @@ extern void int_restore(int);
*/
#define MCOUNT_ENTER s = __set_cpsr_c(0x0080, 0x0080); /* kill IRQ */
#define MCOUNT_EXIT __set_cpsr_c(0xffffffff, s); /* restore old value */
-#endif /* !acorn26 */
#endif /* _KERNEL */
Index: src/sys/arch/arm/include/arm32/pmap.h
diff -u src/sys/arch/arm/include/arm32/pmap.h:1.153 src/sys/arch/arm/include/arm32/pmap.h:1.154
--- src/sys/arch/arm/include/arm32/pmap.h:1.153 Sun Oct 22 20:35:32 2017
+++ src/sys/arch/arm/include/arm32/pmap.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.153 2017/10/22 20:35:32 skrll Exp $ */
+/* $NetBSD: pmap.h,v 1.154 2018/01/24 09:04:45 skrll Exp $ */
/*
* Copyright (c) 2002, 2003 Wasabi Systems, Inc.
@@ -396,8 +396,6 @@ int pmap_fault_fixup(pmap_t, vaddr_t, vm
int pmap_prefetchabt_fixup(void *);
bool pmap_get_pde_pte(pmap_t, vaddr_t, pd_entry_t **, pt_entry_t **);
bool pmap_get_pde(pmap_t, vaddr_t, pd_entry_t **);
-struct pcb;
-void pmap_set_pcb_pagedir(pmap_t, struct pcb *);
void pmap_debug(int);
void pmap_postinit(void);
Index: src/sys/arch/arm/include/arm32/types.h
diff -u src/sys/arch/arm/include/arm32/types.h:1.11 src/sys/arch/arm/include/arm32/types.h:1.12
--- src/sys/arch/arm/include/arm32/types.h:1.11 Tue May 7 23:01:55 2013
+++ src/sys/arch/arm/include/arm32/types.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.11 2013/05/07 23:01:55 matt Exp $ */
+/* $NetBSD: types.h,v 1.12 2018/01/24 09:04:45 skrll Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -39,7 +39,6 @@
#define _ARM_ARM32_TYPES_H_
#ifdef _KERNEL
-#define __PROG32 /* indicate 32-bit mode */
#ifdef _KERNEL_OPT
#include "opt_arm32_pmap.h"
Index: src/sys/arch/arm/xscale/becc_intr.h
diff -u src/sys/arch/arm/xscale/becc_intr.h:1.6 src/sys/arch/arm/xscale/becc_intr.h:1.7
--- src/sys/arch/arm/xscale/becc_intr.h:1.6 Wed Feb 5 19:03:45 2014
+++ src/sys/arch/arm/xscale/becc_intr.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: becc_intr.h,v 1.6 2014/02/05 19:03:45 christos Exp $ */
+/* $NetBSD: becc_intr.h,v 1.7 2018/01/24 09:04:45 skrll Exp $ */
/*
* Copyright (c) 2002 Wasabi Systems, Inc.
@@ -45,7 +45,6 @@
#include <arm/xscale/beccreg.h>
#include <arm/xscale/becc_csrvar.h>
-#ifdef __PROG32
static inline void __attribute__((__unused__))
becc_set_intrmask(void)
{
@@ -103,7 +102,6 @@ becc_spllower(int ipl)
becc_splx(becc_imask[ipl]);
return (old);
}
-#endif /* __PROG32 */
#if !defined(EVBARM_SPL_NOINLINE)
Index: src/sys/arch/arm/xscale/i80321_intr.h
diff -u src/sys/arch/arm/xscale/i80321_intr.h:1.11 src/sys/arch/arm/xscale/i80321_intr.h:1.12
--- src/sys/arch/arm/xscale/i80321_intr.h:1.11 Tue Feb 4 18:51:16 2014
+++ src/sys/arch/arm/xscale/i80321_intr.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i80321_intr.h,v 1.11 2014/02/04 18:51:16 matt Exp $ */
+/* $NetBSD: i80321_intr.h,v 1.12 2018/01/24 09:04:45 skrll Exp $ */
/*
* Copyright (c) 2001, 2002, 2006 Wasabi Systems, Inc.
@@ -49,7 +49,6 @@
#include <arm/xscale/i80321reg.h>
-#ifdef __PROG32
static inline void __attribute__((__unused__))
i80321_set_intrmask(void)
{
@@ -112,7 +111,6 @@ i80321_spllower(int ipl)
return(old);
}
-#endif /* __PROG32 */
#if !defined(EVBARM_SPL_NOINLINE)
Index: src/sys/arch/arm/xscale/pxa2x0_intr.h
diff -u src/sys/arch/arm/xscale/pxa2x0_intr.h:1.14 src/sys/arch/arm/xscale/pxa2x0_intr.h:1.15
--- src/sys/arch/arm/xscale/pxa2x0_intr.h:1.14 Tue Feb 4 18:51:16 2014
+++ src/sys/arch/arm/xscale/pxa2x0_intr.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_intr.h,v 1.14 2014/02/04 18:51:16 matt Exp $ */
+/* $NetBSD: pxa2x0_intr.h,v 1.15 2018/01/24 09:04:45 skrll Exp $ */
/* Derived from i80321_intr.h */
@@ -59,7 +59,6 @@ extern vaddr_t pxaic_base; /* Shared wi
extern volatile int intr_mask;
extern int pxa2x0_imask[];
-#ifdef __PROG32
/*
* Cotulla's integrated ICU doesn't have IRQ0..7, so
@@ -129,7 +128,6 @@ find_first_bit(uint32_t bits)
return 31 - __builtin_clz(bits);
}
-#endif /* __PROG32 */
int _splraise(int);
int _spllower(int);
Index: src/sys/arch/iyonix/TODO
diff -u src/sys/arch/iyonix/TODO:1.2 src/sys/arch/iyonix/TODO:1.3
--- src/sys/arch/iyonix/TODO:1.2 Sun Dec 11 12:17:51 2005
+++ src/sys/arch/iyonix/TODO Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.2 2005/12/11 12:17:51 christos Exp $
+$NetBSD: TODO,v 1.3 2018/01/24 09:04:45 skrll Exp $
TODO list for NetBSD/iyonix:
@@ -12,5 +12,5 @@ TODO list for NetBSD/iyonix:
* RISC OS compatibility
* Share more code with other ARM ports
-* Share bootloader with acorn32/acorn26
+* Share bootloader with acorn32
Index: src/sys/arch/usermode/usermode/vm_machdep.c
diff -u src/sys/arch/usermode/usermode/vm_machdep.c:1.4 src/sys/arch/usermode/usermode/vm_machdep.c:1.5
--- src/sys/arch/usermode/usermode/vm_machdep.c:1.4 Tue Dec 27 14:55:31 2011
+++ src/sys/arch/usermode/usermode/vm_machdep.c Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.4 2011/12/27 14:55:31 reinoud Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.5 2018/01/24 09:04:45 skrll Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.4 2011/12/27 14:55:31 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.5 2018/01/24 09:04:45 skrll Exp $");
#include <sys/param.h>
#include <sys/buf.h>
@@ -41,7 +41,7 @@ __KERNEL_RCSID(0, "$NetBSD: vm_machdep.c
* Note: the pages are already locked by uvm_vslock(), so we
* do not need to pass an access_type to pmap_enter().
*/
-/* This code was originally stolen from the alpha/acorn26 port. */
+/* This code was originally stolen from the alpha port. */
int
vmapbuf(struct buf *bp, vsize_t len)
Index: src/sys/compat/linux/arch/arm/linux_sys_machdep.c
diff -u src/sys/compat/linux/arch/arm/linux_sys_machdep.c:1.14 src/sys/compat/linux/arch/arm/linux_sys_machdep.c:1.15
--- src/sys/compat/linux/arch/arm/linux_sys_machdep.c:1.14 Wed Jul 7 01:30:33 2010
+++ src/sys/compat/linux/arch/arm/linux_sys_machdep.c Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_sys_machdep.c,v 1.14 2010/07/07 01:30:33 chs Exp $ */
+/* $NetBSD: linux_sys_machdep.c,v 1.15 2018/01/24 09:04:45 skrll Exp $ */
/*-
* Copyright (c) 2002 Ben Harris
@@ -29,7 +29,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: linux_sys_machdep.c,v 1.14 2010/07/07 01:30:33 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_sys_machdep.c,v 1.15 2018/01/24 09:04:45 skrll Exp $");
#include <sys/systm.h>
#include <sys/signalvar.h>
@@ -59,7 +59,6 @@ linux_sys_breakpoint(struct lwp *l, cons
int
linux_sys_cacheflush(struct lwp *l, const struct linux_sys_cacheflush_args *uap, register_t *retval)
{
-#ifndef acorn26
/* {
syscallarg(uintptr_t) from;
syscallarg(uintptr_t) to;
@@ -68,7 +67,6 @@ linux_sys_cacheflush(struct lwp *l, cons
cpu_icache_sync_range(SCARG(uap, from),
SCARG(uap, to) - SCARG(uap, from) + 1);
-#endif
*retval = 0;
return 0;
}
Index: src/sys/dev/ic/ncr5380var.h
diff -u src/sys/dev/ic/ncr5380var.h:1.33 src/sys/dev/ic/ncr5380var.h:1.34
--- src/sys/dev/ic/ncr5380var.h:1.33 Sat Jul 28 00:43:23 2012
+++ src/sys/dev/ic/ncr5380var.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ncr5380var.h,v 1.33 2012/07/28 00:43:23 matt Exp $ */
+/* $NetBSD: ncr5380var.h,v 1.34 2018/01/24 09:04:45 skrll Exp $ */
/*
* Copyright (c) 1995 David Jones, Gordon W. Ross
@@ -38,14 +38,14 @@
*/
/*
- * Currently acorn26, amd64, alpha, i386, mips, news68k, sparc, sun2, and vax
+ * Currently amd64, alpha, i386, mips, news68k, sparc, sun2, and vax
* use real bus space:
* acorn32: csa driver; easy to convert
* mac68k: sbc driver; easy to convert
* pc532: ncr driver; need bus.h first
* sun3: si driver; need bus.h first
*/
-#if defined(acorn26) || \
+#if \
defined(__alpha__) || \
defined(__amd64__) || \
defined(__i386__) || \
Index: src/sys/modules/Makefile.assym
diff -u src/sys/modules/Makefile.assym:1.5 src/sys/modules/Makefile.assym:1.6
--- src/sys/modules/Makefile.assym:1.5 Mon May 11 21:26:41 2015
+++ src/sys/modules/Makefile.assym Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.assym,v 1.5 2015/05/11 21:26:41 martin Exp $
+# $NetBSD: Makefile.assym,v 1.6 2018/01/24 09:04:45 skrll Exp $
DPSRCS+= assym.h
CLEANFILES+= assym.h
@@ -12,12 +12,8 @@ CPPFLAGS+= -DPPC_OEA
.endif
.if (!empty(MACHINE_ARCH:Mearm*) || !empty(MACHINE_ARCH:Marm*))
-.if ${MACHINE} == "acorn26"
-GENASSYM_DIR= $S/arch/acorn26/acorn26
-.else
GENASSYM_DIR= $S/arch/arm/arm32
.endif
-.endif
.if exists($S/arch/${MACHINE}/${MACHINE}/genassym.cf)
GENASSYM_DIR?= $S/arch/${MACHINE}/${MACHINE}
Index: src/sys/sys/mman.h
diff -u src/sys/sys/mman.h:1.52 src/sys/sys/mman.h:1.53
--- src/sys/sys/mman.h:1.52 Sat May 6 21:34:52 2017
+++ src/sys/sys/mman.h Wed Jan 24 09:04:45 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mman.h,v 1.52 2017/05/06 21:34:52 joerg Exp $ */
+/* $NetBSD: mman.h,v 1.53 2018/01/24 09:04:45 skrll Exp $ */
/*-
* Copyright (c) 1982, 1986, 1993
@@ -104,7 +104,7 @@ typedef __off_t off_t; /* file offset
/*
* Alignment (expressed in log2). Must be >= log2(PAGE_SIZE) and
- * < # bits in a pointer (26 (acorn26), 32 or 64).
+ * < # bits in a pointer (32 or 64).
*/
#define MAP_ALIGNED(n) ((n) << MAP_ALIGNMENT_SHIFT)
#define MAP_ALIGNMENT_SHIFT 24
Index: src/tools/headerlist
diff -u src/tools/headerlist:1.14 src/tools/headerlist:1.15
--- src/tools/headerlist:1.14 Tue Feb 23 11:43:57 2016
+++ src/tools/headerlist Wed Jan 24 09:04:45 2018
@@ -1,12 +1,10 @@
-# $NetBSD: headerlist,v 1.14 2016/02/23 11:43:57 skrll Exp $
+# $NetBSD: headerlist,v 1.15 2018/01/24 09:04:45 skrll Exp $
#
# do not edit; this file was automatically generated by:
# NetBSD: mkheaderlist.sh,v 1.3 2016/02/23 11:43:04 skrll Exp
./aarch64/include/disklabel.h
./aarch64/include/elf_machdep.h
-./acorn26/include/disklabel.h
-./acorn26/include/elf_machdep.h
./acorn32/include/disklabel.h
./acorn32/include/elf_machdep.h
./algor/include/disklabel.h
Index: src/usr.sbin/crash/Makefile
diff -u src/usr.sbin/crash/Makefile:1.37 src/usr.sbin/crash/Makefile:1.38
--- src/usr.sbin/crash/Makefile:1.37 Fri Jul 21 20:58:44 2017
+++ src/usr.sbin/crash/Makefile Wed Jan 24 09:04:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2017/07/21 20:58:44 nakayama Exp $
+# $NetBSD: Makefile,v 1.38 2018/01/24 09:04:46 skrll Exp $
PROG= crash
MAN= crash.8
@@ -18,7 +18,7 @@ DPADD+= ${LIBUTIL} ${LIBKVM} ${LIBEDIT}
|| ${MACHINE} == "i386" \
|| ${MACHINE} == "sparc" \
|| ${MACHINE} == "sparc64" \
- || (${MACHINE_CPU} == "arm" && ${MACHINE} != "acorn26") \
+ || ${MACHINE_CPU} == "arm" \
|| ${MACHINE_ARCH} == "m68k"
SRCS+= db_trace.c
.if ${MACHINE_ARCH} != "m68k"
Index: src/usr.sbin/sysinst/Makefile
diff -u src/usr.sbin/sysinst/Makefile:1.2 src/usr.sbin/sysinst/Makefile:1.3
--- src/usr.sbin/sysinst/Makefile:1.2 Sat Jul 26 19:56:30 2014
+++ src/usr.sbin/sysinst/Makefile Wed Jan 24 09:04:46 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2014/07/26 19:56:30 dholland Exp $
+# $NetBSD: Makefile,v 1.3 2018/01/24 09:04:46 skrll Exp $
#
# sysinst is usually built when the crunched install binary is built,
# but can be built here as a normal program for testing.
@@ -12,7 +12,6 @@ SUBDIR+=arch/dummy
.if ALL_MACHINES
-SUBDIR = arch/acorn26
SUBDIR += arch/acorn32
SUBDIR += arch/alpha
SUBDIR += arch/amd64
Index: src/usr.sbin/sysinst/arch/acorn32/md.c
diff -u src/usr.sbin/sysinst/arch/acorn32/md.c:1.2 src/usr.sbin/sysinst/arch/acorn32/md.c:1.3
--- src/usr.sbin/sysinst/arch/acorn32/md.c:1.2 Sun Aug 3 16:09:38 2014
+++ src/usr.sbin/sysinst/arch/acorn32/md.c Wed Jan 24 09:04:46 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.2 2014/08/03 16:09:38 martin Exp $ */
+/* $NetBSD: md.c,v 1.3 2018/01/24 09:04:46 skrll Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -32,7 +32,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-/* md.c -- arm32 machine specific routines - also used by acorn26 */
+/* md.c -- arm32 machine specific routines */
#include <stdio.h>
#include <curses.h>
