summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatt <matt@NetBSD.org>2013-05-02 03:56:38 +0000
committermatt <matt@NetBSD.org>2013-05-02 03:56:38 +0000
commit0fa6fa9d501fa6ddcec1d2c503a53049763f9c8b (patch)
tree34aad60f4c169d00cf803eeb205d498a8d2d5e69
parent7265b614ce4ae8f83ea9d57b2c0f65f118a2a9ae (diff)
This change arm, armeb, earm, earmeb, earmhf, earmhfeb so all builds that
share a MACHINE_ARCH for userland so that except for etc, will produce identical sets. usr/include/machine now points to usr/include/arm
-rw-r--r--distrib/sets/lists/base/ad.arm38
-rw-r--r--distrib/sets/lists/base/md.acorn264
-rw-r--r--distrib/sets/lists/base/md.acorn326
-rw-r--r--distrib/sets/lists/base/md.evbarm14
-rw-r--r--distrib/sets/lists/base/md.evbarm.armeb3
-rw-r--r--distrib/sets/lists/base/md.hpcarm5
-rw-r--r--distrib/sets/lists/base/md.shark6
-rw-r--r--distrib/sets/lists/base/md.zaurus7
-rw-r--r--distrib/sets/lists/comp/ad.arm555
-rw-r--r--distrib/sets/lists/comp/md.acorn26104
-rw-r--r--distrib/sets/lists/comp/md.acorn3257
-rw-r--r--distrib/sets/lists/comp/md.cats51
-rw-r--r--distrib/sets/lists/comp/md.epoc3243
-rw-r--r--distrib/sets/lists/comp/md.evbarm51
-rw-r--r--distrib/sets/lists/comp/md.evbarm.armeb50
-rw-r--r--distrib/sets/lists/comp/md.hpcarm50
-rw-r--r--distrib/sets/lists/comp/md.iyonix50
-rw-r--r--distrib/sets/lists/comp/md.netwinder50
-rw-r--r--distrib/sets/lists/comp/md.shark52
-rw-r--r--distrib/sets/lists/comp/md.zaurus49
-rw-r--r--distrib/sets/lists/debug/ad.arm10
-rw-r--r--distrib/sets/lists/debug/md.hpcarm3
-rw-r--r--distrib/sets/lists/debug/md.shark4
-rw-r--r--distrib/sets/lists/debug/md.zaurus4
-rw-r--r--external/bsd/elftosb/lib/Makefile9
-rw-r--r--external/bsd/elftosb/usr.sbin/elftosb/Makefile7
-rw-r--r--external/bsd/elftosb/usr.sbin/sbkeygen/Makefile7
-rw-r--r--external/bsd/elftosb/usr.sbin/sbtool/Makefile7
-rw-r--r--external/gpl3/gdb/dist/gdb/armnbsd-nat.c1
-rw-r--r--sys/arch/Makefile15
-rw-r--r--sys/arch/acorn26/include/Makefile25
-rw-r--r--sys/arch/acorn32/include/Makefile27
-rw-r--r--sys/arch/arm/include/Makefile5
-rw-r--r--sys/arch/arm/include/Makefile.common9
-rw-r--r--sys/arch/arm/include/apmvar.h34
-rw-r--r--sys/arch/arm/include/joystick.h3
-rw-r--r--sys/arch/cats/include/Makefile27
-rw-r--r--sys/arch/epoc32/include/Makefile25
-rw-r--r--sys/arch/epoc32/include/disklabel.h35
-rw-r--r--sys/arch/epoc32/include/types.h4
-rw-r--r--sys/arch/evbarm/include/Makefile9
-rw-r--r--sys/arch/evbarm/stand/Makefile.inc3
-rw-r--r--sys/arch/evbarm/stand/gzboot/Makefile8
-rw-r--r--sys/arch/hpcarm/include/Makefile25
-rw-r--r--sys/arch/iyonix/include/Makefile27
-rw-r--r--sys/arch/netwinder/include/Makefile27
-rw-r--r--sys/arch/shark/include/Makefile27
-rw-r--r--sys/arch/zaurus/include/Makefile25
-rw-r--r--sys/arch/zaurus/stand/zboot/Makefile4
-rw-r--r--sys/lib/libkern/arch/arm/Makefile.inc4
-rw-r--r--usr.sbin/apm/Makefile7
-rw-r--r--usr.sbin/apmd/Makefile8
-rw-r--r--usr.sbin/eeprom/Makefile8
-rw-r--r--usr.sbin/ofctl/Makefile6
-rw-r--r--usr.sbin/tpctl/Makefile7
55 files changed, 769 insertions, 932 deletions
diff --git a/distrib/sets/lists/base/ad.arm b/distrib/sets/lists/base/ad.arm
index 20ec15e454d..2b7b31c9bb0 100644
--- a/distrib/sets/lists/base/ad.arm
+++ b/distrib/sets/lists/base/ad.arm
@@ -1,5 +1,5 @@
-# $NetBSD: ad.arm,v 1.14 2013/05/01 04:02:54 matt Exp $
-./sbin/ldconfig base-sysutil-root pic
+# $NetBSD: ad.arm,v 1.15 2013/05/02 03:56:38 matt Exp $
+./sbin/ldconfig base-sysutil-root pic,endian=1234
./lib/oabi base-compat-shlib compat
./lib/oabi/npf base-npf-shlib compat
./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic
@@ -13,6 +13,15 @@
./lib/oabi/npf/ext_rndblock.so.0.0 base-npf-shlib compat,pic
./libexec/ld.elf_so-oabi base-sysutil-bin compat,pic
./usr/bin/fdformat base-util-bin
+./usr/sbin/apm base-sysutil-bin
+./usr/sbin/apmd base-sysutil-bin
+./usr/sbin/elftosb base-sysutil-bin endian=1234
+./usr/sbin/eeprom base-sysutil-bin endian=1234
+./usr/sbin/ofctl base-sysutil-bin endian=1234
+./usr/sbin/sbtool base-sysutil-bin endian=1234
+./usr/sbin/sbkeygen base-sysutil-bin endian=1234
+./usr/sbin/tpctl base-sysutil-bin
+./usr/sbin/zzz base-sysutil-bin
./usr/lib/libarm.so base-sys-shlib pic
./usr/lib/libarm.so.0 base-sys-shlib pic
./usr/lib/libarm.so.0.0 base-sys-shlib pic
@@ -21,10 +30,10 @@
./usr/lib/libpmc.so.1.0 base-sys-shlib pic
./usr/libexec/ld.so base-sys-shlib pic,endian=1234
./usr/libexec/ld.elf_so-oabi base-sysutil-bin compat,pic
-./usr/lib/oabi base-compat-lib eabi
+./usr/lib/oabi base-compat-lib compat,eabi
./usr/lib/oabi/libarm.so.0 base-sys-shlib compat,pic
./usr/lib/oabi/libarm.so.0.0 base-sys-shlib compat,pic
-./usr/lib/oabi/i18n base-compat-lib eabi
+./usr/lib/oabi/i18n base-compat-lib compat,eabi
./usr/lib/oabi/i18n/libBIG5.so.5 base-i18n-shlib compat,pic
./usr/lib/oabi/i18n/libBIG5.so.5.0 base-i18n-shlib compat,pic
./usr/lib/oabi/i18n/libDECHanyu.so.5 base-i18n-shlib compat,pic
@@ -336,7 +345,7 @@
./usr/lib/oabi/npf/ext_rndblock.so base-obsolete obsolete
./usr/lib/oabi/npf/ext_rndblock.so.0 base-obsolete obsolete
./usr/lib/oabi/npf/ext_rndblock.so.0.0 base-obsolete obsolete
-./usr/lib/oabi/security base-compat-shlib eabi
+./usr/lib/oabi/security base-compat-shlib compat,eabi
./usr/lib/oabi/security/pam_afslog.so.4 base-compat-shlib compat,pic,kerberos,pam
./usr/lib/oabi/security/pam_chroot.so.4 base-compat-shlib compat,pic,pam
./usr/lib/oabi/security/pam_deny.so.4 base-compat-shlib compat,pic,pam
@@ -359,3 +368,22 @@
./usr/lib/oabi/security/pam_skey.so.4 base-compat-shlib compat,pic,skey,pam
./usr/lib/oabi/security/pam_ssh.so.4 base-compat-shlib compat,pic,crypto,pam
./usr/lib/oabi/security/pam_unix.so.4 base-compat-shlib compat,pic,pam
+./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/boot32 base-sysutil-bin endian=1234,!eabi
+./usr/mdec/boot32,ffa base-sysutil-bin endian=1234,!eabi
+./usr/mdec/nbfs base-sysutil-bin endian=1234,!eabi
+./usr/mdec/nbfs,ffa base-sysutil-bin endian=1234,!eabi
+./usr/mdec/gzboot_ADI_BRH_0x00140000.bin base-sysutil-bin
+./usr/mdec/gzboot_GEMINI_0x01600000.bin base-sysutil-bin endian=1234
+./usr/mdec/gzboot_IQ80310_0x00080000.bin base-sysutil-bin endian=1234
+./usr/mdec/gzboot_IQ80321_0xf0080000.bin base-sysutil-bin endian=1234
+./usr/mdec/gzboot_SMDK2410_0x00000000.bin base-sysutil-bin endian=1234
+./usr/mdec/gzboot_SMDK2800_0x00000000.bin base-sysutil-bin endian=1234
+./usr/mdec/gzboot_SMDK2800_0x00100000.bin base-sysutil-bin endian=1234
+./usr/mdec/gzboot_TS7200_0x60660000.bin base-sysutil-bin endian=1234
+./usr/mdec/bootmini2440 base-sysutil-bin
+./usr/mdec/bootimx23 base-sysutil-bin endian=1234
+./usr/mdec/zboot base-sysutil-bin endian=1234
+./usr/mdec/zbsdmod.o base-sysutil-bin endian=1234
diff --git a/distrib/sets/lists/base/md.acorn26 b/distrib/sets/lists/base/md.acorn26
deleted file mode 100644
index 1743c8c2fef..00000000000
--- a/distrib/sets/lists/base/md.acorn26
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: md.acorn26,v 1.6 2008/11/29 17:57:33 tsutsui Exp $
-./usr/mdec/BBBB base-obsolete obsolete
-./usr/mdec/boot26 base-sysutil-bin
-./usr/mdec/boot26,ffa base-sysutil-bin
diff --git a/distrib/sets/lists/base/md.acorn32 b/distrib/sets/lists/base/md.acorn32
index 9eb3b80323a..2c952775ae6 100644
--- a/distrib/sets/lists/base/md.acorn32
+++ b/distrib/sets/lists/base/md.acorn32
@@ -1,6 +1,2 @@
-# $NetBSD: md.acorn32,v 1.12 2009/02/14 22:46:05 abs Exp $
+# $NetBSD: md.acorn32,v 1.13 2013/05/02 03:56:38 matt Exp $
./dev/beep base-obsolete obsolete
-./usr/mdec/boot32 base-sysutil-bin
-./usr/mdec/boot32,ffa base-sysutil-bin
-./usr/mdec/nbfs base-sysutil-bin
-./usr/mdec/nbfs,ffa base-sysutil-bin
diff --git a/distrib/sets/lists/base/md.evbarm b/distrib/sets/lists/base/md.evbarm
deleted file mode 100644
index 285c4ad8bc7..00000000000
--- a/distrib/sets/lists/base/md.evbarm
+++ /dev/null
@@ -1,14 +0,0 @@
-# $NetBSD: md.evbarm,v 1.12 2012/11/20 19:09:47 jkunz Exp $
-./usr/mdec/gzboot_ADI_BRH_0x00140000.bin base-sysutil-bin
-./usr/mdec/gzboot_GEMINI_0x01600000.bin base-sysutil-bin
-./usr/mdec/gzboot_IQ80310_0x00080000.bin base-sysutil-bin
-./usr/mdec/gzboot_IQ80321_0xf0080000.bin base-sysutil-bin
-./usr/mdec/gzboot_SMDK2410_0x00000000.bin base-sysutil-bin
-./usr/mdec/gzboot_SMDK2800_0x00000000.bin base-sysutil-bin
-./usr/mdec/gzboot_SMDK2800_0x00100000.bin base-sysutil-bin
-./usr/mdec/gzboot_TS7200_0x60660000.bin base-sysutil-bin
-./usr/mdec/bootmini2440 base-sysutil-bin
-./usr/mdec/bootimx23 base-sysutil-bin
-./usr/sbin/elftosb base-sysutil-bin
-./usr/sbin/sbtool base-sysutil-bin
-./usr/sbin/sbkeygen base-sysutil-bin
diff --git a/distrib/sets/lists/base/md.evbarm.armeb b/distrib/sets/lists/base/md.evbarm.armeb
deleted file mode 100644
index 1574c0e3b33..00000000000
--- a/distrib/sets/lists/base/md.evbarm.armeb
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: md.evbarm.armeb,v 1.4 2012/10/14 12:36:57 msaitoh Exp $
-./usr/mdec/gzboot_ADI_BRH_0x00140000.bin base-sysutil-bin
-./usr/mdec/bootmini2440 base-sysutil-bin
diff --git a/distrib/sets/lists/base/md.hpcarm b/distrib/sets/lists/base/md.hpcarm
index 7c525b194fd..56bdb432ea1 100644
--- a/distrib/sets/lists/base/md.hpcarm
+++ b/distrib/sets/lists/base/md.hpcarm
@@ -1,8 +1,5 @@
-# $NetBSD: md.hpcarm,v 1.11 2008/11/29 17:57:33 tsutsui Exp $
+# $NetBSD: md.hpcarm,v 1.12 2013/05/02 03:56:38 matt Exp $
./dev/beep base-obsolete obsolete
./dev/mouse-qms0 base-obsolete obsolete
./dev/pms0 base-obsolete obsolete
./dev/qms0 base-obsolete obsolete
-./usr/sbin/apm base-sysutil-bin
-./usr/sbin/tpctl base-sysutil-bin
-./usr/sbin/zzz base-sysutil-bin
diff --git a/distrib/sets/lists/base/md.shark b/distrib/sets/lists/base/md.shark
index 9340022b4b6..abd1faa8274 100644
--- a/distrib/sets/lists/base/md.shark
+++ b/distrib/sets/lists/base/md.shark
@@ -1,7 +1,3 @@
-# $NetBSD: md.shark,v 1.10 2011/12/15 07:52:13 macallan Exp $
+# $NetBSD: md.shark,v 1.11 2013/05/02 03:56:38 matt Exp $
./dev/mouse-qms0 base-obsolete obsolete
./dev/qms0 base-obsolete obsolete
-./usr/sbin/eeprom base-sysutil-bin
-./sbin/ldconfig base-sysutil-root pic
-./usr/libexec/ld.so base-sys-shlib pic
-./usr/sbin/ofctl base-sysutil-bin
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
deleted file mode 100644
index a6b32ea38cc..00000000000
--- a/distrib/sets/lists/base/md.zaurus
+++ /dev/null
@@ -1,7 +0,0 @@
-# $NetBSD: md.zaurus,v 1.7 2009/03/03 08:02:41 nonaka Exp $
-./usr/mdec/zboot base-sysutil-bin
-./usr/mdec/zbsdmod.o base-sysutil-bin
-./usr/sbin/apm base-sysutil-bin
-./usr/sbin/apmd base-sysutil-bin
-./usr/sbin/tpctl base-sysutil-bin
-./usr/sbin/zzz base-sysutil-bin
diff --git a/distrib/sets/lists/comp/ad.arm b/distrib/sets/lists/comp/ad.arm
index 5c632ba500b..ca626446bf2 100644
--- a/distrib/sets/lists/comp/ad.arm
+++ b/distrib/sets/lists/comp/ad.arm
@@ -1,11 +1,119 @@
-# $NetBSD: ad.arm,v 1.48 2013/05/01 16:18:14 matt Exp $
+# $NetBSD: ad.arm,v 1.49 2013/05/02 03:56:38 matt Exp $
./usr/include/gcc-4.5/arm_neon.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/mmintrin.h comp-c-include gcccmds,gcc=45
./usr/include/gcc-4.5/tgmath.h comp-c-include gcccmds,gcc=45
+./usr/include/acorn26 comp-c-include
+./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
+./usr/include/acorn26/boot.h comp-obsolete obsolete
+./usr/include/acorn26/bswap.h comp-obsolete obsolete
+./usr/include/acorn26/bus.h comp-obsolete obsolete
+./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/elf_machdep.h comp-obsolete obsolete
+./usr/include/acorn26/endian.h comp-obsolete obsolete
+./usr/include/acorn26/endian_machdep.h comp-obsolete obsolete
+./usr/include/acorn26/float.h comp-obsolete obsolete
+./usr/include/acorn26/fenv.h comp-obsolete obsolete
+./usr/include/acorn26/fp.h comp-obsolete obsolete
+./usr/include/acorn26/frame.h comp-obsolete obsolete
+./usr/include/acorn26/ieee.h comp-obsolete obsolete
+./usr/include/acorn26/ieeefp.h comp-obsolete obsolete
+./usr/include/acorn26/int_const.h comp-obsolete obsolete
+./usr/include/acorn26/int_fmtio.h comp-obsolete obsolete
+./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/ipkdb.h comp-obsolete obsolete
+./usr/include/acorn26/irq.h comp-obsolete obsolete
+./usr/include/acorn26/limits.h comp-obsolete obsolete
+./usr/include/acorn26/lock.h comp-obsolete obsolete
+./usr/include/acorn26/math.h comp-obsolete obsolete
+./usr/include/acorn26/mcontext.h comp-obsolete obsolete
+./usr/include/acorn26/mutex.h comp-obsolete obsolete
+./usr/include/acorn26/param.h comp-obsolete obsolete
+./usr/include/acorn26/pcb.h comp-obsolete obsolete
+./usr/include/acorn26/pmap.h comp-obsolete obsolete
+./usr/include/acorn26/pmc.h comp-obsolete obsolete
+./usr/include/acorn26/proc.h comp-obsolete obsolete
+./usr/include/acorn26/profile.h comp-obsolete obsolete
+./usr/include/acorn26/ptrace.h comp-obsolete obsolete
+./usr/include/acorn26/reg.h comp-obsolete obsolete
+./usr/include/acorn26/rwlock.h comp-obsolete obsolete
+./usr/include/acorn26/setjmp.h comp-obsolete obsolete
+./usr/include/acorn26/signal.h comp-obsolete obsolete
+./usr/include/acorn26/stdarg.h comp-obsolete obsolete
+./usr/include/acorn26/sysarch.h comp-obsolete obsolete
+./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/wchar_limits.h comp-obsolete obsolete
+./usr/include/acorn32 comp-c-include
+./usr/include/acorn32/ansi.h comp-obsolete obsolete
+./usr/include/acorn32/aout_machdep.h comp-obsolete obsolete
+./usr/include/acorn32/asm.h comp-obsolete obsolete
+./usr/include/acorn32/beep.h comp-obsolete obsolete
+./usr/include/acorn32/bswap.h comp-obsolete obsolete
+./usr/include/acorn32/bus.h comp-obsolete obsolete
+./usr/include/acorn32/cdefs.h comp-obsolete obsolete
+./usr/include/acorn32/conf.h comp-obsolete obsolete
+./usr/include/acorn32/cpu.h comp-obsolete obsolete
+./usr/include/acorn32/db_machdep.h comp-obsolete obsolete
+#./usr/include/acorn32/devmap.h comp-c-include
+./usr/include/acorn32/disklabel.h comp-c-include
+./usr/include/acorn32/elf_machdep.h comp-obsolete obsolete
+./usr/include/acorn32/endian.h comp-obsolete obsolete
+./usr/include/acorn32/endian_machdep.h comp-obsolete obsolete
+./usr/include/acorn32/fenv.h comp-obsolete obsolete
+./usr/include/acorn32/float.h comp-obsolete obsolete
+./usr/include/acorn32/fp.h comp-obsolete obsolete
+./usr/include/acorn32/frame.h comp-obsolete obsolete
+./usr/include/acorn32/ieee.h comp-obsolete obsolete
+./usr/include/acorn32/ieeefp.h comp-obsolete obsolete
+./usr/include/acorn32/int_const.h comp-obsolete obsolete
+./usr/include/acorn32/int_fmtio.h comp-obsolete obsolete
+./usr/include/acorn32/int_limits.h comp-obsolete obsolete
+./usr/include/acorn32/int_mwgwtypes.h comp-obsolete obsolete
+./usr/include/acorn32/int_types.h comp-obsolete obsolete
+./usr/include/acorn32/intr.h comp-c-include
+./usr/include/acorn32/ipkdb.h comp-obsolete obsolete
+./usr/include/acorn32/joystick.h comp-obsolete obsolete
+./usr/include/acorn32/kbd.h comp-obsolete obsolete
+./usr/include/acorn32/limits.h comp-obsolete obsolete
+./usr/include/acorn32/lock.h comp-obsolete obsolete
+./usr/include/acorn32/math.h comp-obsolete obsolete
+./usr/include/acorn32/mcontext.h comp-obsolete obsolete
+./usr/include/acorn32/mouse.h comp-obsolete obsolete
+./usr/include/acorn32/mutex.h comp-obsolete obsolete
+./usr/include/acorn32/param.h comp-obsolete obsolete
+./usr/include/acorn32/pcb.h comp-obsolete obsolete
+./usr/include/acorn32/pmap.h comp-obsolete obsolete
+./usr/include/acorn32/pmc.h comp-obsolete obsolete
+./usr/include/acorn32/proc.h comp-obsolete obsolete
+./usr/include/acorn32/profile.h comp-obsolete obsolete
+./usr/include/acorn32/ptrace.h comp-obsolete obsolete
+./usr/include/acorn32/reg.h comp-obsolete obsolete
+./usr/include/acorn32/rwlock.h comp-obsolete obsolete
+./usr/include/acorn32/setjmp.h comp-obsolete obsolete
+./usr/include/acorn32/signal.h comp-obsolete obsolete
+./usr/include/acorn32/stdarg.h comp-obsolete obsolete
+./usr/include/acorn32/sysarch.h comp-obsolete obsolete
+./usr/include/acorn32/trap.h comp-obsolete obsolete
+./usr/include/acorn32/types.h comp-obsolete obsolete
+./usr/include/acorn32/varargs.h comp-obsolete obsolete
+./usr/include/acorn32/vconsole.h comp-obsolete obsolete
+./usr/include/acorn32/vmparam.h comp-obsolete obsolete
+./usr/include/acorn32/wchar_limits.h comp-obsolete obsolete
./usr/include/arm comp-c-include
./usr/include/arm/aeabi.h comp-c-include
./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/arm32 comp-c-include
@@ -51,6 +159,7 @@
./usr/include/arm/iomd comp-obsolete obsolete
./usr/include/arm/iomd/vidc.h comp-obsolete obsolete
./usr/include/arm/ipkdb.h comp-obsolete obsolete
+./usr/include/arm/joystick.h comp-c-include
./usr/include/arm/kcore.h comp-c-include
./usr/include/arm/limits.h comp-c-include
./usr/include/arm/lock.h comp-c-include
@@ -76,6 +185,57 @@
./usr/include/arm/varargs.h comp-obsolete obsolete
./usr/include/arm/vmparam.h comp-c-include
./usr/include/arm/wchar_limits.h comp-c-include
+./usr/include/arm26 comp-obsolete obsolete
+./usr/include/arm26/_G_config.h comp-obsolete obsolete
+./usr/include/arm26/ansi.h comp-obsolete obsolete
+./usr/include/arm26/aout_machdep.h comp-obsolete obsolete
+./usr/include/arm26/armreg.h comp-obsolete obsolete
+./usr/include/arm26/asm.h comp-obsolete obsolete
+./usr/include/arm26/boot.h comp-obsolete obsolete
+./usr/include/arm26/bswap.h comp-obsolete obsolete
+./usr/include/arm26/bus.h comp-obsolete obsolete
+./usr/include/arm26/cdefs.h comp-obsolete obsolete
+./usr/include/arm26/cpu.h comp-obsolete obsolete
+./usr/include/arm26/db_machdep.h comp-obsolete obsolete
+./usr/include/arm26/disklabel.h comp-obsolete obsolete
+./usr/include/arm26/disklabel_acorn.h comp-obsolete obsolete
+./usr/include/arm26/elf_machdep.h comp-obsolete obsolete
+./usr/include/arm26/endian.h comp-obsolete obsolete
+./usr/include/arm26/endian_machdep.h comp-obsolete obsolete
+./usr/include/arm26/float.h comp-obsolete obsolete
+./usr/include/arm26/fp.h comp-obsolete obsolete
+./usr/include/arm26/frame.h comp-obsolete obsolete
+./usr/include/arm26/ieee.h comp-obsolete obsolete
+./usr/include/arm26/ieeefp.h comp-obsolete obsolete
+./usr/include/arm26/int_const.h comp-obsolete obsolete
+./usr/include/arm26/int_fmtio.h comp-obsolete obsolete
+./usr/include/arm26/int_limits.h comp-obsolete obsolete
+./usr/include/arm26/int_mwgwtypes.h comp-obsolete obsolete
+./usr/include/arm26/int_types.h comp-obsolete obsolete
+./usr/include/arm26/intr.h comp-obsolete obsolete
+./usr/include/arm26/ipkdb.h comp-obsolete obsolete
+./usr/include/arm26/irq.h comp-obsolete obsolete
+./usr/include/arm26/limits.h comp-obsolete obsolete
+./usr/include/arm26/lock.h comp-obsolete obsolete
+./usr/include/arm26/math.h comp-obsolete obsolete
+./usr/include/arm26/param.h comp-obsolete obsolete
+./usr/include/arm26/pcb.h comp-obsolete obsolete
+./usr/include/arm26/pmap.h comp-obsolete obsolete
+./usr/include/arm26/proc.h comp-obsolete obsolete
+./usr/include/arm26/profile.h comp-obsolete obsolete
+./usr/include/arm26/pte.h comp-obsolete obsolete
+./usr/include/arm26/ptrace.h comp-obsolete obsolete
+./usr/include/arm26/reg.h comp-obsolete obsolete
+./usr/include/arm26/setjmp.h comp-obsolete obsolete
+./usr/include/arm26/signal.h comp-obsolete obsolete
+./usr/include/arm26/spl.h comp-obsolete obsolete
+./usr/include/arm26/stdarg.h comp-obsolete obsolete
+./usr/include/arm26/sysarch.h comp-obsolete obsolete
+./usr/include/arm26/trap.h comp-obsolete obsolete
+./usr/include/arm26/types.h comp-obsolete obsolete
+./usr/include/arm26/undefined.h comp-obsolete obsolete
+./usr/include/arm26/varargs.h comp-obsolete obsolete
+./usr/include/arm26/vmparam.h comp-obsolete obsolete
./usr/include/arm32/bootconfig.h comp-obsolete obsolete
./usr/include/arm32/cpufunc.h comp-obsolete obsolete
./usr/include/arm32/cpus.h comp-obsolete obsolete
@@ -85,6 +245,399 @@
./usr/include/arm32/psl.h comp-obsolete obsolete
./usr/include/arm32/pte.h comp-obsolete obsolete
./usr/include/arm32/undefined.h comp-obsolete obsolete
+./usr/include/cats comp-c-include
+./usr/include/cats/ansi.h comp-obsolete obsolete
+./usr/include/cats/aout_machdep.h comp-obsolete obsolete
+./usr/include/cats/asm.h comp-obsolete obsolete
+./usr/include/cats/bswap.h comp-obsolete obsolete
+./usr/include/cats/bus.h comp-obsolete obsolete
+./usr/include/cats/byte_swap.h comp-obsolete obsolete
+./usr/include/cats/cdefs.h comp-obsolete obsolete
+./usr/include/cats/cpu.h comp-obsolete obsolete
+./usr/include/cats/db_machdep.h comp-obsolete obsolete
+./usr/include/cats/disklabel.h comp-c-include
+./usr/include/cats/elf_machdep.h comp-obsolete obsolete
+./usr/include/cats/endian.h comp-obsolete obsolete
+./usr/include/cats/endian_machdep.h comp-obsolete obsolete
+./usr/include/cats/fenv.h comp-obsolete obsolete
+./usr/include/cats/float.h comp-obsolete obsolete
+./usr/include/cats/fp.h comp-obsolete obsolete
+./usr/include/cats/frame.h comp-obsolete obsolete
+./usr/include/cats/ieee.h comp-obsolete obsolete
+./usr/include/cats/ieeefp.h comp-obsolete obsolete
+./usr/include/cats/int_const.h comp-obsolete obsolete
+./usr/include/cats/int_fmtio.h comp-obsolete obsolete
+./usr/include/cats/int_limits.h comp-obsolete obsolete
+./usr/include/cats/int_mwgwtypes.h comp-obsolete obsolete
+./usr/include/cats/int_types.h comp-obsolete obsolete
+./usr/include/cats/intr.h comp-c-include
+./usr/include/cats/ipkdb.h comp-obsolete obsolete
+./usr/include/cats/joystick.h comp-obsolete obsolete
+./usr/include/cats/limits.h comp-obsolete obsolete
+./usr/include/cats/lock.h comp-obsolete obsolete
+./usr/include/cats/math.h comp-obsolete obsolete
+./usr/include/cats/mcontext.h comp-obsolete obsolete
+./usr/include/cats/mutex.h comp-obsolete obsolete
+./usr/include/cats/param.h comp-obsolete obsolete
+./usr/include/cats/pcb.h comp-obsolete obsolete
+./usr/include/cats/pmap.h comp-obsolete obsolete
+./usr/include/cats/pmc.h comp-obsolete obsolete
+./usr/include/cats/proc.h comp-obsolete obsolete
+./usr/include/cats/profile.h comp-obsolete obsolete
+./usr/include/cats/ptrace.h comp-obsolete obsolete
+./usr/include/cats/reg.h comp-obsolete obsolete
+./usr/include/cats/rwlock.h comp-obsolete obsolete
+./usr/include/cats/setjmp.h comp-obsolete obsolete
+./usr/include/cats/signal.h comp-obsolete obsolete
+./usr/include/cats/stdarg.h comp-obsolete obsolete
+./usr/include/cats/sysarch.h comp-obsolete obsolete
+./usr/include/cats/trap.h comp-obsolete obsolete
+./usr/include/cats/types.h comp-obsolete obsolete
+./usr/include/cats/varargs.h comp-obsolete obsolete
+./usr/include/cats/vmparam.h comp-obsolete obsolete
+./usr/include/cats/wchar_limits.h comp-obsolete obsolete
+./usr/include/epoc32 comp-c-include
+./usr/include/epoc32/ansi.h comp-obsolete obsolete
+./usr/include/epoc32/aout_machdep.h comp-obsolete obsolete
+./usr/include/epoc32/asm.h comp-obsolete obsolete
+./usr/include/epoc32/bswap.h comp-obsolete obsolete
+./usr/include/epoc32/cdefs.h comp-obsolete obsolete
+./usr/include/epoc32/cpu.h comp-obsolete obsolete
+./usr/include/epoc32/disklabel.h comp-c-include
+./usr/include/epoc32/elf_machdep.h comp-obsolete obsolete
+./usr/include/epoc32/endian.h comp-obsolete obsolete
+./usr/include/epoc32/endian_machdep.h comp-obsolete obsolete
+./usr/include/epoc32/fenv.h comp-obsolete obsolete
+./usr/include/epoc32/float.h comp-obsolete obsolete
+./usr/include/epoc32/frame.h comp-obsolete obsolete
+./usr/include/epoc32/ieee.h comp-obsolete obsolete
+./usr/include/epoc32/ieeefp.h comp-obsolete obsolete
+./usr/include/epoc32/int_const.h comp-obsolete obsolete
+./usr/include/epoc32/int_fmtio.h comp-obsolete obsolete
+./usr/include/epoc32/int_limits.h comp-obsolete obsolete
+./usr/include/epoc32/int_mwgwtypes.h comp-obsolete obsolete
+./usr/include/epoc32/int_types.h comp-obsolete obsolete
+./usr/include/epoc32/intr.h comp-c-include
+./usr/include/epoc32/limits.h comp-obsolete obsolete
+./usr/include/epoc32/lock.h comp-obsolete obsolete
+./usr/include/epoc32/math.h comp-obsolete obsolete
+./usr/include/epoc32/mcontext.h comp-obsolete obsolete
+./usr/include/epoc32/mutex.h comp-obsolete obsolete
+./usr/include/epoc32/param.h comp-obsolete obsolete
+./usr/include/epoc32/pcb.h comp-obsolete obsolete
+./usr/include/epoc32/pmap.h comp-obsolete obsolete
+./usr/include/epoc32/pmc.h comp-obsolete obsolete
+./usr/include/epoc32/proc.h comp-obsolete obsolete
+./usr/include/epoc32/profile.h comp-obsolete obsolete
+./usr/include/epoc32/ptrace.h comp-obsolete obsolete
+./usr/include/epoc32/reg.h comp-obsolete obsolete
+./usr/include/epoc32/rwlock.h comp-obsolete obsolete
+./usr/include/epoc32/setjmp.h comp-obsolete obsolete
+./usr/include/epoc32/signal.h comp-obsolete obsolete
+./usr/include/epoc32/sysarch.h comp-obsolete obsolete
+./usr/include/epoc32/trap.h comp-obsolete obsolete
+./usr/include/epoc32/types.h comp-obsolete obsolete
+./usr/include/epoc32/vmparam.h comp-obsolete obsolete
+./usr/include/epoc32/wchar_limits.h comp-obsolete obsolete
+./usr/include/evbarm comp-c-include
+./usr/include/evbarm/ansi.h comp-obsolete obsolete
+./usr/include/evbarm/aout_machdep.h comp-obsolete obsolete
+./usr/include/evbarm/asm.h comp-obsolete obsolete
+./usr/include/evbarm/bswap.h comp-obsolete obsolete
+./usr/include/evbarm/bus.h comp-obsolete obsolete
+./usr/include/evbarm/cdefs.h comp-obsolete obsolete
+./usr/include/evbarm/cpu.h comp-obsolete obsolete
+./usr/include/evbarm/db_machdep.h comp-obsolete obsolete
+./usr/include/evbarm/disklabel.h comp-c-include
+./usr/include/evbarm/elf_machdep.h comp-obsolete obsolete
+./usr/include/evbarm/endian.h comp-obsolete obsolete
+./usr/include/evbarm/endian_machdep.h comp-obsolete obsolete
+./usr/include/evbarm/fenv.h comp-obsolete obsolete
+./usr/include/evbarm/float.h comp-obsolete obsolete
+./usr/include/evbarm/fp.h comp-obsolete obsolete
+./usr/include/evbarm/frame.h comp-obsolete obsolete
+./usr/include/evbarm/ieee.h comp-obsolete obsolete
+./usr/include/evbarm/ieeefp.h comp-obsolete obsolete
+./usr/include/evbarm/int_const.h comp-obsolete obsolete
+./usr/include/evbarm/int_fmtio.h comp-obsolete obsolete
+./usr/include/evbarm/int_limits.h comp-obsolete obsolete
+./usr/include/evbarm/int_mwgwtypes.h comp-obsolete obsolete
+./usr/include/evbarm/int_types.h comp-obsolete obsolete
+./usr/include/evbarm/intr.h comp-c-include
+./usr/include/evbarm/ipkdb.h comp-obsolete obsolete
+./usr/include/evbarm/joystick.h comp-obsolete obsolete
+./usr/include/evbarm/limits.h comp-obsolete obsolete
+./usr/include/evbarm/lock.h comp-obsolete obsolete
+./usr/include/evbarm/math.h comp-obsolete obsolete
+./usr/include/evbarm/mcontext.h comp-obsolete obsolete
+./usr/include/evbarm/mutex.h comp-obsolete obsolete
+./usr/include/evbarm/param.h comp-obsolete obsolete
+./usr/include/evbarm/pcb.h comp-obsolete obsolete
+./usr/include/evbarm/pmap.h comp-obsolete obsolete
+./usr/include/evbarm/pmc.h comp-obsolete obsolete
+./usr/include/evbarm/proc.h comp-obsolete obsolete
+./usr/include/evbarm/profile.h comp-obsolete obsolete
+./usr/include/evbarm/ptrace.h comp-obsolete obsolete
+./usr/include/evbarm/reg.h comp-obsolete obsolete
+./usr/include/evbarm/rwlock.h comp-obsolete obsolete
+./usr/include/evbarm/setjmp.h comp-obsolete obsolete
+./usr/include/evbarm/signal.h comp-obsolete obsolete
+./usr/include/evbarm/stdarg.h comp-obsolete obsolete
+./usr/include/evbarm/sysarch.h comp-obsolete obsolete
+./usr/include/evbarm/trap.h comp-obsolete obsolete
+./usr/include/evbarm/types.h comp-obsolete obsolete
+./usr/include/evbarm/varargs.h comp-obsolete obsolete
+./usr/include/evbarm/vmparam.h comp-obsolete obsolete
+./usr/include/evbarm/wchar_limits.h comp-obsolete obsolete
+./usr/include/hpcarm comp-c-include
+./usr/include/hpcarm/ansi.h comp-obsolete obsolete
+./usr/include/hpcarm/aout_machdep.h comp-obsolete obsolete
+./usr/include/hpcarm/apmvar.h comp-obsolete obsolete
+./usr/include/hpcarm/asm.h comp-obsolete obsolete
+./usr/include/hpcarm/bswap.h comp-obsolete obsolete
+./usr/include/hpcarm/bus.h comp-obsolete obsolete
+./usr/include/hpcarm/cdefs.h comp-obsolete obsolete
+./usr/include/hpcarm/cpu.h comp-obsolete obsolete
+./usr/include/hpcarm/db_machdep.h comp-obsolete obsolete
+./usr/include/hpcarm/disklabel.h comp-c-include
+./usr/include/hpcarm/elf_machdep.h comp-obsolete obsolete
+./usr/include/hpcarm/endian.h comp-obsolete obsolete
+./usr/include/hpcarm/endian_machdep.h comp-obsolete obsolete
+./usr/include/hpcarm/fenv.h comp-obsolete obsolete
+./usr/include/hpcarm/float.h comp-obsolete obsolete
+./usr/include/hpcarm/fp.h comp-obsolete obsolete
+./usr/include/hpcarm/frame.h comp-obsolete obsolete
+./usr/include/hpcarm/ieee.h comp-obsolete obsolete
+./usr/include/hpcarm/ieeefp.h comp-obsolete obsolete
+./usr/include/hpcarm/int_const.h comp-obsolete obsolete
+./usr/include/hpcarm/int_fmtio.h comp-obsolete obsolete
+./usr/include/hpcarm/int_limits.h comp-obsolete obsolete
+./usr/include/hpcarm/int_mwgwtypes.h comp-obsolete obsolete
+./usr/include/hpcarm/int_types.h comp-obsolete obsolete
+./usr/include/hpcarm/intr.h comp-c-include
+./usr/include/hpcarm/ipkdb.h comp-obsolete obsolete
+./usr/include/hpcarm/limits.h comp-obsolete obsolete
+./usr/include/hpcarm/lock.h comp-obsolete obsolete
+./usr/include/hpcarm/math.h comp-obsolete obsolete
+./usr/include/hpcarm/mcontext.h comp-obsolete obsolete
+./usr/include/hpcarm/mutex.h comp-obsolete obsolete
+./usr/include/hpcarm/param.h comp-obsolete obsolete
+./usr/include/hpcarm/pcb.h comp-obsolete obsolete
+./usr/include/hpcarm/pmap.h comp-obsolete obsolete
+./usr/include/hpcarm/pmc.h comp-obsolete obsolete
+./usr/include/hpcarm/proc.h comp-obsolete obsolete
+./usr/include/hpcarm/profile.h comp-obsolete obsolete
+./usr/include/hpcarm/ptrace.h comp-obsolete obsolete
+./usr/include/hpcarm/reg.h comp-obsolete obsolete
+./usr/include/hpcarm/rwlock.h comp-obsolete obsolete
+./usr/include/hpcarm/setjmp.h comp-obsolete obsolete
+./usr/include/hpcarm/signal.h comp-obsolete obsolete
+./usr/include/hpcarm/stdarg.h comp-obsolete obsolete
+./usr/include/hpcarm/sysarch.h comp-obsolete obsolete
+./usr/include/hpcarm/trap.h comp-obsolete obsolete
+./usr/include/hpcarm/types.h comp-obsolete obsolete
+./usr/include/hpcarm/varargs.h comp-obsolete obsolete
+./usr/include/hpcarm/vmparam.h comp-obsolete obsolete
+./usr/include/hpcarm/wchar_limits.h comp-obsolete obsolete
+./usr/include/iyonix comp-c-include
+./usr/include/iyonix/ansi.h comp-obsolete obsolete
+./usr/include/iyonix/aout_machdep.h comp-obsolete obsolete
+./usr/include/iyonix/asm.h comp-obsolete obsolete
+./usr/include/iyonix/bswap.h comp-obsolete obsolete
+./usr/include/iyonix/bus.h comp-obsolete obsolete
+./usr/include/iyonix/cdefs.h comp-obsolete obsolete
+./usr/include/iyonix/cpu.h comp-obsolete obsolete
+./usr/include/iyonix/db_machdep.h comp-obsolete obsolete
+./usr/include/iyonix/disklabel.h comp-c-include
+./usr/include/iyonix/elf_machdep.h comp-obsolete obsolete
+./usr/include/iyonix/endian.h comp-obsolete obsolete
+./usr/include/iyonix/endian_machdep.h comp-obsolete obsolete
+./usr/include/iyonix/fenv.h comp-obsolete obsolete
+./usr/include/iyonix/float.h comp-obsolete obsolete
+./usr/include/iyonix/fp.h comp-obsolete obsolete
+./usr/include/iyonix/frame.h comp-obsolete obsolete
+./usr/include/iyonix/ieee.h comp-obsolete obsolete
+./usr/include/iyonix/ieeefp.h comp-obsolete obsolete
+./usr/include/iyonix/int_const.h comp-obsolete obsolete
+./usr/include/iyonix/int_fmtio.h comp-obsolete obsolete
+./usr/include/iyonix/int_limits.h comp-obsolete obsolete
+./usr/include/iyonix/int_mwgwtypes.h comp-obsolete obsolete
+./usr/include/iyonix/int_types.h comp-obsolete obsolete
+./usr/include/iyonix/intr.h comp-c-include
+./usr/include/iyonix/ipkdb.h comp-obsolete obsolete
+./usr/include/iyonix/joystick.h comp-obsolete obsolete
+./usr/include/iyonix/limits.h comp-obsolete obsolete
+./usr/include/iyonix/lock.h comp-obsolete obsolete
+./usr/include/iyonix/math.h comp-obsolete obsolete
+./usr/include/iyonix/mcontext.h comp-obsolete obsolete
+./usr/include/iyonix/mutex.h comp-obsolete obsolete
+./usr/include/iyonix/param.h comp-obsolete obsolete
+./usr/include/iyonix/pcb.h comp-obsolete obsolete
+./usr/include/iyonix/pmap.h comp-obsolete obsolete
+./usr/include/iyonix/pmc.h comp-obsolete obsolete
+./usr/include/iyonix/proc.h comp-obsolete obsolete
+./usr/include/iyonix/profile.h comp-obsolete obsolete
+./usr/include/iyonix/ptrace.h comp-obsolete obsolete
+./usr/include/iyonix/reg.h comp-obsolete obsolete
+./usr/include/iyonix/rwlock.h comp-obsolete obsolete
+./usr/include/iyonix/setjmp.h comp-obsolete obsolete
+./usr/include/iyonix/signal.h comp-obsolete obsolete
+./usr/include/iyonix/stdarg.h comp-obsolete obsolete
+./usr/include/iyonix/sysarch.h comp-obsolete obsolete
+./usr/include/iyonix/trap.h comp-obsolete obsolete
+./usr/include/iyonix/types.h comp-obsolete obsolete
+./usr/include/iyonix/varargs.h comp-obsolete obsolete
+./usr/include/iyonix/vmparam.h comp-obsolete obsolete
+./usr/include/iyonix/wchar_limits.h comp-obsolete obsolete
+./usr/include/netwinder comp-c-include
+./usr/include/netwinder/ansi.h comp-obsolete obsolete
+./usr/include/netwinder/aout_machdep.h comp-obsolete obsolete
+./usr/include/netwinder/asm.h comp-obsolete obsolete
+./usr/include/netwinder/bswap.h comp-obsolete obsolete
+./usr/include/netwinder/bus.h comp-obsolete obsolete
+./usr/include/netwinder/cdefs.h comp-obsolete obsolete
+./usr/include/netwinder/cpu.h comp-obsolete obsolete
+./usr/include/netwinder/db_machdep.h comp-obsolete obsolete
+./usr/include/netwinder/disklabel.h comp-c-include
+./usr/include/netwinder/elf_machdep.h comp-obsolete obsolete
+./usr/include/netwinder/endian.h comp-obsolete obsolete
+./usr/include/netwinder/endian_machdep.h comp-obsolete obsolete
+./usr/include/netwinder/fenv.h comp-obsolete obsolete
+./usr/include/netwinder/float.h comp-obsolete obsolete
+./usr/include/netwinder/fp.h comp-obsolete obsolete
+./usr/include/netwinder/frame.h comp-obsolete obsolete
+./usr/include/netwinder/ieee.h comp-obsolete obsolete
+./usr/include/netwinder/ieeefp.h comp-obsolete obsolete
+./usr/include/netwinder/int_const.h comp-obsolete obsolete
+./usr/include/netwinder/int_fmtio.h comp-obsolete obsolete
+./usr/include/netwinder/int_limits.h comp-obsolete obsolete
+./usr/include/netwinder/int_mwgwtypes.h comp-obsolete obsolete
+./usr/include/netwinder/int_types.h comp-obsolete obsolete
+./usr/include/netwinder/intr.h comp-c-include
+./usr/include/netwinder/ipkdb.h comp-obsolete obsolete
+./usr/include/netwinder/joystick.h comp-obsolete obsolete
+./usr/include/netwinder/limits.h comp-obsolete obsolete
+./usr/include/netwinder/lock.h comp-obsolete obsolete
+./usr/include/netwinder/math.h comp-obsolete obsolete
+./usr/include/netwinder/mcontext.h comp-obsolete obsolete
+./usr/include/netwinder/mutex.h comp-obsolete obsolete
+./usr/include/netwinder/param.h comp-obsolete obsolete
+./usr/include/netwinder/pcb.h comp-obsolete obsolete
+./usr/include/netwinder/pmap.h comp-obsolete obsolete
+./usr/include/netwinder/pmc.h comp-obsolete obsolete
+./usr/include/netwinder/proc.h comp-obsolete obsolete
+./usr/include/netwinder/profile.h comp-obsolete obsolete
+./usr/include/netwinder/ptrace.h comp-obsolete obsolete
+./usr/include/netwinder/reg.h comp-obsolete obsolete
+./usr/include/netwinder/rwlock.h comp-obsolete obsolete
+./usr/include/netwinder/setjmp.h comp-obsolete obsolete
+./usr/include/netwinder/signal.h comp-obsolete obsolete
+./usr/include/netwinder/stdarg.h comp-obsolete obsolete
+./usr/include/netwinder/sysarch.h comp-obsolete obsolete
+./usr/include/netwinder/trap.h comp-obsolete obsolete
+./usr/include/netwinder/types.h comp-obsolete obsolete
+./usr/include/netwinder/varargs.h comp-obsolete obsolete
+./usr/include/netwinder/vmparam.h comp-obsolete obsolete
+./usr/include/netwinder/wchar_limits.h comp-obsolete obsolete
+./usr/include/shark comp-c-include
+./usr/include/shark/ansi.h comp-obsolete obsolete
+./usr/include/shark/aout_machdep.h comp-obsolete obsolete
+./usr/include/shark/asm.h comp-obsolete obsolete
+./usr/include/shark/bswap.h comp-obsolete obsolete
+./usr/include/shark/bus.h comp-obsolete obsolete
+./usr/include/shark/cdefs.h comp-obsolete obsolete
+./usr/include/shark/cpu.h comp-obsolete obsolete
+./usr/include/shark/db_machdep.h comp-obsolete obsolete
+./usr/include/shark/devmap.h comp-c-include
+./usr/include/shark/disklabel.h comp-c-include
+./usr/include/shark/elf_machdep.h comp-obsolete obsolete
+./usr/include/shark/endian.h comp-obsolete obsolete
+./usr/include/shark/endian_machdep.h comp-obsolete obsolete
+./usr/include/shark/float.h comp-obsolete obsolete
+./usr/include/shark/fp.h comp-obsolete obsolete
+./usr/include/shark/frame.h comp-obsolete obsolete
+./usr/include/shark/ieee.h comp-obsolete obsolete
+./usr/include/shark/ieeefp.h comp-obsolete obsolete
+./usr/include/shark/int_const.h comp-obsolete obsolete
+./usr/include/shark/int_fmtio.h comp-obsolete obsolete
+./usr/include/shark/int_limits.h comp-obsolete obsolete
+./usr/include/shark/int_mwgwtypes.h comp-obsolete obsolete
+./usr/include/shark/int_types.h comp-obsolete obsolete
+./usr/include/shark/intr.h comp-c-include
+./usr/include/shark/ipkdb.h comp-obsolete obsolete
+./usr/include/shark/joystick.h comp-obsolete obsolete
+./usr/include/shark/limits.h comp-obsolete obsolete
+./usr/include/shark/lock.h comp-obsolete obsolete
+./usr/include/shark/math.h comp-obsolete obsolete
+./usr/include/shark/mcontext.h comp-obsolete obsolete
+./usr/include/shark/mutex.h comp-obsolete obsolete
+./usr/include/shark/param.h comp-obsolete obsolete
+./usr/include/shark/pcb.h comp-obsolete obsolete
+./usr/include/shark/pmap.h comp-obsolete obsolete
+./usr/include/shark/pmc.h comp-obsolete obsolete
+./usr/include/shark/proc.h comp-obsolete obsolete
+./usr/include/shark/profile.h comp-obsolete obsolete
+./usr/include/shark/ptrace.h comp-obsolete obsolete
+./usr/include/shark/reg.h comp-obsolete obsolete
+./usr/include/shark/rwlock.h comp-obsolete obsolete
+./usr/include/shark/setjmp.h comp-obsolete obsolete
+./usr/include/shark/signal.h comp-obsolete obsolete
+./usr/include/shark/stdarg.h comp-obsolete obsolete
+./usr/include/shark/sysarch.h comp-obsolete obsolete
+./usr/include/shark/trap.h comp-obsolete obsolete
+./usr/include/shark/types.h comp-obsolete obsolete
+./usr/include/shark/varargs.h comp-obsolete obsolete
+./usr/include/shark/vmparam.h comp-obsolete obsolete
+./usr/include/shark/wchar_limits.h comp-obsolete obsolete
+./usr/include/zaurus comp-c-include
+./usr/include/zaurus/ansi.h comp-obsolete obsolete
+./usr/include/zaurus/aout_machdep.h comp-obsolete obsolete
+./usr/include/zaurus/apmvar.h comp-obsolete obsolete
+./usr/include/zaurus/asm.h comp-obsolete obsolete
+./usr/include/zaurus/bswap.h comp-obsolete obsolete
+./usr/include/zaurus/bus.h comp-obsolete obsolete
+./usr/include/zaurus/cdefs.h comp-obsolete obsolete
+./usr/include/zaurus/cpu.h comp-obsolete obsolete
+./usr/include/zaurus/disklabel.h comp-c-include
+./usr/include/zaurus/elf_machdep.h comp-obsolete obsolete
+./usr/include/zaurus/endian.h comp-obsolete obsolete
+./usr/include/zaurus/endian_machdep.h comp-obsolete obsolete
+./usr/include/zaurus/fenv.h comp-obsolete obsolete
+./usr/include/zaurus/float.h comp-obsolete obsolete
+./usr/include/zaurus/fp.h comp-obsolete obsolete
+./usr/include/zaurus/frame.h comp-obsolete obsolete
+./usr/include/zaurus/ieee.h comp-obsolete obsolete
+./usr/include/zaurus/ieeefp.h comp-obsolete obsolete
+./usr/include/zaurus/int_const.h comp-obsolete obsolete
+./usr/include/zaurus/int_fmtio.h comp-obsolete obsolete
+./usr/include/zaurus/int_limits.h comp-obsolete obsolete
+./usr/include/zaurus/int_mwgwtypes.h comp-obsolete obsolete
+./usr/include/zaurus/int_types.h comp-obsolete obsolete
+./usr/include/zaurus/intr.h comp-c-include
+./usr/include/zaurus/ipkdb.h comp-obsolete obsolete
+./usr/include/zaurus/limits.h comp-obsolete obsolete
+./usr/include/zaurus/lock.h comp-obsolete obsolete
+./usr/include/zaurus/math.h comp-obsolete obsolete
+./usr/include/zaurus/mcontext.h comp-obsolete obsolete
+./usr/include/zaurus/mutex.h comp-obsolete obsolete
+./usr/include/zaurus/param.h comp-obsolete obsolete
+./usr/include/zaurus/pcb.h comp-obsolete obsolete
+./usr/include/zaurus/pmap.h comp-obsolete obsolete
+./usr/include/zaurus/pmc.h comp-obsolete obsolete
+./usr/include/zaurus/proc.h comp-obsolete obsolete
+./usr/include/zaurus/profile.h comp-obsolete obsolete
+./usr/include/zaurus/ptrace.h comp-obsolete obsolete
+./usr/include/zaurus/reg.h comp-obsolete obsolete
+./usr/include/zaurus/rwlock.h comp-obsolete obsolete
+./usr/include/zaurus/setjmp.h comp-obsolete obsolete
+./usr/include/zaurus/signal.h comp-obsolete obsolete
+./usr/include/zaurus/stdarg.h comp-obsolete obsolete
+./usr/include/zaurus/sysarch.h comp-obsolete obsolete
+./usr/include/zaurus/trap.h comp-obsolete obsolete
+./usr/include/zaurus/types.h comp-obsolete obsolete
+./usr/include/zaurus/varargs.h comp-obsolete obsolete
+./usr/include/zaurus/vmparam.h comp-obsolete obsolete
+./usr/include/zaurus/wchar_limits.h comp-obsolete obsolete
./usr/include/ieeefp.h comp-c-include
./usr/include/pmc.h comp-c-include
./usr/lib/libarm.a comp-c-lib
diff --git a/distrib/sets/lists/comp/md.acorn26 b/distrib/sets/lists/comp/md.acorn26
deleted file mode 100644
index a241a7159f7..00000000000
--- a/distrib/sets/lists/comp/md.acorn26
+++ /dev/null
@@ -1,104 +0,0 @@
-# $NetBSD: md.acorn26,v 1.15 2013/01/11 14:22:55 matt Exp $
-./usr/include/acorn26 comp-c-include
-./usr/include/acorn26/ansi.h comp-c-include
-./usr/include/acorn26/aout_machdep.h comp-c-include
-./usr/include/acorn26/asm.h comp-c-include
-./usr/include/acorn26/boot.h comp-c-include
-./usr/include/acorn26/bswap.h comp-c-include
-./usr/include/acorn26/bus.h comp-obsolete obsolete
-./usr/include/acorn26/cdefs.h comp-c-include
-./usr/include/acorn26/cpu.h comp-c-include
-./usr/include/acorn26/db_machdep.h comp-obsolete obsolete
-./usr/include/acorn26/disklabel.h comp-c-include
-./usr/include/acorn26/elf_machdep.h comp-c-include
-./usr/include/acorn26/endian.h comp-c-include
-./usr/include/acorn26/endian_machdep.h comp-c-include
-./usr/include/acorn26/float.h comp-c-include
-./usr/include/acorn26/fp.h comp-obsolete obsolete
-./usr/include/acorn26/frame.h comp-c-include
-./usr/include/acorn26/ieee.h comp-c-include
-./usr/include/acorn26/ieeefp.h comp-c-include
-./usr/include/acorn26/int_const.h comp-c-include
-./usr/include/acorn26/int_fmtio.h comp-c-include
-./usr/include/acorn26/int_limits.h comp-c-include
-./usr/include/acorn26/int_mwgwtypes.h comp-c-include
-./usr/include/acorn26/int_types.h comp-c-include
-./usr/include/acorn26/intr.h comp-c-include
-./usr/include/acorn26/ipkdb.h comp-obsolete obsolete
-./usr/include/acorn26/irq.h comp-c-include
-./usr/include/acorn26/limits.h comp-c-include
-./usr/include/acorn26/lock.h comp-c-include
-./usr/include/acorn26/math.h comp-c-include
-./usr/include/acorn26/mcontext.h comp-c-include
-./usr/include/acorn26/mutex.h comp-c-include
-./usr/include/acorn26/param.h comp-c-include
-./usr/include/acorn26/pcb.h comp-c-include
-./usr/include/acorn26/pmap.h comp-c-include
-./usr/include/acorn26/pmc.h comp-c-include
-./usr/include/acorn26/proc.h comp-c-include
-./usr/include/acorn26/profile.h comp-c-include
-./usr/include/acorn26/ptrace.h comp-c-include
-./usr/include/acorn26/reg.h comp-c-include
-./usr/include/acorn26/rwlock.h comp-c-include
-./usr/include/acorn26/setjmp.h comp-c-include
-./usr/include/acorn26/signal.h comp-c-include
-./usr/include/acorn26/stdarg.h comp-obsolete obsolete
-./usr/include/acorn26/sysarch.h comp-c-include
-./usr/include/acorn26/trap.h comp-c-include
-./usr/include/acorn26/types.h comp-c-include
-./usr/include/acorn26/varargs.h comp-obsolete obsolete
-./usr/include/acorn26/vmparam.h comp-c-include
-./usr/include/acorn26/wchar_limits.h comp-c-include
-./usr/include/arm/arm32/bus.h comp-obsolete obsolete
-./usr/include/arm/arm32/sysarch.h comp-obsolete obsolete
-./usr/include/arm26 comp-obsolete obsolete
-./usr/include/arm26/_G_config.h comp-obsolete obsolete
-./usr/include/arm26/ansi.h comp-obsolete obsolete
-./usr/include/arm26/aout_machdep.h comp-obsolete obsolete
-./usr/include/arm26/armreg.h comp-obsolete obsolete
-./usr/include/arm26/asm.h comp-obsolete obsolete
-./usr/include/arm26/boot.h comp-obsolete obsolete
-./usr/include/arm26/bswap.h comp-obsolete obsolete
-./usr/include/arm26/bus.h comp-obsolete obsolete
-./usr/include/arm26/cdefs.h comp-obsolete obsolete
-./usr/include/arm26/cpu.h comp-obsolete obsolete
-./usr/include/arm26/db_machdep.h comp-obsolete obsolete
-./usr/include/arm26/disklabel.h comp-obsolete obsolete
-./usr/include/arm26/disklabel_acorn.h comp-obsolete obsolete
-./usr/include/arm26/elf_machdep.h comp-obsolete obsolete
-./usr/include/arm26/endian.h comp-obsolete obsolete
-./usr/include/arm26/endian_machdep.h comp-obsolete obsolete
-./usr/include/arm26/float.h comp-obsolete obsolete
-./usr/include/arm26/fp.h comp-obsolete obsolete
-./usr/include/arm26/frame.h comp-obsolete obsolete
-./usr/include/arm26/ieee.h comp-obsolete obsolete
-./usr/include/arm26/ieeefp.h comp-obsolete obsolete
-./usr/include/arm26/int_const.h comp-obsolete obsolete
-./usr/include/arm26/int_fmtio.h comp-obsolete obsolete
-./usr/include/arm26/int_limits.h comp-obsolete obsolete
-./usr/include/arm26/int_mwgwtypes.h comp-obsolete obsolete
-./usr/include/arm26/int_types.h comp-obsolete obsolete
-./usr/include/arm26/intr.h comp-obsolete obsolete
-./usr/include/arm26/ipkdb.h comp-obsolete obsolete
-./usr/include/arm26/irq.h comp-obsolete obsolete
-./usr/include/arm26/limits.h comp-obsolete obsolete
-./usr/include/arm26/lock.h comp-obsolete obsolete
-./usr/include/arm26/math.h comp-obsolete obsolete
-./usr/include/arm26/param.h comp-obsolete obsolete
-./usr/include/arm26/pcb.h comp-obsolete obsolete
-./usr/include/arm26/pmap.h comp-obsolete obsolete
-./usr/include/arm26/proc.h comp-obsolete obsolete
-./usr/include/arm26/profile.h comp-obsolete obsolete
-./usr/include/arm26/pte.h comp-obsolete obsolete
-./usr/include/arm26/ptrace.h comp-obsolete obsolete
-./usr/include/arm26/reg.h comp-obsolete obsolete
-./usr/include/arm26/setjmp.h comp-obsolete obsolete
-./usr/include/arm26/signal.h comp-obsolete obsolete
-./usr/include/arm26/spl.h comp-obsolete obsolete
-./usr/include/arm26/stdarg.h comp-obsolete obsolete
-./usr/include/arm26/sysarch.h comp-obsolete obsolete
-./usr/include/arm26/trap.h comp-obsolete obsolete
-./usr/include/arm26/types.h comp-obsolete obsolete
-./usr/include/arm26/undefined.h comp-obsolete obsolete
-./usr/include/arm26/varargs.h comp-obsolete obsolete
-./usr/include/arm26/vmparam.h comp-obsolete obsolete
diff --git a/distrib/sets/lists/comp/md.acorn32 b/distrib/sets/lists/comp/md.acorn32
deleted file mode 100644
index b377f746c05..00000000000
--- a/distrib/sets/lists/comp/md.acorn32
+++ /dev/null
@@ -1,57 +0,0 @@
-# $NetBSD: md.acorn32,v 1.28 2013/01/16 16:01:05 christos Exp $
-#./usr/include/acorn32/devmap.h comp-c-include
-./usr/include/acorn32 comp-c-include
-./usr/include/acorn32/ansi.h comp-c-include
-./usr/include/acorn32/aout_machdep.h comp-c-include
-./usr/include/acorn32/asm.h comp-c-include
-./usr/include/acorn32/beep.h comp-obsolete obsolete
-./usr/include/acorn32/bswap.h comp-c-include
-./usr/include/acorn32/bus.h comp-obsolete obsolete
-./usr/include/acorn32/cdefs.h comp-c-include
-./usr/include/acorn32/conf.h comp-obsolete obsolete
-./usr/include/acorn32/cpu.h comp-c-include
-./usr/include/acorn32/db_machdep.h comp-obsolete obsolete
-./usr/include/acorn32/disklabel.h comp-c-include
-./usr/include/acorn32/elf_machdep.h comp-c-include
-./usr/include/acorn32/endian.h comp-c-include
-./usr/include/acorn32/endian_machdep.h comp-c-include
-./usr/include/acorn32/float.h comp-c-include
-./usr/include/acorn32/fp.h comp-obsolete obsolete
-./usr/include/acorn32/frame.h comp-c-include
-./usr/include/acorn32/ieee.h comp-c-include
-./usr/include/acorn32/ieeefp.h comp-c-include
-./usr/include/acorn32/int_const.h comp-c-include
-./usr/include/acorn32/int_fmtio.h comp-c-include
-./usr/include/acorn32/int_limits.h comp-c-include
-./usr/include/acorn32/int_mwgwtypes.h comp-c-include
-./usr/include/acorn32/int_types.h comp-c-include
-./usr/include/acorn32/intr.h comp-c-include
-./usr/include/acorn32/ipkdb.h comp-obsolete obsolete
-./usr/include/acorn32/joystick.h comp-c-include
-./usr/include/acorn32/kbd.h comp-obsolete obsolete
-./usr/include/acorn32/limits.h comp-c-include
-./usr/include/acorn32/lock.h comp-c-include
-./usr/include/acorn32/math.h comp-c-include
-./usr/include/acorn32/mcontext.h comp-c-include
-./usr/include/acorn32/mouse.h comp-obsolete obsolete
-./usr/include/acorn32/mutex.h comp-c-include
-./usr/include/acorn32/param.h comp-c-include
-./usr/include/acorn32/pcb.h comp-c-include
-./usr/include/acorn32/pmap.h comp-c-include
-./usr/include/acorn32/pmc.h comp-c-include
-./usr/include/acorn32/proc.h comp-c-include
-./usr/include/acorn32/profile.h comp-c-include
-./usr/include/acorn32/ptrace.h comp-c-include
-./usr/include/acorn32/reg.h comp-c-include
-./usr/include/acorn32/rwlock.h comp-c-include
-./usr/include/acorn32/setjmp.h comp-c-include
-./usr/include/acorn32/signal.h comp-c-include
-./usr/include/acorn32/stdarg.h comp-obsolete obsolete
-./usr/include/acorn32/sysarch.h comp-c-include
-./usr/include/acorn32/trap.h comp-c-include
-./usr/include/acorn32/types.h comp-c-include
-./usr/include/acorn32/varargs.h comp-obsolete obsolete
-./usr/include/acorn32/vconsole.h comp-obsolete obsolete
-./usr/include/acorn32/vmparam.h comp-c-include
-./usr/include/acorn32/wchar_limits.h comp-c-include
-./usr/include/ieeefp.h comp-c-include
diff --git a/distrib/sets/lists/comp/md.cats b/distrib/sets/lists/comp/md.cats
deleted file mode 100644
index 39eedb7df2e..00000000000
--- a/distrib/sets/lists/comp/md.cats
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: md.cats,v 1.18 2013/01/11 14:22:55 matt Exp $
-./usr/include/cats comp-c-include
-./usr/include/cats/ansi.h comp-c-include
-./usr/include/cats/aout_machdep.h comp-c-include
-./usr/include/cats/asm.h comp-c-include
-./usr/include/cats/bswap.h comp-c-include
-./usr/include/cats/bus.h comp-obsolete obsolete
-./usr/include/cats/byte_swap.h comp-obsolete obsolete
-./usr/include/cats/cdefs.h comp-c-include
-./usr/include/cats/cpu.h comp-c-include
-./usr/include/cats/db_machdep.h comp-obsolete obsolete
-./usr/include/cats/disklabel.h comp-c-include
-./usr/include/cats/elf_machdep.h comp-c-include
-./usr/include/cats/endian.h comp-c-include
-./usr/include/cats/endian_machdep.h comp-c-include
-./usr/include/cats/float.h comp-c-include
-./usr/include/cats/fp.h comp-obsolete obsolete
-./usr/include/cats/frame.h comp-c-include
-./usr/include/cats/ieee.h comp-c-include
-./usr/include/cats/ieeefp.h comp-c-include
-./usr/include/cats/int_const.h comp-c-include
-./usr/include/cats/int_fmtio.h comp-c-include
-./usr/include/cats/int_limits.h comp-c-include
-./usr/include/cats/int_mwgwtypes.h comp-c-include
-./usr/include/cats/int_types.h comp-c-include
-./usr/include/cats/intr.h comp-c-include
-./usr/include/cats/ipkdb.h comp-obsolete obsolete
-./usr/include/cats/joystick.h comp-c-include
-./usr/include/cats/limits.h comp-c-include
-./usr/include/cats/lock.h comp-c-include
-./usr/include/cats/math.h comp-c-include
-./usr/include/cats/mcontext.h comp-c-include
-./usr/include/cats/mutex.h comp-c-include
-./usr/include/cats/param.h comp-c-include
-./usr/include/cats/pcb.h comp-c-include
-./usr/include/cats/pmap.h comp-c-include
-./usr/include/cats/pmc.h comp-c-include
-./usr/include/cats/proc.h comp-c-include
-./usr/include/cats/profile.h comp-c-include
-./usr/include/cats/ptrace.h comp-c-include
-./usr/include/cats/reg.h comp-c-include
-./usr/include/cats/rwlock.h comp-c-include
-./usr/include/cats/setjmp.h comp-c-include
-./usr/include/cats/signal.h comp-c-include
-./usr/include/cats/stdarg.h comp-obsolete obsolete
-./usr/include/cats/sysarch.h comp-c-include
-./usr/include/cats/trap.h comp-c-include
-./usr/include/cats/types.h comp-c-include
-./usr/include/cats/varargs.h comp-obsolete obsolete
-./usr/include/cats/vmparam.h comp-c-include
-./usr/include/cats/wchar_limits.h comp-c-include
diff --git a/distrib/sets/lists/comp/md.epoc32 b/distrib/sets/lists/comp/md.epoc32
deleted file mode 100644
index 26f739b2dd9..00000000000
--- a/distrib/sets/lists/comp/md.epoc32
+++ /dev/null
@@ -1,43 +0,0 @@
-# $NetBSD: md.epoc32,v 1.1 2013/05/01 13:11:59 kiyohara Exp $
-./usr/include/epoc32 comp-c-include
-./usr/include/epoc32/ansi.h comp-c-include
-./usr/include/epoc32/aout_machdep.h comp-c-include
-./usr/include/epoc32/asm.h comp-c-include
-./usr/include/epoc32/bswap.h comp-c-include
-./usr/include/epoc32/cdefs.h comp-c-include
-./usr/include/epoc32/cpu.h comp-c-include
-./usr/include/epoc32/disklabel.h comp-c-include
-./usr/include/epoc32/elf_machdep.h comp-c-include
-./usr/include/epoc32/endian.h comp-c-include
-./usr/include/epoc32/endian_machdep.h comp-c-include
-./usr/include/epoc32/float.h comp-c-include
-./usr/include/epoc32/frame.h comp-c-include
-./usr/include/epoc32/ieee.h comp-c-include
-./usr/include/epoc32/ieeefp.h comp-c-include
-./usr/include/epoc32/int_const.h comp-c-include
-./usr/include/epoc32/int_fmtio.h comp-c-include
-./usr/include/epoc32/int_limits.h comp-c-include
-./usr/include/epoc32/int_mwgwtypes.h comp-c-include
-./usr/include/epoc32/int_types.h comp-c-include
-./usr/include/epoc32/intr.h comp-c-include
-./usr/include/epoc32/limits.h comp-c-include
-./usr/include/epoc32/lock.h comp-c-include
-./usr/include/epoc32/math.h comp-c-include
-./usr/include/epoc32/mcontext.h comp-c-include
-./usr/include/epoc32/mutex.h comp-c-include
-./usr/include/epoc32/param.h comp-c-include
-./usr/include/epoc32/pcb.h comp-c-include
-./usr/include/epoc32/pmap.h comp-c-include
-./usr/include/epoc32/pmc.h comp-c-include
-./usr/include/epoc32/proc.h comp-c-include
-./usr/include/epoc32/profile.h comp-c-include
-./usr/include/epoc32/ptrace.h comp-c-include
-./usr/include/epoc32/reg.h comp-c-include
-./usr/include/epoc32/rwlock.h comp-c-include
-./usr/include/epoc32/setjmp.h comp-c-include
-./usr/include/epoc32/signal.h comp-c-include
-./usr/include/epoc32/sysarch.h comp-c-include
-./usr/include/epoc32/trap.h comp-c-include
-./usr/include/epoc32/types.h comp-c-include
-./usr/include/epoc32/vmparam.h comp-c-include
-./usr/include/epoc32/wchar_limits.h comp-c-include
diff --git a/distrib/sets/lists/comp/md.evbarm b/distrib/sets/lists/comp/md.evbarm
deleted file mode 100644
index 42b64a50f1d..00000000000
--- a/distrib/sets/lists/comp/md.evbarm
+++ /dev/null
@@ -1,51 +0,0 @@
-# $NetBSD: md.evbarm,v 1.19 2013/05/01 16:18:14 matt Exp $
-./usr/include/evbarm comp-c-include
-./usr/include/evbarm/ansi.h comp-c-include
-./usr/include/evbarm/aout_machdep.h comp-c-include
-./usr/include/evbarm/asm.h comp-c-include
-./usr/include/evbarm/bswap.h comp-c-include
-./usr/include/evbarm/bus.h comp-obsolete obsolete
-./usr/include/evbarm/cdefs.h comp-c-include
-./usr/include/evbarm/cpu.h comp-c-include
-./usr/include/evbarm/db_machdep.h comp-obsolete obsolete
-./usr/include/evbarm/disklabel.h comp-c-include
-./usr/include/evbarm/elf_machdep.h comp-c-include
-./usr/include/evbarm/endian.h comp-c-include
-./usr/include/evbarm/endian_machdep.h comp-c-include
-./usr/include/evbarm/fenv.h comp-c-include
-./usr/include/evbarm/float.h comp-c-include
-./usr/include/evbarm/fp.h comp-obsolete obsolete
-./usr/include/evbarm/frame.h comp-c-include
-./usr/include/evbarm/ieee.h comp-c-include
-./usr/include/evbarm/ieeefp.h comp-c-include
-./usr/include/evbarm/int_const.h comp-c-include
-./usr/include/evbarm/int_fmtio.h comp-c-include
-./usr/include/evbarm/int_limits.h comp-c-include
-./usr/include/evbarm/int_mwgwtypes.h comp-c-include
-./usr/include/evbarm/int_types.h comp-c-include
-./usr/include/evbarm/intr.h comp-c-include
-./usr/include/evbarm/ipkdb.h comp-obsolete obsolete
-./usr/include/evbarm/joystick.h comp-c-include
-./usr/include/evbarm/limits.h comp-c-include
-./usr/include/evbarm/lock.h comp-c-include
-./usr/include/evbarm/math.h comp-c-include
-./usr/include/evbarm/mcontext.h comp-c-include
-./usr/include/evbarm/mutex.h comp-c-include
-./usr/include/evbarm/param.h comp-c-include
-./usr/include/evbarm/pcb.h comp-c-include
-./usr/include/evbarm/pmap.h comp-c-include
-./usr/include/evbarm/pmc.h comp-c-include
-./usr/include/evbarm/proc.h comp-c-include
-./usr/include/evbarm/profile.h comp-c-include
-./usr/include/evbarm/ptrace.h comp-c-include
-./usr/include/evbarm/reg.h comp-c-include
-./usr/include/evbarm/rwlock.h comp-c-include
-./usr/include/evbarm/setjmp.h comp-c-include
-./usr/include/evbarm/signal.h comp-c-include
-./usr/include/evbarm/stdarg.h comp-obsolete obsolete
-./usr/include/evbarm/sysarch.h comp-c-include
-./usr/include/evbarm/trap.h comp-c-include
-./usr/include/evbarm/types.h comp-c-include
-./usr/include/evbarm/varargs.h comp-obsolete obsolete
-./usr/include/evbarm/vmparam.h comp-c-include
-./usr/include/evbarm/wchar_limits.h comp-c-include
diff --git a/distrib/sets/lists/comp/md.evbarm.armeb b/distrib/sets/lists/comp/md.evbarm.armeb
deleted file mode 100644
index 5fffc36c32e..00000000000
--- a/distrib/sets/lists/comp/md.evbarm.armeb
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: md.evbarm.armeb,v 1.1 2013/01/14 20:30:00 christos Exp $
-./usr/include/evbarm comp-c-include
-./usr/include/evbarm/ansi.h comp-c-include
-./usr/include/evbarm/aout_machdep.h comp-c-include
-./usr/include/evbarm/asm.h comp-c-include
-./usr/include/evbarm/bswap.h comp-c-include
-./usr/include/evbarm/bus.h comp-obsolete obsolete
-./usr/include/evbarm/cdefs.h comp-c-include
-./usr/include/evbarm/cpu.h comp-c-include
-./usr/include/evbarm/db_machdep.h comp-obsolete obsolete
-./usr/include/evbarm/disklabel.h comp-c-include
-./usr/include/evbarm/elf_machdep.h comp-c-include
-./usr/include/evbarm/endian.h comp-c-include
-./usr/include/evbarm/endian_machdep.h comp-c-include
-./usr/include/evbarm/float.h comp-c-include
-./usr/include/evbarm/fp.h comp-obsolete obsolete
-./usr/include/evbarm/frame.h comp-c-include
-./usr/include/evbarm/ieee.h comp-c-include
-./usr/include/evbarm/ieeefp.h comp-c-include
-./usr/include/evbarm/int_const.h comp-c-include
-./usr/include/evbarm/int_fmtio.h comp-c-include
-./usr/include/evbarm/int_limits.h comp-c-include
-./usr/include/evbarm/int_mwgwtypes.h comp-c-include
-./usr/include/evbarm/int_types.h comp-c-include
-./usr/include/evbarm/intr.h comp-c-include
-./usr/include/evbarm/ipkdb.h comp-obsolete obsolete
-./usr/include/evbarm/joystick.h comp-c-include
-./usr/include/evbarm/limits.h comp-c-include
-./usr/include/evbarm/lock.h comp-c-include
-./usr/include/evbarm/math.h comp-c-include
-./usr/include/evbarm/mcontext.h comp-c-include
-./usr/include/evbarm/mutex.h comp-c-include
-./usr/include/evbarm/param.h comp-c-include
-./usr/include/evbarm/pcb.h comp-c-include
-./usr/include/evbarm/pmap.h comp-c-include
-./usr/include/evbarm/pmc.h comp-c-include
-./usr/include/evbarm/proc.h comp-c-include
-./usr/include/evbarm/profile.h comp-c-include
-./usr/include/evbarm/ptrace.h comp-c-include
-./usr/include/evbarm/reg.h comp-c-include
-./usr/include/evbarm/rwlock.h comp-c-include
-./usr/include/evbarm/setjmp.h comp-c-include
-./usr/include/evbarm/signal.h comp-c-include
-./usr/include/evbarm/stdarg.h comp-obsolete obsolete
-./usr/include/evbarm/sysarch.h comp-c-include
-./usr/include/evbarm/trap.h comp-c-include
-./usr/include/evbarm/types.h comp-c-include
-./usr/include/evbarm/varargs.h comp-obsolete obsolete
-./usr/include/evbarm/vmparam.h comp-c-include
-./usr/include/evbarm/wchar_limits.h comp-c-include
diff --git a/distrib/sets/lists/comp/md.hpcarm b/distrib/sets/lists/comp/md.hpcarm
deleted file mode 100644
index 65e1e7f57b9..00000000000
--- a/distrib/sets/lists/comp/md.hpcarm
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: md.hpcarm,v 1.19 2013/01/16 16:01:06 christos Exp $
-./usr/include/hpcarm comp-c-include
-./usr/include/hpcarm/ansi.h comp-c-include
-./usr/include/hpcarm/aout_machdep.h comp-c-include
-./usr/include/hpcarm/apmvar.h comp-c-include
-./usr/include/hpcarm/asm.h comp-c-include
-./usr/include/hpcarm/bswap.h comp-c-include
-./usr/include/hpcarm/bus.h comp-obsolete obsolete
-./usr/include/hpcarm/cdefs.h comp-c-include
-./usr/include/hpcarm/cpu.h comp-c-include
-./usr/include/hpcarm/db_machdep.h comp-obsolete obsolete
-./usr/include/hpcarm/disklabel.h comp-c-include
-./usr/include/hpcarm/elf_machdep.h comp-c-include
-./usr/include/hpcarm/endian.h comp-c-include
-./usr/include/hpcarm/endian_machdep.h comp-c-include
-./usr/include/hpcarm/float.h comp-c-include
-./usr/include/hpcarm/fp.h comp-obsolete obsolete
-./usr/include/hpcarm/frame.h comp-c-include
-./usr/include/hpcarm/ieee.h comp-c-include
-./usr/include/hpcarm/ieeefp.h comp-c-include
-./usr/include/hpcarm/int_const.h comp-c-include
-./usr/include/hpcarm/int_fmtio.h comp-c-include
-./usr/include/hpcarm/int_limits.h comp-c-include
-./usr/include/hpcarm/int_mwgwtypes.h comp-c-include
-./usr/include/hpcarm/int_types.h comp-c-include
-./usr/include/hpcarm/intr.h comp-c-include
-./usr/include/hpcarm/ipkdb.h comp-obsolete obsolete
-./usr/include/hpcarm/limits.h comp-c-include
-./usr/include/hpcarm/lock.h comp-c-include
-./usr/include/hpcarm/math.h comp-c-include
-./usr/include/hpcarm/mcontext.h comp-c-include
-./usr/include/hpcarm/mutex.h comp-c-include
-./usr/include/hpcarm/param.h comp-c-include
-./usr/include/hpcarm/pcb.h comp-c-include
-./usr/include/hpcarm/pmap.h comp-c-include
-./usr/include/hpcarm/pmc.h comp-c-include
-./usr/include/hpcarm/proc.h comp-c-include
-./usr/include/hpcarm/profile.h comp-c-include
-./usr/include/hpcarm/ptrace.h comp-c-include
-./usr/include/hpcarm/reg.h comp-c-include
-./usr/include/hpcarm/rwlock.h comp-c-include
-./usr/include/hpcarm/setjmp.h comp-c-include
-./usr/include/hpcarm/signal.h comp-c-include
-./usr/include/hpcarm/stdarg.h comp-obsolete obsolete
-./usr/include/hpcarm/sysarch.h comp-c-include
-./usr/include/hpcarm/trap.h comp-c-include
-./usr/include/hpcarm/types.h comp-c-include
-./usr/include/hpcarm/varargs.h comp-obsolete obsolete
-./usr/include/hpcarm/vmparam.h comp-c-include
-./usr/include/hpcarm/wchar_limits.h comp-c-include
diff --git a/distrib/sets/lists/comp/md.iyonix b/distrib/sets/lists/comp/md.iyonix
deleted file mode 100644
index 80e7e40a60b..00000000000
--- a/distrib/sets/lists/comp/md.iyonix
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: md.iyonix,v 1.8 2013/01/11 14:22:55 matt Exp $
-./usr/include/iyonix comp-c-include
-./usr/include/iyonix/ansi.h comp-c-include
-./usr/include/iyonix/aout_machdep.h comp-c-include
-./usr/include/iyonix/asm.h comp-c-include
-./usr/include/iyonix/bswap.h comp-c-include
-./usr/include/iyonix/bus.h comp-obsolete obsolete
-./usr/include/iyonix/cdefs.h comp-c-include
-./usr/include/iyonix/cpu.h comp-c-include
-./usr/include/iyonix/db_machdep.h comp-obsolete obsolete
-./usr/include/iyonix/disklabel.h comp-c-include
-./usr/include/iyonix/elf_machdep.h comp-c-include
-./usr/include/iyonix/endian.h comp-c-include
-./usr/include/iyonix/endian_machdep.h comp-c-include
-./usr/include/iyonix/float.h comp-c-include
-./usr/include/iyonix/fp.h comp-obsolete obsolete
-./usr/include/iyonix/frame.h comp-c-include
-./usr/include/iyonix/ieee.h comp-c-include
-./usr/include/iyonix/ieeefp.h comp-c-include
-./usr/include/iyonix/int_const.h comp-c-include
-./usr/include/iyonix/int_fmtio.h comp-c-include
-./usr/include/iyonix/int_limits.h comp-c-include
-./usr/include/iyonix/int_mwgwtypes.h comp-c-include
-./usr/include/iyonix/int_types.h comp-c-include
-./usr/include/iyonix/intr.h comp-c-include
-./usr/include/iyonix/ipkdb.h comp-obsolete obsolete
-./usr/include/iyonix/joystick.h comp-c-include
-./usr/include/iyonix/limits.h comp-c-include
-./usr/include/iyonix/lock.h comp-c-include
-./usr/include/iyonix/math.h comp-c-include
-./usr/include/iyonix/mcontext.h comp-c-include
-./usr/include/iyonix/mutex.h comp-c-include
-./usr/include/iyonix/param.h comp-c-include
-./usr/include/iyonix/pcb.h comp-c-include
-./usr/include/iyonix/pmap.h comp-c-include
-./usr/include/iyonix/pmc.h comp-c-include
-./usr/include/iyonix/proc.h comp-c-include
-./usr/include/iyonix/profile.h comp-c-include
-./usr/include/iyonix/ptrace.h comp-c-include
-./usr/include/iyonix/reg.h comp-c-include
-./usr/include/iyonix/rwlock.h comp-c-include
-./usr/include/iyonix/setjmp.h comp-c-include
-./usr/include/iyonix/signal.h comp-c-include
-./usr/include/iyonix/stdarg.h comp-obsolete obsolete
-./usr/include/iyonix/sysarch.h comp-c-include
-./usr/include/iyonix/trap.h comp-c-include
-./usr/include/iyonix/types.h comp-c-include
-./usr/include/iyonix/varargs.h comp-obsolete obsolete
-./usr/include/iyonix/vmparam.h comp-c-include
-./usr/include/iyonix/wchar_limits.h comp-c-include
diff --git a/distrib/sets/lists/comp/md.netwinder b/distrib/sets/lists/comp/md.netwinder
deleted file mode 100644
index fee07662cf8..00000000000
--- a/distrib/sets/lists/comp/md.netwinder
+++ /dev/null
@@ -1,50 +0,0 @@
-# $NetBSD: md.netwinder,v 1.15 2013/01/11 14:22:55 matt Exp $
-./usr/include/netwinder comp-c-include
-./usr/include/netwinder/ansi.h comp-c-include
-./usr/include/netwinder/aout_machdep.h comp-c-include
-./usr/include/netwinder/asm.h comp-c-include
-./usr/include/netwinder/bswap.h comp-c-include
-./usr/include/netwinder/bus.h comp-obsolete obsolete
-./usr/include/netwinder/cdefs.h comp-c-include
-./usr/include/netwinder/cpu.h comp-c-include
-./usr/include/netwinder/db_machdep.h comp-obsolete obsolete
-./usr/include/netwinder/disklabel.h comp-c-include
-./usr/include/netwinder/elf_machdep.h comp-c-include
-./usr/include/netwinder/endian.h comp-c-include
-./usr/include/netwinder/endian_machdep.h comp-c-include
-./usr/include/netwinder/float.h comp-c-include
-./usr/include/netwinder/fp.h comp-obsolete obsolete
-./usr/include/netwinder/frame.h comp-c-include
-./usr/include/netwinder/ieee.h comp-c-include
-./usr/include/netwinder/ieeefp.h comp-c-include
-./usr/include/netwinder/int_const.h comp-c-include
-./usr/include/netwinder/int_fmtio.h comp-c-include
-./usr/include/netwinder/int_limits.h comp-c-include
-./usr/include/netwinder/int_mwgwtypes.h comp-c-include
-./usr/include/netwinder/int_types.h comp-c-include
-./usr/include/netwinder/intr.h comp-c-include
-./usr/include/netwinder/ipkdb.h comp-obsolete obsolete
-./usr/include/netwinder/joystick.h comp-c-include
-./usr/include/netwinder/limits.h comp-c-include
-./usr/include/netwinder/lock.h comp-c-include
-./usr/include/netwinder/math.h comp-c-include
-./usr/include/netwinder/mcontext.h comp-c-include
-./usr/include/netwinder/mutex.h comp-c-include
-./usr/include/netwinder/param.h comp-c-include
-./usr/include/netwinder/pcb.h comp-c-include
-./usr/include/netwinder/pmap.h comp-c-include
-./usr/include/netwinder/pmc.h comp-c-include
-./usr/include/netwinder/proc.h comp-c-include
-./usr/include/netwinder/profile.h comp-c-include
-./usr/include/netwinder/ptrace.h comp-c-include
-./usr/include/netwinder/reg.h comp-c-include
-./usr/include/netwinder/rwlock.h comp-c-include
-./usr/include/netwinder/setjmp.h comp-c-include
-./usr/include/netwinder/signal.h comp-c-include
-./usr/include/netwinder/stdarg.h comp-obsolete obsolete
-./usr/include/netwinder/sysarch.h comp-c-include
-./usr/include/netwinder/trap.h comp-c-include
-./usr/include/netwinder/types.h comp-c-include
-./usr/include/netwinder/varargs.h comp-obsolete obsolete
-./usr/include/netwinder/vmparam.h comp-c-include
-./usr/include/netwinder/wchar_limits.h comp-c-include
diff --git a/distrib/sets/lists/comp/md.shark b/distrib/sets/lists/comp/md.shark
deleted file mode 100644
index e673e77e30f..00000000000
--- a/distrib/sets/lists/comp/md.shark
+++ /dev/null
@@ -1,52 +0,0 @@
-# $NetBSD: md.shark,v 1.22 2013/01/16 16:01:06 christos Exp $
-./usr/include/ieeefp.h comp-c-include
-./usr/include/shark comp-c-include
-./usr/include/shark/ansi.h comp-c-include
-./usr/include/shark/aout_machdep.h comp-c-include
-./usr/include/shark/asm.h comp-c-include
-./usr/include/shark/bswap.h comp-c-include
-./usr/include/shark/bus.h comp-obsolete obsolete
-./usr/include/shark/cdefs.h comp-c-include
-./usr/include/shark/cpu.h comp-c-include
-./usr/include/shark/db_machdep.h comp-obsolete obsolete
-./usr/include/shark/devmap.h comp-c-include
-./usr/include/shark/disklabel.h comp-c-include
-./usr/include/shark/elf_machdep.h comp-c-include
-./usr/include/shark/endian.h comp-c-include
-./usr/include/shark/endian_machdep.h comp-c-include
-./usr/include/shark/float.h comp-c-include
-./usr/include/shark/fp.h comp-obsolete obsolete
-./usr/include/shark/frame.h comp-c-include
-./usr/include/shark/ieee.h comp-c-include
-./usr/include/shark/ieeefp.h comp-c-include
-./usr/include/shark/int_const.h comp-c-include
-./usr/include/shark/int_fmtio.h comp-c-include
-./usr/include/shark/int_limits.h comp-c-include
-./usr/include/shark/int_mwgwtypes.h comp-c-include
-./usr/include/shark/int_types.h comp-c-include
-./usr/include/shark/intr.h comp-c-include
-./usr/include/shark/ipkdb.h comp-obsolete obsolete
-./usr/include/shark/joystick.h comp-c-include
-./usr/include/shark/limits.h comp-c-include
-./usr/include/shark/lock.h comp-c-include
-./usr/include/shark/math.h comp-c-include
-./usr/include/shark/mcontext.h comp-c-include
-./usr/include/shark/mutex.h comp-c-include
-./usr/include/shark/param.h comp-c-include
-./usr/include/shark/pcb.h comp-c-include
-./usr/include/shark/pmap.h comp-c-include
-./usr/include/shark/pmc.h comp-c-include
-./usr/include/shark/proc.h comp-c-include
-./usr/include/shark/profile.h comp-c-include
-./usr/include/shark/ptrace.h comp-c-include
-./usr/include/shark/reg.h comp-c-include
-./usr/include/shark/rwlock.h comp-c-include
-./usr/include/shark/setjmp.h comp-c-include
-./usr/include/shark/signal.h comp-c-include
-./usr/include/shark/stdarg.h comp-obsolete obsolete
-./usr/include/shark/sysarch.h comp-c-include
-./usr/include/shark/trap.h comp-c-include
-./usr/include/shark/types.h comp-c-include
-./usr/include/shark/varargs.h comp-obsolete obsolete
-./usr/include/shark/vmparam.h comp-c-include
-./usr/include/shark/wchar_limits.h comp-c-include
diff --git a/distrib/sets/lists/comp/md.zaurus b/distrib/sets/lists/comp/md.zaurus
deleted file mode 100644
index 54c608cf653..00000000000
--- a/distrib/sets/lists/comp/md.zaurus
+++ /dev/null
@@ -1,49 +0,0 @@
-# $NetBSD: md.zaurus,v 1.11 2013/01/16 16:01:06 christos Exp $
-./usr/include/zaurus comp-c-include
-./usr/include/zaurus/ansi.h comp-c-include
-./usr/include/zaurus/aout_machdep.h comp-c-include
-./usr/include/zaurus/apmvar.h comp-c-include
-./usr/include/zaurus/asm.h comp-c-include
-./usr/include/zaurus/bswap.h comp-c-include
-./usr/include/zaurus/bus.h comp-obsolete obsolete
-./usr/include/zaurus/cdefs.h comp-c-include
-./usr/include/zaurus/cpu.h comp-c-include
-./usr/include/zaurus/disklabel.h comp-c-include
-./usr/include/zaurus/elf_machdep.h comp-c-include
-./usr/include/zaurus/endian.h comp-c-include
-./usr/include/zaurus/endian_machdep.h comp-c-include
-./usr/include/zaurus/float.h comp-c-include
-./usr/include/zaurus/fp.h comp-obsolete obsolete
-./usr/include/zaurus/frame.h comp-c-include
-./usr/include/zaurus/ieee.h comp-c-include
-./usr/include/zaurus/ieeefp.h comp-c-include
-./usr/include/zaurus/int_const.h comp-c-include
-./usr/include/zaurus/int_fmtio.h comp-c-include
-./usr/include/zaurus/int_limits.h comp-c-include
-./usr/include/zaurus/int_mwgwtypes.h comp-c-include
-./usr/include/zaurus/int_types.h comp-c-include
-./usr/include/zaurus/intr.h comp-c-include
-./usr/include/zaurus/ipkdb.h comp-obsolete obsolete
-./usr/include/zaurus/limits.h comp-c-include
-./usr/include/zaurus/lock.h comp-c-include
-./usr/include/zaurus/math.h comp-c-include
-./usr/include/zaurus/mcontext.h comp-c-include
-./usr/include/zaurus/mutex.h comp-c-include
-./usr/include/zaurus/param.h comp-c-include
-./usr/include/zaurus/pcb.h comp-c-include
-./usr/include/zaurus/pmap.h comp-c-include
-./usr/include/zaurus/pmc.h comp-c-include
-./usr/include/zaurus/proc.h comp-c-include
-./usr/include/zaurus/profile.h comp-c-include
-./usr/include/zaurus/ptrace.h comp-c-include
-./usr/include/zaurus/reg.h comp-c-include
-./usr/include/zaurus/rwlock.h comp-c-include
-./usr/include/zaurus/setjmp.h comp-c-include
-./usr/include/zaurus/signal.h comp-c-include
-./usr/include/zaurus/stdarg.h comp-obsolete obsolete
-./usr/include/zaurus/sysarch.h comp-c-include
-./usr/include/zaurus/trap.h comp-c-include
-./usr/include/zaurus/types.h comp-c-include
-./usr/include/zaurus/varargs.h comp-obsolete obsolete
-./usr/include/zaurus/vmparam.h comp-c-include
-./usr/include/zaurus/wchar_limits.h comp-c-include
diff --git a/distrib/sets/lists/debug/ad.arm b/distrib/sets/lists/debug/ad.arm
index 37f85d29fe3..0504cea8041 100644
--- a/distrib/sets/lists/debug/ad.arm
+++ b/distrib/sets/lists/debug/ad.arm
@@ -1,4 +1,4 @@
-# $NetBSD: ad.arm,v 1.7 2013/05/01 04:02:55 matt Exp $
+# $NetBSD: ad.arm,v 1.8 2013/05/02 03:56:39 matt Exp $
./usr/lib/libarm_g.a -unknown- debuglib
./usr/lib/libc_vfp_g.a -unknown- debuglib,softfloat
./usr/lib/libpmc_g.a -unknown- debuglib
@@ -199,3 +199,11 @@
./usr/lib/oabi/libperfuse_g.a comp-c-proflib compat,debuglib
./usr/lib/oabi/libppath_g.a comp-c-proflib compat,debuglib
./usr/lib/oabi/libwind_g.a comp-c-proflib compat,debuglib,kerberos
+./usr/libdata/debug/usr/sbin/apm.debug comp-sysutil-debug debug
+./usr/libdata/debug/usr/sbin/apmd.debug comp-sysutil-debug debug
+./usr/libdata/debug/usr/sbin/elftosb.debug comp-util-debug debug,endian=1234
+./usr/libdata/debug/usr/sbin/eeprom.debug comp-util-debug debug
+./usr/libdata/debug/usr/sbin/ofctl.debug comp-util-debug debug
+./usr/libdata/debug/usr/sbin/sbkeygen.debug comp-util-debug debug,endian=1234
+./usr/libdata/debug/usr/sbin/sbtool.debug comp-util-debug debug,endian=1234
+./usr/libdata/debug/usr/sbin/tpctl.debug comp-sysutil-debug debug
diff --git a/distrib/sets/lists/debug/md.hpcarm b/distrib/sets/lists/debug/md.hpcarm
deleted file mode 100644
index a30c05ad91c..00000000000
--- a/distrib/sets/lists/debug/md.hpcarm
+++ /dev/null
@@ -1,3 +0,0 @@
-# $NetBSD: md.hpcarm,v 1.2 2013/01/16 21:11:08 christos Exp $
-./usr/libdata/debug/usr/sbin/apm.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/tpctl.debug comp-sysutil-debug debug
diff --git a/distrib/sets/lists/debug/md.shark b/distrib/sets/lists/debug/md.shark
deleted file mode 100644
index 90e64a0f5be..00000000000
--- a/distrib/sets/lists/debug/md.shark
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: md.shark,v 1.2 2013/01/16 21:11:09 christos Exp $
-./usr/libdata/debug/sbin/ldconfig.debug comp-sysutil-debug debug,pic
-./usr/libdata/debug/usr/sbin/eeprom.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/ofctl.debug comp-sysutil-debug debug
diff --git a/distrib/sets/lists/debug/md.zaurus b/distrib/sets/lists/debug/md.zaurus
deleted file mode 100644
index 9e742819e10..00000000000
--- a/distrib/sets/lists/debug/md.zaurus
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: md.zaurus,v 1.2 2013/01/16 21:11:10 christos Exp $
-./usr/libdata/debug/usr/sbin/apm.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/apmd.debug comp-sysutil-debug debug
-./usr/libdata/debug/usr/sbin/tpctl.debug comp-sysutil-debug debug
diff --git a/external/bsd/elftosb/lib/Makefile b/external/bsd/elftosb/lib/Makefile
index ff421da1dd1..7dd1fb7b480 100644
--- a/external/bsd/elftosb/lib/Makefile
+++ b/external/bsd/elftosb/lib/Makefile
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2013/02/05 16:57:07 matt Exp $
+# $NetBSD: Makefile,v 1.7 2013/05/02 03:56:39 matt Exp $
-.if ${MACHINE} == "evbarm" && ${MACHINE_ARCH:M*eb} == ""
+.include <bsd.init.mk>
+.include <bsd.endian.mk>
+
+.if ${MACHINE_CPU} == "arm" && ${TARGET_ENDIANNESS} == "1234"
LIBISPRIVATE= yes
LIB= elftosb
@@ -41,5 +44,3 @@ SRCS= AESKey.cpp \
.else
${.TARGETS}:
.endif
-
-
diff --git a/external/bsd/elftosb/usr.sbin/elftosb/Makefile b/external/bsd/elftosb/usr.sbin/elftosb/Makefile
index 8b10839461d..f49d33d9cb6 100644
--- a/external/bsd/elftosb/usr.sbin/elftosb/Makefile
+++ b/external/bsd/elftosb/usr.sbin/elftosb/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2013/02/05 07:27:03 matt Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/02 03:56:39 matt Exp $
.include <bsd.init.mk>
.include <bsd.endian.mk>
+.include <bsd.own.mk>
.PATH: ${DIST}/elftosb2
-.if ${MACHINE} == "evbarm" \
- && ${MACHINE_CPU} == "arm" \
- && ${TARGET_ENDIANNESS} == "1234"
+.if ${MACHINE_CPU} == "arm" && ${TARGET_ENDIANNESS} == "1234"
PROG_CXX= elftosb
SRCS= BootImageGenerator.cpp \
diff --git a/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile b/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile
index 355463d76f3..63bf531c29a 100644
--- a/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile
+++ b/external/bsd/elftosb/usr.sbin/sbkeygen/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2013/02/05 07:27:03 matt Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/02 03:56:39 matt Exp $
.include <bsd.init.mk>
.include <bsd.endian.mk>
+.include <bsd.own.mk>
.PATH: ${DIST}/keygen
-.if ${MACHINE} == "evbarm" \
- && ${MACHINE_CPU} == "arm" \
- && ${TARGET_ENDIANNESS} == "1234"
+.if ${MACHINE_CPU} == "arm" && ${TARGET_ENDIANNESS} == "1234"
PROG_CXX= sbkeygen
SRCS= keygen.cpp
diff --git a/external/bsd/elftosb/usr.sbin/sbtool/Makefile b/external/bsd/elftosb/usr.sbin/sbtool/Makefile
index 9e5c88030d5..a2cebd9acde 100644
--- a/external/bsd/elftosb/usr.sbin/sbtool/Makefile
+++ b/external/bsd/elftosb/usr.sbin/sbtool/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.3 2013/02/05 07:27:03 matt Exp $
+# $NetBSD: Makefile,v 1.4 2013/05/02 03:56:39 matt Exp $
.include <bsd.init.mk>
.include <bsd.endian.mk>
+.include <bsd.own.mk>
.PATH: ${DIST}/sbtool
-.if ${MACHINE} == "evbarm" \
- && ${MACHINE_CPU} == "arm" \
- && ${TARGET_ENDIANNESS} == "1234"
+.if ${MACHINE_CPU} == "arm" && ${TARGET_ENDIANNESS} == "1234"
PROG_CXX= sbtool
SRCS= EncoreBootImageReader.cpp sbtool.cpp
diff --git a/external/gpl3/gdb/dist/gdb/armnbsd-nat.c b/external/gpl3/gdb/dist/gdb/armnbsd-nat.c
index 160624f120b..14479357c55 100644
--- a/external/gpl3/gdb/dist/gdb/armnbsd-nat.c
+++ b/external/gpl3/gdb/dist/gdb/armnbsd-nat.c
@@ -30,6 +30,7 @@
#include <sys/ptrace.h>
#include <machine/reg.h>
#include <machine/frame.h>
+#include <arm/arm32/frame.h>
/* Support for debugging kernel virtual memory images. */
#include <machine/pcb.h>
diff --git a/sys/arch/Makefile b/sys/arch/Makefile
index 5934e96ba6a..1855f91e315 100644
--- a/sys/arch/Makefile
+++ b/sys/arch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2011/07/17 20:54:35 joerg Exp $
+# $NetBSD: Makefile,v 1.42 2013/05/02 03:56:40 matt Exp $
# For now, we install the machine and arch includes, and symlink 'machine'
# to the location of the machine includes (usually).
@@ -7,7 +7,6 @@
.include <bsd.own.mk>
-SUBDIR= ${MACHINE}
ARCHSUBDIR= ${MACHINE_CPU}
.if ${ARCHSUBDIR} == "mips64"
@@ -17,6 +16,12 @@ ARCHSUBDIR= mips
ARCHSUBDIR= powerpc
.endif
+.if ${MACHINE_CPU} == "arm"
+SUBDIR= acorn26 acorn32 cats epoc32 evbarm hpcarm iyonix netwinder shark zaurus
+.else
+SUBDIR= ${MACHINE}
+.endif
+
.if ${MACHINE} != ${ARCHSUBDIR}
.if exists(${ARCHSUBDIR})
SUBDIR+= ${ARCHSUBDIR}
@@ -39,7 +44,7 @@ SUBDIR+= xen
# bebox \
# cats cesfic cobalt \
# dreamcast \
-# evbarm evbmips evbppc evbsh3 ews4800mips\
+# emips epoc32 evbarm evbmips evbppc evbsh3 ews4800mips\
# hp300 hpc hpcarm hpcmips hpcsh \
# i386 iyonix \
# luna68k \
@@ -53,7 +58,11 @@ SUBDIR+= xen
# x68k x86_64 xen \
# zaurus
+.if ${MACHINE_CPU} == arm
+INCSYMLINKS= ${MACHINE_CPU} /usr/include/machine
+.else
INCSYMLINKS= ${MACHINE} /usr/include/machine
+.endif
INCSYMLINKS+= machine/float.h /usr/include/float.h
diff --git a/sys/arch/acorn26/include/Makefile b/sys/arch/acorn26/include/Makefile
index a47dc248ae7..9bbe13c5b84 100644
--- a/sys/arch/acorn26/include/Makefile
+++ b/sys/arch/acorn26/include/Makefile
@@ -1,23 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2013/01/11 14:09:54 matt Exp $
+# $NetBSD: Makefile,v 1.13 2013/05/02 03:56:40 matt Exp $
-INCSDIR= /usr/include/acorn26
+INCSDIR= /usr/include/acorn26
+INCS= vmparam.h
-INCS= ansi.h aout_machdep.h asm.h \
- boot.h bswap.h \
- cdefs.h cpu.h \
- disklabel.h \
- elf_machdep.h endian.h endian_machdep.h \
- float.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 lock.h \
- math.h mutex.h mcontext.h \
- param.h pcb.h pmap.h pmc.h proc.h profile.h ptrace.h \
- reg.h rwlock.h \
- setjmp.h signal.h sysarch.h \
- trap.h types.h \
- vmparam.h \
- wchar_limits.h
-
-.include <bsd.kinc.mk>
+.include "../../arm/include/Makefile.common"
diff --git a/sys/arch/acorn32/include/Makefile b/sys/arch/acorn32/include/Makefile
index 3ecd3aa730a..ffd348eae89 100644
--- a/sys/arch/acorn32/include/Makefile
+++ b/sys/arch/acorn32/include/Makefile
@@ -1,25 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2013/01/11 14:09:54 matt Exp $
+# $NetBSD: Makefile,v 1.29 2013/05/02 03:56:40 matt Exp $
-INCSDIR= /usr/include/acorn32
+INCSDIR= /usr/include/acorn32
+INCS=
-INCS= ansi.h aout_machdep.h asm.h \
- bswap.h \
- cdefs.h cpu.h \
- disklabel.h \
- elf_machdep.h endian.h endian_machdep.h \
- float.h frame.h \
- ieee.h ieeefp.h \
- int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
- intr.h \
- limits.h lock.h \
- math.h mcontext.h mutex.h \
- param.h pcb.h pmap.h pmc.h proc.h profile.h ptrace.h \
- reg.h rwlock.h \
- setjmp.h signal.h sysarch.h \
- trap.h types.h \
- vmparam.h \
- wchar_limits.h
-
-INCS+= joystick.h
-
-.include <bsd.kinc.mk>
+.include "../../arm/include/Makefile.common"
diff --git a/sys/arch/arm/include/Makefile b/sys/arch/arm/include/Makefile
index 6e7f10ee96c..86dff46ef2c 100644
--- a/sys/arch/arm/include/Makefile
+++ b/sys/arch/arm/include/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2013/05/01 12:00:51 matt Exp $
+# $NetBSD: Makefile,v 1.47 2013/05/02 03:56:40 matt Exp $
INCSDIR= /usr/include/arm
-INCS= aeabi.h ansi.h aout_machdep.h armreg.h asm.h atomic.h \
+INCS= aeabi.h ansi.h aout_machdep.h apmvar.h armreg.h asm.h atomic.h \
bswap.h byte_swap.h \
cdefs.h cpu.h cpuconf.h \
disklabel.h \
@@ -10,6 +10,7 @@ INCS= aeabi.h ansi.h aout_machdep.h armreg.h asm.h atomic.h \
fenv.h float.h frame.h \
ieee.h ieeefp.h \
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
+ joystick.h \
kcore.h \
limits.h lock.h \
math.h mcontext.h mutex.h \
diff --git a/sys/arch/arm/include/Makefile.common b/sys/arch/arm/include/Makefile.common
index 9a6966f43f1..6d7643a53e8 100644
--- a/sys/arch/arm/include/Makefile.common
+++ b/sys/arch/arm/include/Makefile.common
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile.common,v 1.1 2013/05/01 12:01:55 matt Exp $
-
-INCSDIR= /usr/include/${MACHINE}
+# $NetBSD: Makefile.common,v 1.2 2013/05/02 03:56:40 matt Exp $
.PATH: ../../arm/include/common
+.if 0
INCS+= ansi.h aout_machdep.h asm.h \
bswap.h \
cdefs.h cpu.h \
@@ -19,5 +18,9 @@ INCS+= ansi.h aout_machdep.h asm.h \
trap.h types.h \
vmparam.h \
wchar_limits.h
+.else
+INCS+= disklabel.h \
+ intr.h
+.endif
.include <bsd.kinc.mk>
diff --git a/sys/arch/arm/include/apmvar.h b/sys/arch/arm/include/apmvar.h
new file mode 100644
index 00000000000..5384d771d6c
--- /dev/null
+++ b/sys/arch/arm/include/apmvar.h
@@ -0,0 +1,34 @@
+/* $NetBSD: apmvar.h,v 1.1 2013/05/02 03:56:40 matt Exp $ */
+
+/*-
+ * Copyright (c) 1995 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#ifndef __ZAURUS_APMVAR_H__
+#define __ZAURUS_APMVAR_H__
+
+#include <dev/apm/apmbios.h>
+#include <dev/apm/apmio.h>
+
+#endif /* __ZAURUS_APMVAR_H__ */
diff --git a/sys/arch/arm/include/joystick.h b/sys/arch/arm/include/joystick.h
new file mode 100644
index 00000000000..a0a890a82a2
--- /dev/null
+++ b/sys/arch/arm/include/joystick.h
@@ -0,0 +1,3 @@
+/* $NetBSD: joystick.h,v 1.1 2013/05/02 03:56:40 matt Exp $ */
+
+#include <sys/joystick.h>
diff --git a/sys/arch/cats/include/Makefile b/sys/arch/cats/include/Makefile
index dce860b28cf..17409e35080 100644
--- a/sys/arch/cats/include/Makefile
+++ b/sys/arch/cats/include/Makefile
@@ -1,25 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2013/01/11 14:09:55 matt Exp $
+# $NetBSD: Makefile,v 1.26 2013/05/02 03:56:40 matt Exp $
-INCSDIR= /usr/include/cats
+INCSDIR= /usr/include/cats
+INCS=
-INCS= ansi.h aout_machdep.h asm.h \
- bswap.h \
- cdefs.h cpu.h \
- disklabel.h \
- elf_machdep.h endian.h endian_machdep.h \
- float.h frame.h \
- ieee.h ieeefp.h \
- int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
- intr.h \
- limits.h lock.h \
- math.h mcontext.h mutex.h \
- param.h pcb.h pmap.h pmc.h proc.h profile.h ptrace.h \
- reg.h rwlock.h \
- setjmp.h signal.h sysarch.h \
- trap.h types.h \
- vmparam.h \
- wchar_limits.h
-
-INCS+= joystick.h
-
-.include <bsd.kinc.mk>
+.include "../../arm/include/Makefile.common"
diff --git a/sys/arch/epoc32/include/Makefile b/sys/arch/epoc32/include/Makefile
index b4c7e25d524..72cb59035e1 100644
--- a/sys/arch/epoc32/include/Makefile
+++ b/sys/arch/epoc32/include/Makefile
@@ -1,23 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2013/05/01 13:11:59 kiyohara Exp $
+# $NetBSD: Makefile,v 1.2 2013/05/02 03:56:40 matt Exp $
-INCSDIR= /usr/include/epoc32
+INCSDIR= /usr/include/epoc32
+INCS=
-INCS= ansi.h aout_machdep.h asm.h \
- bswap.h \
- cdefs.h cpu.h \
- disklabel.h \
- elf_machdep.h endian.h endian_machdep.h \
- float.h frame.h \
- ieee.h ieeefp.h \
- int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
- intr.h \
- limits.h lock.h \
- math.h mcontext.h mutex.h \
- param.h pcb.h pmap.h pmc.h proc.h profile.h ptrace.h \
- reg.h rwlock.h \
- setjmp.h signal.h sysarch.h \
- trap.h types.h \
- vmparam.h \
- wchar_limits.h
-
-.include <bsd.kinc.mk>
+.include "../../arm/include/Makefile.common"
diff --git a/sys/arch/epoc32/include/disklabel.h b/sys/arch/epoc32/include/disklabel.h
index a756e7e952a..977f65b28e0 100644
--- a/sys/arch/epoc32/include/disklabel.h
+++ b/sys/arch/epoc32/include/disklabel.h
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.1 2013/04/28 12:11:26 kiyohara Exp $ */
+/* $NetBSD: disklabel.h,v 1.2 2013/05/02 03:56:40 matt Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -30,14 +30,28 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _MACHINE_DISKLABEL_H_
-#define _MACHINE_DISKLABEL_H_
+#ifndef _EPOC32_DISKLABEL_H_
+#define _EPOC32_DISKLABEL_H_
-#define LABELUSESMBR 1 /* use MBR partitionning */
-#define LABELSECTOR 1 /* sector containing label */
-#define LABELOFFSET 0 /* offset of label in sector */
-#define MAXPARTITIONS 16 /* number of partitions */
-#define RAW_PART 3 /* raw partition: XX?d (XXX) */
+#define LABELUSESMBR 1 /* use MBR partitionning */
+#define LABELSECTOR 1 /* sector containing label */
+#define LABELOFFSET 0 /* offset of label in sector */
+#define MAXPARTITIONS 16 /* number of partitions */
+#define OLDMAXPARTITIONS 8 /* number of partitions before 1.6 */
+#define RAW_PART 3 /* raw partition: XX?d (XXX) */
+
+/*
+ * We use the highest bit of the minor number for the partition number.
+ * This maintains backward compatibility with device nodes created before
+ * MAXPARTITIONS was increased.
+ */
+#define __EPOC32_MAXDISKS ((1 << 20) / MAXPARTITIONS)
+#define DISKUNIT(dev) ((minor(dev) / OLDMAXPARTITIONS) % __EPOC32_MAXDISKS)
+#define DISKPART(dev) ((minor(dev) % OLDMAXPARTITIONS) + \
+ ((minor(dev) / (__EPOC32_MAXDISKS * OLDMAXPARTITIONS)) * OLDMAXPARTITIONS))
+#define DISKMINOR(unit, part) \
+ (((unit) * OLDMAXPARTITIONS) + ((part) % OLDMAXPARTITIONS) + \
+ ((part) / OLDMAXPARTITIONS) * (__EPOC32_MAXDISKS * OLDMAXPARTITIONS))
/* Pull in MBR partition definitions. */
#if HAVE_NBTOOL_CONFIG_H
@@ -52,12 +66,11 @@
#else
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
-
struct cpu_disklabel {
struct mbr_partition dosparts[MBR_PART_COUNT];
#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
-#endif /* __ASSEMBLER__ */
+#endif
-#endif /* _MACHINE_DISKLABEL_H_ */
+#endif /* _EPOC32_DISKLABEL_H_ */
diff --git a/sys/arch/epoc32/include/types.h b/sys/arch/epoc32/include/types.h
index 8e700c8b4b9..e86d056a23f 100644
--- a/sys/arch/epoc32/include/types.h
+++ b/sys/arch/epoc32/include/types.h
@@ -1,8 +1,10 @@
-/* $NetBSD: types.h,v 1.1 2013/04/28 12:11:25 kiyohara Exp $ */
+/* $NetBSD: types.h,v 1.2 2013/05/02 03:56:40 matt Exp $ */
#ifndef _EPOC32_TYPES_H_
#define _EPOC32_TYPES_H_
#include <arm/arm32/types.h>
+#define __HAVE_OLD_DISKLABEL
+
#endif /* _EPOC32_TYPES_H_ */
diff --git a/sys/arch/evbarm/include/Makefile b/sys/arch/evbarm/include/Makefile
index 4f23b1d6688..cd9eb8a2194 100644
--- a/sys/arch/evbarm/include/Makefile
+++ b/sys/arch/evbarm/include/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2013/05/01 12:02:55 matt Exp $
+# $NetBSD: Makefile,v 1.20 2013/05/02 03:56:40 matt Exp $
-INCS+= disklabel.h \
- intr.h \
- joystick.h \
- pmap.h
+INCSDIR= /usr/include/evbarm
+
+INCS=
.include "../../arm/include/Makefile.common"
diff --git a/sys/arch/evbarm/stand/Makefile.inc b/sys/arch/evbarm/stand/Makefile.inc
index dc861b94843..e2d4547bf7e 100644
--- a/sys/arch/evbarm/stand/Makefile.inc
+++ b/sys/arch/evbarm/stand/Makefile.inc
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.1 2003/04/29 05:35:08 thorpej Exp $
+# $NetBSD: Makefile.inc,v 1.2 2013/05/02 03:56:41 matt Exp $
BINDIR?= /usr/mdec
FILESDIR?= /usr/mdec
+MACHINE=evbarm
diff --git a/sys/arch/evbarm/stand/gzboot/Makefile b/sys/arch/evbarm/stand/gzboot/Makefile
index ef5740c96d0..67f89a30c7a 100644
--- a/sys/arch/evbarm/stand/gzboot/Makefile
+++ b/sys/arch/evbarm/stand/gzboot/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.11 2013/02/05 07:28:19 matt Exp $
+# $NetBSD: Makefile,v 1.12 2013/05/02 03:56:41 matt Exp $
.include <bsd.endian.mk>
+SUBDIR= ADI_BRH_flash_0x00140000
+
.if ${MACHINE_CPU} == "arm" && ${TARGET_ENDIANNESS} == "1234"
# Little endian platforms
-SUBDIR= ADI_BRH_flash_0x00140000
SUBDIR+= GEMINI_dram_0x01600000
SUBDIR+= IQ80310_flash_0x00080000
SUBDIR+= IQ80321_flash_0xf0080000
@@ -12,9 +13,6 @@ SUBDIR+= SMDK2410_flash_0x00000000
SUBDIR+= SMDK2800_flash_0x00000000
SUBDIR+= SMDK2800_flash_0x00100000
SUBDIR+= TS7200_flash_0x60660000
-.else
-# Big endian platforms
-SUBDIR= ADI_BRH_flash_0x00140000
.endif
.include <bsd.subdir.mk>
diff --git a/sys/arch/hpcarm/include/Makefile b/sys/arch/hpcarm/include/Makefile
index 0eeb59d796a..6c1a3a569c7 100644
--- a/sys/arch/hpcarm/include/Makefile
+++ b/sys/arch/hpcarm/include/Makefile
@@ -1,23 +1,6 @@
-# $NetBSD: Makefile,v 1.28 2013/01/11 14:09:55 matt Exp $
+# $NetBSD: Makefile,v 1.29 2013/05/02 03:56:41 matt Exp $
-INCSDIR= /usr/include/hpcarm
+INCSDIR= /usr/include/hpcarm
+INCS=
-INCS= ansi.h apmvar.h aout_machdep.h asm.h \
- bswap.h \
- cdefs.h cpu.h \
- disklabel.h \
- elf_machdep.h endian.h endian_machdep.h \
- float.h frame.h \
- ieee.h ieeefp.h \
- int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
- intr.h \
- limits.h lock.h \
- math.h mcontext.h mutex.h \
- param.h pcb.h pmap.h pmc.h proc.h profile.h ptrace.h \
- reg.h rwlock.h \
- setjmp.h signal.h sysarch.h \
- trap.h types.h \
- vmparam.h \
- wchar_limits.h
-
-.include <bsd.kinc.mk>
+.include "../../arm/include/Makefile.common"
diff --git a/sys/arch/iyonix/include/Makefile b/sys/arch/iyonix/include/Makefile
index 84fc0454bcd..08c695ddbb2 100644
--- a/sys/arch/iyonix/include/Makefile
+++ b/sys/arch/iyonix/include/Makefile
@@ -1,25 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2013/01/11 14:09:56 matt Exp $
+# $NetBSD: Makefile,v 1.9 2013/05/02 03:56:41 matt Exp $
-INCSDIR= /usr/include/iyonix
+INCSDIR= /usr/include/iyonix
+INCS=
-INCS= ansi.h aout_machdep.h asm.h \
- bswap.h \
- cdefs.h cpu.h \
- disklabel.h \
- elf_machdep.h endian.h endian_machdep.h \
- float.h frame.h \
- ieee.h ieeefp.h \
- int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
- intr.h \
- limits.h lock.h \
- math.h mcontext.h mutex.h \
- param.h pcb.h pmap.h pmc.h proc.h profile.h ptrace.h \
- reg.h rwlock.h \
- setjmp.h signal.h sysarch.h \
- trap.h types.h \
- vmparam.h \
- wchar_limits.h
-
-INCS+= joystick.h
-
-.include <bsd.kinc.mk>
+.include "../../arm/include/Makefile.common"
diff --git a/sys/arch/netwinder/include/Makefile b/sys/arch/netwinder/include/Makefile
index b73c5583b49..777f500eb39 100644
--- a/sys/arch/netwinder/include/Makefile
+++ b/sys/arch/netwinder/include/Makefile
@@ -1,25 +1,6 @@
-# $NetBSD: Makefile,v 1.24 2013/01/11 14:09:56 matt Exp $
+# $NetBSD: Makefile,v 1.25 2013/05/02 03:56:41 matt Exp $
-INCSDIR= /usr/include/netwinder
+INCSDIR= /usr/include/netwinder
+INCS=
-INCS= ansi.h aout_machdep.h asm.h \
- bswap.h \
- cdefs.h cpu.h \
- disklabel.h \
- elf_machdep.h endian.h endian_machdep.h \
- float.h frame.h \
- ieee.h ieeefp.h \
- int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
- intr.h \
- limits.h lock.h \
- math.h mcontext.h mutex.h \
- param.h pcb.h pmap.h pmc.h proc.h profile.h ptrace.h \
- reg.h rwlock.h \
- setjmp.h signal.h sysarch.h \
- trap.h types.h \
- vmparam.h \
- wchar_limits.h
-
-INCS+= joystick.h
-
-.include <bsd.kinc.mk>
+.include "../../arm/include/Makefile.common"
diff --git a/sys/arch/shark/include/Makefile b/sys/arch/shark/include/Makefile
index 85740c4f6de..c6313d4390c 100644
--- a/sys/arch/shark/include/Makefile
+++ b/sys/arch/shark/include/Makefile
@@ -1,25 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2013/01/11 14:09:56 matt Exp $
+# $NetBSD: Makefile,v 1.14 2013/05/02 03:56:41 matt Exp $
-INCSDIR= /usr/include/shark
+INCSDIR= /usr/include/shark
+INCS= devmap.h
-INCS= ansi.h aout_machdep.h asm.h \
- bswap.h \
- cdefs.h cpu.h \
- disklabel.h \
- elf_machdep.h endian.h endian_machdep.h \
- float.h frame.h \
- ieee.h ieeefp.h \
- int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
- intr.h \
- limits.h lock.h \
- math.h mcontext.h mutex.h \
- param.h pcb.h pmap.h pmc.h proc.h profile.h ptrace.h \
- reg.h rwlock.h \
- setjmp.h signal.h sysarch.h \
- trap.h types.h \
- vmparam.h \
- wchar_limits.h
-
-INCS+= devmap.h joystick.h
-
-.include <bsd.kinc.mk>
+.include "../../arm/include/Makefile.common"
diff --git a/sys/arch/zaurus/include/Makefile b/sys/arch/zaurus/include/Makefile
index d162d9cbe1a..2b0e0b19f74 100644
--- a/sys/arch/zaurus/include/Makefile
+++ b/sys/arch/zaurus/include/Makefile
@@ -1,23 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2013/01/11 14:09:56 matt Exp $
+# $NetBSD: Makefile,v 1.9 2013/05/02 03:56:41 matt Exp $
-INCSDIR= /usr/include/zaurus
+INCSDIR= /usr/include/zaurus
+INCS=
-INCS= ansi.h aout_machdep.h apmvar.h asm.h \
- bswap.h \
- cdefs.h cpu.h \
- disklabel.h \
- elf_machdep.h endian.h endian_machdep.h \
- float.h frame.h \
- ieee.h ieeefp.h \
- int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h \
- intr.h \
- limits.h lock.h \
- math.h mcontext.h mutex.h \
- param.h pcb.h pmap.h pmc.h proc.h profile.h ptrace.h \
- reg.h rwlock.h \
- setjmp.h signal.h sysarch.h \
- trap.h types.h \
- vmparam.h \
- wchar_limits.h
-
-.include <bsd.kinc.mk>
+.include "../../arm/include/Makefile.common"
diff --git a/sys/arch/zaurus/stand/zboot/Makefile b/sys/arch/zaurus/stand/zboot/Makefile
index e8fb83e72de..7904501328a 100644
--- a/sys/arch/zaurus/stand/zboot/Makefile
+++ b/sys/arch/zaurus/stand/zboot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/05/01 22:16:16 matt Exp $
+# $NetBSD: Makefile,v 1.10 2013/05/02 03:56:42 matt Exp $
PROG= zboot
@@ -55,7 +55,7 @@ ${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN} ${VERSIONFILE}
${_MKTARGET_LINK}
${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \
${VERSIONFILE} ${MACHINE} ${NEWVERSWHAT}
- ${CC} -c vers.c
+ ${CC} ${CFLAGS} ${CPPFLAGS} -c vers.c
${LD} ${LDFLAGS} -o ${PROG} ${OBJS} vers.o ${LIBSA} ${LIBZ} ${LIBKERN}
.include <bsd.klinks.mk>
diff --git a/sys/lib/libkern/arch/arm/Makefile.inc b/sys/lib/libkern/arch/arm/Makefile.inc
index d49c92e9258..d802868661a 100644
--- a/sys/lib/libkern/arch/arm/Makefile.inc
+++ b/sys/lib/libkern/arch/arm/Makefile.inc
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.15 2013/02/06 07:18:15 matt Exp $
+# $NetBSD: Makefile.inc,v 1.16 2013/05/02 03:56:42 matt Exp $
SRCS+= byte_swap_2.S byte_swap_4.S
SRCS+= ffs.S
SRCS+= divsi3.S udivsi3.S divide.S clzsi2.S modsi3.S umodsi3.S
SRCS+= memcmp.S memcpy.S memset.S memmove.S strcmp.S strncmp.S
-.if ${MACHINE_ARCH:Mearm*} != ""
+.if !empty(MACHINE_ARCH:Mearm*)
SRCS+= __aeabi_ldivmod.S __aeabi_uldivmod.S __aeabi_lcmp.c __aeabi_ulcmp.c
.endif
diff --git a/usr.sbin/apm/Makefile b/usr.sbin/apm/Makefile
index c2eb4df8d35..d877997571d 100644
--- a/usr.sbin/apm/Makefile
+++ b/usr.sbin/apm/Makefile
@@ -1,14 +1,13 @@
-# $NetBSD: Makefile,v 1.17 2009/12/13 05:01:33 nakayama Exp $
+# $NetBSD: Makefile,v 1.18 2013/05/02 03:56:42 matt Exp $
.include <bsd.own.mk>
.if (${MACHINE_ARCH} == "i386" || \
- ${MACHINE} == "hpcarm" || \
+ ${MACHINE_CPU} == "arm" || \
${MACHINE} == "hpcmips" || \
${MACHINE} == "hpcsh" || \
${MACHINE} == "macppc" || \
- ${MACHINE} == "sparc" || \
- ${MACHINE} == "zaurus")
+ ${MACHINE} == "sparc")
PROG= apm
SRCS= apm.c apmsubr.c
.PATH: ${NETBSDSRCDIR}/usr.sbin/apmd
diff --git a/usr.sbin/apmd/Makefile b/usr.sbin/apmd/Makefile
index fe467da3198..e477d7db6ff 100644
--- a/usr.sbin/apmd/Makefile
+++ b/usr.sbin/apmd/Makefile
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.15 2009/12/13 05:01:33 nakayama Exp $
+# $NetBSD: Makefile,v 1.16 2013/05/02 03:56:42 matt Exp $
+
+.include <bsd.own.mk>
.if (${MACHINE_ARCH} == "i386" || \
+ ${MACHINE_CPU} == "arm" || \
${MACHINE} == "hpcmips" || \
${MACHINE} == "hpcsh" || \
${MACHINE} == "macppc" || \
- ${MACHINE} == "sparc" || \
- ${MACHINE} == "zaurus")
+ ${MACHINE} == "sparc")
PROG= apmd
SRCS= apmd.c apmsubr.c
.endif
diff --git a/usr.sbin/eeprom/Makefile b/usr.sbin/eeprom/Makefile
index fa3c5cdaa31..75ee9bb53da 100644
--- a/usr.sbin/eeprom/Makefile
+++ b/usr.sbin/eeprom/Makefile
@@ -1,10 +1,12 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $NetBSD: Makefile,v 1.18 2013/03/15 20:22:44 nakayama Exp $
+# $NetBSD: Makefile,v 1.19 2013/05/02 03:56:42 matt Exp $
+
+.include <bsd.own.mk>
.if ${MACHINE} == "sun3" || ${MACHINE} == "sun3x" \
|| ${MACHINE} == "sparc" || ${MACHINE} == "sparc64" \
|| ${MACHINE} == "macppc" || ${MACHINE} == "prep" \
- || ${MACHINE} == "shark"
+ || ${MACHINE_CPU} == "arm"
PROG= eeprom
SRCS= main.c
@@ -21,7 +23,7 @@ SRCS+= eehandlers.c
CPPFLAGS+= -DUSE_EEPROM
.endif
-.if ${MACHINE} == "macppc" || ${MACHINE} == "shark"
+.if ${MACHINE} == "macppc" || ${MACHINE_CPU} == "arm"
SRCS+= ofhandlers.c
CPPFLAGS+= -DUSE_OPENFIRM
.endif
diff --git a/usr.sbin/ofctl/Makefile b/usr.sbin/ofctl/Makefile
index 12808718003..47470c55cd0 100644
--- a/usr.sbin/ofctl/Makefile
+++ b/usr.sbin/ofctl/Makefile
@@ -1,10 +1,12 @@
# from: @(#)Makefile 5.8 (Berkeley) 7/28/90
-# $NetBSD: Makefile,v 1.7 2010/06/20 21:30:26 matt Exp $
+# $NetBSD: Makefile,v 1.8 2013/05/02 03:56:42 matt Exp $
+
+.include <bsd.own.mk>
.if ${MACHINE} == "sparc64" \
|| ${MACHINE} == "macppc" \
|| ${MACHINE} == "ofppc" \
- || ${MACHINE} == "shark" \
+ || ${MACHINE_CPU} == "arm" \
|| ${MACHINE} == "sparc"
PROG= ofctl
diff --git a/usr.sbin/tpctl/Makefile b/usr.sbin/tpctl/Makefile
index 3f924f6196c..c44a4704786 100644
--- a/usr.sbin/tpctl/Makefile
+++ b/usr.sbin/tpctl/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/07/29 14:37:25 nonaka Exp $
+# $NetBSD: Makefile,v 1.5 2013/05/02 03:56:42 matt Exp $
-.if ${MACHINE} == "hpcarm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh" \
- || ${MACHINE} == "zaurus"
+.include <bsd.own.mk>
+
+.if ${MACHINE_CPU} == "arm" || ${MACHINE} == "hpcmips" || ${MACHINE} == "hpcsh"
PROG= tpctl
SRCS= main.c fb.c tp.c data.c
.endif