sync

25 files changed, 56 insertions, 12 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index e130ad1643c..3270e31e135 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -921,6 +921,8 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 044e13c8032..2a7088abf7f 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -948,6 +948,8 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 9d955aa1dba..387e758f8b6 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -934,6 +934,8 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index 06d032bfbf9..36b5286fe15 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -862,6 +862,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index e82a8352973..3f1431f9e80 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -806,6 +806,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index bd9d4a9e7f3..de8be216f3f 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -868,6 +868,8 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 4cc4fb6d4d3..3b901f6e822 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -870,6 +870,8 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 0e73b953814..dafada09d4f 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -875,6 +875,8 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index c84db94aaa5..04b9e20793e 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -829,6 +829,8 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index c7176d88672..a0e5622b86d 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -836,6 +836,8 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 8cd5a1b128a..1a0d1ebda68 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -668,6 +668,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 8c141121626..5087f51161a 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -871,6 +871,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index bc0f5359388..f85b464b33d 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -804,6 +804,8 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 3a3239ce97b..9a876616b1e 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -807,6 +807,8 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.palm b/distrib/sets/lists/base/md.palm
index 85697826dc4..edbe5fbf99a 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -887,6 +887,8 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 4bc1eff240f..66f02c15dd0 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -866,6 +866,8 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 4aac834d98a..41b4f136d8d 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -863,6 +863,8 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 8e170437384..9d2634d4ebf 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -225,6 +225,8 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index bd04529d270..80cfa7ce42c 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -285,6 +285,8 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index e0ea4844f10..3d6b8f455c0 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -158,6 +158,8 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index e3b3a119664..b98a52c61a8 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -888,6 +888,8 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/advlib.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/adw.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/adwlib.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/ahcireg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/ahcivar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/aic6360reg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/aic6360var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/dev/ic/aic6915.ph
diff --git a/distrib/sets/lists/comp/md.aviion b/distrib/sets/lists/comp/md.aviion
index 46e10734f09..d76e80165e9 100644
--- a/distrib/sets/lists/comp/md.aviion
+++ b/distrib/sets/lists/comp/md.aviion
@@ -237,16 +237,16 @@
 ./usr/include/m88k/varargs.h
 ./usr/include/m88k/vmparam.h
 ./usr/include/unwind.h
+./usr/lib/crtbegin.o
+./usr/lib/crtbeginS.o
+./usr/lib/crtend.o
+./usr/lib/crtendS.o
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/SYSCALLS.c.X
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/cc1obj
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/cc1plus
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/include/unwind.h
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/libgcc.a
 ./usr/lib/libsupc++.a
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/libdata/ldscripts
 ./usr/libdata/ldscripts/elf32m88k_obsd.x
 ./usr/libdata/ldscripts/elf32m88k_obsd.xbn
diff --git a/distrib/sets/lists/comp/md.luna88k b/distrib/sets/lists/comp/md.luna88k
index 33579c09cf7..e649506229b 100644
--- a/distrib/sets/lists/comp/md.luna88k
+++ b/distrib/sets/lists/comp/md.luna88k
@@ -230,16 +230,16 @@
 ./usr/include/m88k/varargs.h
 ./usr/include/m88k/vmparam.h
 ./usr/include/unwind.h
+./usr/lib/crtbegin.o
+./usr/lib/crtbeginS.o
+./usr/lib/crtend.o
+./usr/lib/crtendS.o
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/SYSCALLS.c.X
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/cc1obj
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/cc1plus
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/include/unwind.h
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/libgcc.a
 ./usr/lib/libsupc++.a
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/libdata/ldscripts
 ./usr/libdata/ldscripts/elf32m88k_obsd.x
 ./usr/libdata/ldscripts/elf32m88k_obsd.xbn
diff --git a/distrib/sets/lists/comp/md.mvme88k b/distrib/sets/lists/comp/md.mvme88k
index 5f09dafb710..b671bacb1e8 100644
--- a/distrib/sets/lists/comp/md.mvme88k
+++ b/distrib/sets/lists/comp/md.mvme88k
@@ -241,16 +241,16 @@
 ./usr/include/mvme88k/varargs.h
 ./usr/include/mvme88k/vmparam.h
 ./usr/include/unwind.h
+./usr/lib/crtbegin.o
+./usr/lib/crtbeginS.o
+./usr/lib/crtend.o
+./usr/lib/crtendS.o
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/SYSCALLS.c.X
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/cc1obj
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/cc1plus
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/include/unwind.h
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.2/3.3.6/libgcc.a
 ./usr/lib/libsupc++.a
-./usr/lib/crtbegin.o
-./usr/lib/crtbeginS.o
-./usr/lib/crtend.o
-./usr/lib/crtendS.o
 ./usr/libdata/ldscripts
 ./usr/libdata/ldscripts/elf32m88k_obsd.x
 ./usr/libdata/ldscripts/elf32m88k_obsd.xbn
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index f6c40203419..c0e1c71be45 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -172,6 +172,8 @@
 ./usr/include/dev/ic/advlib.h
 ./usr/include/dev/ic/adw.h
 ./usr/include/dev/ic/adwlib.h
+./usr/include/dev/ic/ahcireg.h
+./usr/include/dev/ic/ahcivar.h
 ./usr/include/dev/ic/aic6360reg.h
 ./usr/include/dev/ic/aic6360var.h
 ./usr/include/dev/ic/aic6915.h