From 554f0ec899ef8f69b3701dc9e42b4c0d0a0ad5bd Mon Sep 17 00:00:00 2001 From: deraadt Date: Sat, 30 Jan 2021 21:06:45 +0000 Subject: [PATCH] satisfy -fno-common --- sys/arch/sparc64/stand/ofwboot/boot.c | 4 ++-- sys/arch/sparc64/stand/ofwboot/net.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/arch/sparc64/stand/ofwboot/boot.c b/sys/arch/sparc64/stand/ofwboot/boot.c index 316f8c09c4b..2ecdd064807 100644 --- a/sys/arch/sparc64/stand/ofwboot/boot.c +++ b/sys/arch/sparc64/stand/ofwboot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.35 2020/05/26 16:34:41 deraadt Exp $ */ +/* $OpenBSD: boot.c,v 1.36 2021/01/30 21:06:45 deraadt Exp $ */ /* $NetBSD: boot.c,v 1.3 2001/05/31 08:55:19 mrg Exp $ */ /* * Copyright (c) 1997, 1999 Eduardo E. Horvath. All rights reserved. @@ -90,7 +90,7 @@ char *kernels[] = { }; char bootdev[128]; -char bootfile[128]; +extern char bootfile[128]; int boothowto; int debug; diff --git a/sys/arch/sparc64/stand/ofwboot/net.c b/sys/arch/sparc64/stand/ofwboot/net.c index e416190349a..6e686128f44 100644 --- a/sys/arch/sparc64/stand/ofwboot/net.c +++ b/sys/arch/sparc64/stand/ofwboot/net.c @@ -1,4 +1,4 @@ -/* $OpenBSD: net.c,v 1.7 2018/12/31 11:44:57 claudio Exp $ */ +/* $OpenBSD: net.c,v 1.8 2021/01/30 21:06:45 deraadt Exp $ */ /* $NetBSD: net.c,v 1.1 2000/08/20 14:58:38 mrg Exp $ */ /* @@ -70,7 +70,7 @@ int net_mountroot_bootparams(void); int net_mountroot_bootp(void); int net_mountroot(void); -char rootpath[FNAME_SIZE]; +extern char rootpath[FNAME_SIZE]; static int netdev_sock = -1; static int open_count; -- 2.20.1