Drop useless architecture table. Validating architecture names

is a job for makewhatis(8)/mandoc.db(5), not for the parser.
Removes 150 lines from source files and 4k (1%) from the binary.
Bloat found by deraadt@.

10 files changed, 17 insertions, 182 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Dt/Makefile b/regress/usr.bin/mandoc/mdoc/Dt/Makefile
index 5c0cc0bb613..be4b586ff7e 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/Makefile
+++ b/regress/usr.bin/mandoc/mdoc/Dt/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.4 2014/08/14 02:00:53 schwarze Exp $
+# $OpenBSD: Makefile,v 1.5 2014/11/28 18:07:38 schwarze Exp $
 
-REGRESS_TARGETS	 = badarch badsec case dupe late
+REGRESS_TARGETS	 = badsec case dupe late
 REGRESS_TARGETS	+= missing noarg nobody nosec order
-LINT_TARGETS	 = badarch badsec case dupe late
+LINT_TARGETS	 = badsec case dupe late
 LINT_TARGETS	+= missing noarg nobody nosec order
 
-SKIP_GROFF	 = badarch badsec nobody
-SKIP_ASCII	 = badarch badsec
+SKIP_GROFF	 = badsec nobody
+SKIP_ASCII	 = badsec
 
 # When the section is missing from the man(7) .TH title line,
 # empty parentheses are shown in the page header.
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/badarch.in b/regress/usr.bin/mandoc/mdoc/Dt/badarch.in
deleted file mode 100644
index 9259a9de4a1..00000000000
--- a/regress/usr.bin/mandoc/mdoc/Dt/badarch.in
+++ /dev/null
@@ -1,8 +0,0 @@
-.Dd June 13, 2014
-.Dt DT-BADARCH 1 Cray
-.Os OpenBSD
-.Sh NAME
-.Nm Dt-badarch
-.Nd unknown manual volume or arch
-.Sh DESCRIPTION
-some text
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/badarch.out_lint b/regress/usr.bin/mandoc/mdoc/Dt/badarch.out_lint
deleted file mode 100644
index e78bef1bee8..00000000000
--- a/regress/usr.bin/mandoc/mdoc/Dt/badarch.out_lint
+++ /dev/null
@@ -1 +0,0 @@
-mandoc: badarch.in:2:18: WARNING: unknown manual volume or arch: Dt ... Cray
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint b/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint
index cdbb93be873..7248651c360 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint
@@ -1,3 +1,2 @@
-mandoc: dupe.in:2:16: WARNING: unknown manual volume or arch: Dt ... first_arch
 mandoc: dupe.in:4:2: WARNING: duplicate prologue macro: Dt
 mandoc: dupe.in:10:2: WARNING: skipping late title macro: Dt DT-LAST 3 last_arch
diff --git a/usr.bin/mandoc/Makefile b/usr.bin/mandoc/Makefile
index 40f441676a1..2df9aa861aa 100644
--- a/usr.bin/mandoc/Makefile
+++ b/usr.bin/mandoc/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.85 2014/11/28 17:23:34 schwarze Exp $
+#	$OpenBSD: Makefile,v 1.86 2014/11/28 18:07:38 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -10,8 +10,7 @@ LDADD	+= -lsqlite3 -lutil
 SRCS=	mandoc.c mandoc_aux.c preconv.c read.c \
 	roff.c tbl.c tbl_opts.c tbl_layout.c tbl_data.c eqn.c
 SRCS+=	mdoc_macro.c mdoc.c mdoc_hash.c \
-	mdoc_argv.c mdoc_validate.c att.c \
-	arch.c vol.c msec.c st.c
+	mdoc_argv.c mdoc_validate.c att.c vol.c msec.c st.c
 SRCS+=	man_macro.c man.c man_hash.c man_validate.c
 SRCS+=	main.c mdoc_term.c chars.c term.c tree.c man_term.c eqn_term.c
 SRCS+=	mdoc_man.c
@@ -41,7 +40,7 @@ CLEANFILES += man.cgi cgi.o man.cgi.8.manlint
 # After that, read:	man man.cgi.8
 
 LIBMDOC_OBJS =	mdoc_argv.o mdoc_hash.o mdoc_macro.o mdoc_validate.o \
-		mdoc.o arch.o att.o st.o vol.o
+		mdoc.o att.o st.o vol.o
 LIBMAN_OBJS =	man.o man_hash.o man_macro.o man_validate.o
 LIBROFF_OBJS =	roff.o eqn.o tbl.o tbl_data.o tbl_layout.o tbl_opts.o
 LIBMANDOC_OBJS = ${LIBMDOC_OBJS} ${LIBMAN_OBJS} ${LIBROFF_OBJS} \
diff --git a/usr.bin/mandoc/arch.c b/usr.bin/mandoc/arch.c
deleted file mode 100644
index 95ef001ce00..00000000000
--- a/usr.bin/mandoc/arch.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*	$Id: arch.c,v 1.8 2014/04/20 16:44:44 schwarze Exp $ */
-/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-#include <string.h>
-
-#include "mdoc.h"
-#include "libmdoc.h"
-
-#define LINE(x, y) \
-	if (0 == strcmp(p, x)) return(y);
-
-
-const char *
-mdoc_a2arch(const char *p)
-{
-
-#include "arch.in"
-
-	return(NULL);
-}
diff --git a/usr.bin/mandoc/arch.in b/usr.bin/mandoc/arch.in
deleted file mode 100644
index e6bb4a5693b..00000000000
--- a/usr.bin/mandoc/arch.in
+++ /dev/null
@@ -1,112 +0,0 @@
-/*	$Id: arch.in,v 1.11 2014/04/27 22:41:39 schwarze Exp $ */
-/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This file defines the architecture token of the .Dt prologue macro.
- * All architectures that your system supports (or the manuals of your
- * system) should be included here.  The right-hand-side is the
- * formatted output.
- *
- * Be sure to escape strings.
- *
- * REMEMBER TO ADD NEW ARCHITECTURES TO MDOC.7!
- */
-
-LINE("acorn26",		"Acorn26")
-LINE("acorn32",		"Acorn32")
-LINE("algor",		"Algor")
-LINE("alpha",		"Alpha")
-LINE("amd64",		"AMD64")
-LINE("amiga",		"Amiga")
-LINE("amigappc",	"AmigaPPC")
-LINE("arc",		"ARC")
-LINE("arm",		"ARM")
-LINE("arm26",		"ARM26")
-LINE("arm32",		"ARM32")
-LINE("armish",		"ARMISH")
-LINE("armv7",		"ARMv7")
-LINE("aviion",		"AViiON")
-LINE("atari",		"ATARI")
-LINE("bebox",		"BeBox")
-LINE("cats",		"cats")
-LINE("cesfic",		"CESFIC")
-LINE("cobalt",		"Cobalt")
-LINE("dreamcast",	"Dreamcast")
-LINE("emips",		"EMIPS")
-LINE("evbarm",		"evbARM")
-LINE("evbmips",		"evbMIPS")
-LINE("evbppc",		"evbPPC")
-LINE("evbsh3",		"evbSH3")
-LINE("ews4800mips",	"EWS4800MIPS")
-LINE("hp300",		"HP300")
-LINE("hp700",		"HP700")
-LINE("hpcarm",		"HPCARM")
-LINE("hpcmips",		"HPCMIPS")
-LINE("hpcsh",		"HPCSH")
-LINE("hppa",		"HPPA")
-LINE("hppa64",		"HPPA64")
-LINE("ia64",		"ia64")
-LINE("i386",		"i386")
-LINE("ibmnws",		"IBMNWS")
-LINE("iyonix",		"Iyonix")
-LINE("landisk",		"LANDISK")
-LINE("loongson",	"Loongson")
-LINE("luna68k",		"LUNA68K")
-LINE("luna88k",		"LUNA88K")
-LINE("m68k",		"m68k")
-LINE("mac68k",		"Mac68k")
-LINE("macppc",		"MacPPC")
-LINE("mips",		"MIPS")
-LINE("mips64",		"MIPS64")
-LINE("mipsco",		"MIPSCo")
-LINE("mmeye",		"mmEye")
-LINE("mvme68k",		"MVME68k")
-LINE("mvme88k",		"MVME88k")
-LINE("mvmeppc",		"MVMEPPC")
-LINE("netwinder",	"NetWinder")
-LINE("news68k",		"NeWS68k")
-LINE("newsmips",	"NeWSMIPS")
-LINE("next68k",		"NeXT68k")
-LINE("octeon",		"OCTEON")
-LINE("ofppc",		"OFPPC")
-LINE("palm",		"Palm")
-LINE("pc532",		"PC532")
-LINE("playstation2",	"PlayStation2")
-LINE("pmax",		"PMAX")
-LINE("pmppc",		"pmPPC")
-LINE("powerpc",		"PowerPC")
-LINE("prep",		"PReP")
-LINE("rs6000",		"RS6000")
-LINE("sandpoint",	"Sandpoint")
-LINE("sbmips",		"SBMIPS")
-LINE("sgi",		"SGI")
-LINE("sgimips",		"SGIMIPS")
-LINE("sh3",		"SH3")
-LINE("shark",		"Shark")
-LINE("socppc",		"SOCPPC")
-LINE("solbourne",	"Solbourne")
-LINE("sparc",		"SPARC")
-LINE("sparc64",		"SPARC64")
-LINE("sun2",		"Sun2")
-LINE("sun3",		"Sun3")
-LINE("tahoe",		"Tahoe")
-LINE("vax",		"VAX")
-LINE("x68k",		"X68k")
-LINE("x86",		"x86")
-LINE("x86_64",		"x86_64")
-LINE("xen",		"Xen")
-LINE("zaurus",		"Zaurus")
diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h
index 4c6a604cd3a..81e1b27bd97 100644
--- a/usr.bin/mandoc/mandoc.h
+++ b/usr.bin/mandoc/mandoc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mandoc.h,v 1.114 2014/11/27 23:35:03 schwarze Exp $ */
+/*	$OpenBSD: mandoc.h,v 1.115 2014/11/28 18:07:38 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -52,7 +52,6 @@ enum	mandocerr {
 	MANDOCERR_TITLE_CASE, /* lower case character in document title */
 	MANDOCERR_MSEC_MISSING, /* missing manual section, using "": macro */
 	MANDOCERR_MSEC_BAD, /* unknown manual section: Dt ... section */
-	MANDOCERR_ARCH_BAD, /* unknown manual volume or arch: Dt ... volume */
 	MANDOCERR_DATE_MISSING, /* missing date, using today's date */
 	MANDOCERR_DATE_BAD, /* cannot parse date, using it verbatim: date */
 	MANDOCERR_OS_MISSING, /* missing Os macro, using "" */
diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c
index 0e628445a89..325214e3c91 100644
--- a/usr.bin/mandoc/mdoc_validate.c
+++ b/usr.bin/mandoc/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mdoc_validate.c,v 1.176 2014/11/28 17:23:34 schwarze Exp $ */
+/*	$OpenBSD: mdoc_validate.c,v 1.177 2014/11/28 18:07:38 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -2274,11 +2274,9 @@ post_dt(POST_ARGS)
 	if (NULL == (nn = nn->next))
 		goto out;
 
-	/* Handles: `.Dt TITLE SEC VOL'
-	 * title = TITLE,
-	 * volume = VOL is vol ? format(VOL) :
-	 *	    VOL is arch ? format(arch) :
-	 *	    VOL
+	/*
+	 * If the third argument is a volume name, format is,
+	 * otherwise assume it's an architecture.
 	 */
 
 	cp = mdoc_a2vol(nn->string);
@@ -2286,14 +2284,9 @@ post_dt(POST_ARGS)
 		free(mdoc->meta.vol);
 		mdoc->meta.vol = mandoc_strdup(cp);
 	} else {
-		cp = mdoc_a2arch(nn->string);
-		if (NULL == cp) {
-			mandoc_vmsg(MANDOCERR_ARCH_BAD, mdoc->parse,
-			    nn->line, nn->pos, "Dt ... %s", nn->string);
-			free(mdoc->meta.vol);
-			mdoc->meta.vol = mandoc_strdup(nn->string);
-		} else
-			mdoc->meta.arch = mandoc_strdup(cp);
+		for (p = nn->string; *p; p++)
+			*p = tolower((unsigned char)*p);
+		mdoc->meta.arch = mandoc_strdup(nn->string);
 	}
 
 	/* Ignore any subsequent parameters... */
diff --git a/usr.bin/mandoc/read.c b/usr.bin/mandoc/read.c
index bea59eff2d4..e3c62d8a57c 100644
--- a/usr.bin/mandoc/read.c
+++ b/usr.bin/mandoc/read.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: read.c,v 1.76 2014/11/28 06:26:46 schwarze Exp $ */
+/*	$OpenBSD: read.c,v 1.77 2014/11/28 18:07:38 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -91,7 +91,6 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = {
 	"lower case character in document title",
 	"missing manual section, using \"\"",
 	"unknown manual section",
-	"unknown manual volume or arch",
 	"missing date, using today's date",
 	"cannot parse date, using it verbatim",
 	"missing Os macro, using \"\"",