From 10b2813d1a347b516d6941fbf0457755432fc2b0 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Fri, 29 Jan 2021 16:22:34 +0000
Subject: [PATCH] repair declerations to satisfy -fno-common ok kettenis

---
 sys/arch/alpha/stand/boot/boot.c       |  4 ++--
 sys/arch/alpha/stand/boot/conf.c       |  4 +---
 sys/arch/alpha/stand/netboot/dev_net.c | 15 +--------------
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/sys/arch/alpha/stand/boot/boot.c b/sys/arch/alpha/stand/boot/boot.c
index 228b130787b..6aae43d7b84 100644
--- a/sys/arch/alpha/stand/boot/boot.c
+++ b/sys/arch/alpha/stand/boot/boot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: boot.c,v 1.28 2020/05/26 13:47:27 deraadt Exp $	*/
+/*	$OpenBSD: boot.c,v 1.29 2021/01/29 16:22:34 deraadt Exp $	*/
 /*	$NetBSD: boot.c,v 1.10 1997/01/18 01:58:33 cgd Exp $	*/
 
 /*
@@ -59,7 +59,7 @@ extern char bootprog_name[];
 
 struct bootinfo_v1 bootinfo_v1;
 
-paddr_t ptbr_save;
+extern paddr_t ptbr_save;
 
 int debug;
 
diff --git a/sys/arch/alpha/stand/boot/conf.c b/sys/arch/alpha/stand/boot/conf.c
index 608a4b61c8f..5f90decb968 100644
--- a/sys/arch/alpha/stand/boot/conf.c
+++ b/sys/arch/alpha/stand/boot/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.6 2003/06/02 23:27:44 millert Exp $	*/
+/*	$OpenBSD: conf.c,v 1.7 2021/01/29 16:22:34 deraadt Exp $	*/
 /*	$NetBSD: conf.c,v 1.3 1995/11/23 02:39:31 cgd Exp $	*/
 
 /*
@@ -42,8 +42,6 @@
 
 int	diskopen(struct open_file *, ...);	/* XXX */
 
-int	errno;
-
 struct devsw devsw[] = {
 	{ "disk", diskstrategy,	diskopen, diskclose, diskioctl }, /*0*/
 };
diff --git a/sys/arch/alpha/stand/netboot/dev_net.c b/sys/arch/alpha/stand/netboot/dev_net.c
index 46e88fd3281..dce364ba506 100644
--- a/sys/arch/alpha/stand/netboot/dev_net.c
+++ b/sys/arch/alpha/stand/netboot/dev_net.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dev_net.c,v 1.4 2014/07/13 15:31:20 mpi Exp $	*/
+/*	$OpenBSD: dev_net.c,v 1.5 2021/01/29 16:22:36 deraadt Exp $	*/
 /*	$NetBSD: dev_net.c,v 1.4 1997/04/06 08:41:24 cgd Exp $	*/
 
 /*
@@ -74,19 +74,6 @@ extern int nfs_root_node[];	/* XXX - get from nfs_mount() */
 u_char bcea[6] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 #endif
 
-struct	in_addr myip;		/* my ip address */
-struct	in_addr rootip;		/* root ip address */
-struct	in_addr gateip;		/* swap ip address */
-u_int32_t	netmask;		/* subnet or net mask */
-
-char rootpath[FNAME_SIZE];
-
-int hostnamelen;
-char hostname[FNAME_SIZE];
-
-int domainnamelen;
-char domainname[FNAME_SIZE];
-
 /*
  * Local things...
  */
-- 
2.20.1