armish handled some early-gen arm machines, which required tons of

workarounds.  Some of them will soon stand in the way of armv7.
Off to the attic you go.

7 files changed, 14 insertions, 14 deletions

diff --git a/sys/dev/microcode/atmel/Makefile b/sys/dev/microcode/atmel/Makefile
index 05753f83a3f..3288d05ee55 100644
--- a/sys/dev/microcode/atmel/Makefile
+++ b/sys/dev/microcode/atmel/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.21 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.22 2016/08/10 14:27:17 deraadt Exp $
 
 NOPROG=
 NOMAN=
@@ -7,7 +7,7 @@ CC=${HOSTCC}
 # USB capable systems only
 .if (${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \
+    ${MACHINE} == "armv7" || \
     ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
     ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
     ${MACHINE} == "octeon" || ${MACHINE} == "sgi" || \
diff --git a/sys/dev/microcode/kue/Makefile b/sys/dev/microcode/kue/Makefile
index 4ccd4826651..f4525e26531 100644
--- a/sys/dev/microcode/kue/Makefile
+++ b/sys/dev/microcode/kue/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.15 2016/08/10 14:27:17 deraadt Exp $
 
 NOPROG=
 NOMAN=
@@ -7,7 +7,7 @@ CC=${HOSTCC}
 # USB capable systems only
 .if (${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \
+    ${MACHINE} == "armv7" || \
     ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
     ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
     ${MACHINE} == "octeon" || ${MACHINE} == "sgi" || \
diff --git a/sys/dev/microcode/ral/Makefile b/sys/dev/microcode/ral/Makefile
index 5fc6df631b2..3276fce6d8b 100644
--- a/sys/dev/microcode/ral/Makefile
+++ b/sys/dev/microcode/ral/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.11 2016/08/10 14:27:17 deraadt Exp $
 
 NOPROG=
 NOMAN=
@@ -6,7 +6,7 @@ CC=${HOSTCC}
 
 # PCI capable systems only
 .if (${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-     ${MACHINE} == "armish" || ${MACHINE} == "hppa" || \
+     ${MACHINE} == "hppa" || \
      ${MACHINE} == "i386" || \
      ${MACHINE} == "loongson" || ${MACHINE} == "octeon" || \
      ${MACHINE_ARCH} == "powerpc" || \
diff --git a/sys/dev/microcode/rum/Makefile b/sys/dev/microcode/rum/Makefile
index 00f044292c0..994274d4e27 100644
--- a/sys/dev/microcode/rum/Makefile
+++ b/sys/dev/microcode/rum/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.14 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.15 2016/08/10 14:27:17 deraadt Exp $
 
 NOPROG=
 NOMAN=
@@ -7,7 +7,7 @@ CC=${HOSTCC}
 # USB capable systems only
 .if (${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \
+    ${MACHINE} == "armv7" || \
     ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
     ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
     ${MACHINE} == "octeon" || ${MACHINE} == "sgi" || \
diff --git a/sys/dev/microcode/tusb3410/Makefile b/sys/dev/microcode/tusb3410/Makefile
index 0f4cd95d6a1..9909aa2cd89 100644
--- a/sys/dev/microcode/tusb3410/Makefile
+++ b/sys/dev/microcode/tusb3410/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.8 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.9 2016/08/10 14:27:17 deraadt Exp $
 
 NOPROG=
 NOMAN=
@@ -7,7 +7,7 @@ CC=${HOSTCC}
 # USB capable systems only
 .if (${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \
+    ${MACHINE} == "armv7" || \
     ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
     ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
     ${MACHINE} == "octeon" || ${MACHINE} == "sgi" || \
diff --git a/sys/dev/microcode/udl/Makefile b/sys/dev/microcode/udl/Makefile
index d2f24219590..67939419450 100644
--- a/sys/dev/microcode/udl/Makefile
+++ b/sys/dev/microcode/udl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.7 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.8 2016/08/10 14:27:17 deraadt Exp $
 
 NOPROG=
 NOMAN=
@@ -7,7 +7,7 @@ CC=${HOSTCC}
 # USB capable systems only
 .if (${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \
+    ${MACHINE} == "armv7" || \
     ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
     ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
     ${MACHINE} == "octeon" || ${MACHINE} == "sgi" || \
diff --git a/sys/dev/microcode/zydas/Makefile b/sys/dev/microcode/zydas/Makefile
index 42b877bd381..7da7e298363 100644
--- a/sys/dev/microcode/zydas/Makefile
+++ b/sys/dev/microcode/zydas/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.13 2016/07/10 15:16:15 visa Exp $
+# $OpenBSD: Makefile,v 1.14 2016/08/10 14:27:17 deraadt Exp $
 
 NOPROG=
 NOMAN=
@@ -7,7 +7,7 @@ CC=${HOSTCC}
 # USB capable systems only
 .if (${MACHINE_ARCH} == "powerpc" || \
     ${MACHINE} == "alpha" || ${MACHINE} == "amd64" || \
-    ${MACHINE} == "armish" || ${MACHINE} == "armv7" || \
+    ${MACHINE} == "armv7" || \
     ${MACHINE} == "hppa" || ${MACHINE} == "i386" || \
     ${MACHINE} == "landisk" || ${MACHINE} == "loongson" || \
     ${MACHINE} == "octeon" || ${MACHINE} == "sgi" || \