From ed648b3f3984ec27ae5411eee7fe29153e966a16 Mon Sep 17 00:00:00 2001
From: Kyle Evans <kevans@FreeBSD.org>
Date: Tue, 7 Apr 2020 12:57:50 +0000
Subject: [PATCH] stand: -fno-common fixes for !x86 loaders

- beriloader: archsw is declared extern and defined elsewhere
- ofwloader: ofw_elf{,64} are defined in elf_freebsd.c and
  ppc64_elf_freebsd.c respectively
- ubldr: syscall_ptr is defined in start.S for whichever ubldr platform is
  building

-fno-common will become the default in GCC10/LLVM11.

MFC after:	3 days
---
 stand/mips/beri/loader/main.c | 2 --
 stand/powerpc/ofw/conf.c      | 4 ++--
 stand/uboot/lib/glue.h        | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/stand/mips/beri/loader/main.c b/stand/mips/beri/loader/main.c
index 086b55011ae7..ad0feb413a40 100644
--- a/stand/mips/beri/loader/main.c
+++ b/stand/mips/beri/loader/main.c
@@ -59,8 +59,6 @@ struct devsw *devsw[] = {
 	NULL
 };
 
-struct arch_switch archsw;
-
 struct file_format *file_formats[] = {
 	&beri_elf,
 	NULL
diff --git a/stand/powerpc/ofw/conf.c b/stand/powerpc/ofw/conf.c
index ac815bf325cd..f26dd2c56c27 100644
--- a/stand/powerpc/ofw/conf.c
+++ b/stand/powerpc/ofw/conf.c
@@ -97,8 +97,8 @@ struct netif_driver *netif_drivers[] = {
  * rather than reading the file go first.
  */
 
-struct file_format ofw_elf;
-struct file_format ofw_elf64;
+extern struct file_format ofw_elf;
+extern struct file_format ofw_elf64;
 
 struct file_format *file_formats[] = {
     &ofw_elf,
diff --git a/stand/uboot/lib/glue.h b/stand/uboot/lib/glue.h
index cb012ed9d8e9..c9fe4021003f 100644
--- a/stand/uboot/lib/glue.h
+++ b/stand/uboot/lib/glue.h
@@ -56,7 +56,7 @@
 #endif
 
 int syscall(int, int *, ...);
-void *syscall_ptr;
+extern void *syscall_ptr;
 
 int api_parse_cmdline_sig(int argc, char **argv, struct api_signature **sig);
 int api_search_sig(struct api_signature **sig);