From 13218ded9aabcdef7a3be9043bddac7646bfd038 Mon Sep 17 00:00:00 2001 From: jsg Date: Wed, 28 Apr 2021 14:29:50 +0000 Subject: [PATCH] recognise riscv64 as a valid arch in mandoc ok jmc@ deraadt@ --- share/man/man7/mdoc.7 | 5 +++-- usr.bin/mandoc/arch.c | 4 ++-- usr.bin/mandoc/cgi.c | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/share/man/man7/mdoc.7 b/share/man/man7/mdoc.7 index 25cd5013efa..8e19506b295 100644 --- a/share/man/man7/mdoc.7 +++ b/share/man/man7/mdoc.7 @@ -1,4 +1,4 @@ -.\" $OpenBSD: mdoc.7,v 1.173 2020/08/27 09:29:16 fcambus Exp $ +.\" $OpenBSD: mdoc.7,v 1.174 2021/04/28 14:29:50 jsg Exp $ .\" .\" Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons .\" Copyright (c) 2010, 2011, 2013-2020 Ingo Schwarze @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: August 27 2020 $ +.Dd $Mdocdate: April 28 2021 $ .Dt MDOC 7 .Os .Sh NAME @@ -1353,6 +1353,7 @@ the following are valid architectures: .Cm mips64 , .Cm octeon , .Cm powerpc64 , +.Cm riscv64 , .Cm sgi , and .Cm sparc64 . diff --git a/usr.bin/mandoc/arch.c b/usr.bin/mandoc/arch.c index 782f2c74f01..b9d8343b69c 100644 --- a/usr.bin/mandoc/arch.c +++ b/usr.bin/mandoc/arch.c @@ -1,4 +1,4 @@ -/* $OpenBSD: arch.c,v 1.12 2020/06/29 19:16:59 schwarze Exp $ */ +/* $OpenBSD: arch.c,v 1.13 2021/04/28 14:29:50 jsg Exp $ */ /* * Copyright (c) 2017, 2019 Ingo Schwarze * @@ -24,7 +24,7 @@ arch_valid(const char *arch, enum mandoc_os os) const char *openbsd_arch[] = { "alpha", "amd64", "arm64", "armv7", "hppa", "i386", "landisk", "loongson", "luna88k", "macppc", "mips64", - "octeon", "powerpc64", "sgi", "sparc64", NULL + "octeon", "powerpc64", "riscv64", "sgi", "sparc64", NULL }; const char *netbsd_arch[] = { "acorn26", "acorn32", "algor", "alpha", "amiga", diff --git a/usr.bin/mandoc/cgi.c b/usr.bin/mandoc/cgi.c index c6db66fd82a..8beed268015 100644 --- a/usr.bin/mandoc/cgi.c +++ b/usr.bin/mandoc/cgi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: cgi.c,v 1.111 2020/06/29 19:16:59 schwarze Exp $ */ +/* $OpenBSD: cgi.c,v 1.112 2021/04/28 14:29:50 jsg Exp $ */ /* * Copyright (c) 2014-2019 Ingo Schwarze * Copyright (c) 2011, 2012 Kristaps Dzonsons @@ -121,7 +121,8 @@ static const char *const arch_names[] = { "amd64", "alpha", "armv7", "arm64", "hppa", "i386", "landisk", "loongson", "luna88k", "macppc", "mips64", "octeon", - "powerpc64", "sgi", "socppc", "sparc64", + "powerpc64", "riscv64", "sgi", "socppc", + "sparc64", "amiga", "arc", "armish", "arm32", "atari", "aviion", "beagle", "cats", -- 2.20.1