[src/trunk]: src/sys/arch/zaurus/stand remove shadowed (common) declarations ...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d3a3c73a6c45
branches:  trunk
changeset: 378386:d3a3c73a6c45
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Apr 12 03:55:40 2021 +0000

description:
remove shadowed (common) declarations of various libsa variables
from various boot programs.  for macppc and zaurus, avoid building
with -fcommon any more.

diffstat:

 sys/arch/alpha/stand/netboot/dev_net.c          |  19 +------------------
 sys/arch/evbmips/stand/sbmips/netboot/dev_net.c |  19 +------------------
 sys/arch/hp300/stand/common/netio.c             |   6 +-----
 sys/arch/macppc/stand/Makefile.inc              |   4 +---
 sys/arch/macppc/stand/ofwboot/net.c             |   4 +---
 sys/arch/newsmips/stand/boot/net.c              |   4 +---
 sys/arch/ofppc/stand/ofwboot/net.c              |   4 +---
 sys/arch/shark/stand/ofwboot/net.c              |   4 +---
 sys/arch/sparc/stand/common/net.c               |   4 +---
 sys/arch/sparc/stand/ofwboot/net.c              |   4 +---
 sys/arch/zaurus/stand/Makefile.inc              |   4 +---
 11 files changed, 11 insertions(+), 65 deletions(-)

diffs (224 lines):

diff -r 45cc3665ee6f -r d3a3c73a6c45 sys/arch/alpha/stand/netboot/dev_net.c
--- a/sys/arch/alpha/stand/netboot/dev_net.c    Mon Apr 12 02:54:07 2021 +0000
+++ b/sys/arch/alpha/stand/netboot/dev_net.c    Mon Apr 12 03:55:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.16 2011/07/17 20:54:36 joerg Exp $ */
+/* $NetBSD: dev_net.c,v 1.17 2021/04/12 03:55:40 mrg Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -67,23 +67,6 @@ extern int debug;
 extern int nfs_root_node[];    /* XXX - get from nfs_mount() */
 
 /*
- * Various globals needed by the network code:
- */
-
-#if 0
-/* for arp.c, rarp.c */
-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 */
-n_long netmask;                /* subnet or net mask */
-
-char rootpath[FNAME_SIZE];
-char hostname[FNAME_SIZE];
-
-/*
  * Local things...
  */
 static int netdev_sock = -1;
diff -r 45cc3665ee6f -r d3a3c73a6c45 sys/arch/evbmips/stand/sbmips/netboot/dev_net.c
--- a/sys/arch/evbmips/stand/sbmips/netboot/dev_net.c   Mon Apr 12 02:54:07 2021 +0000
+++ b/sys/arch/evbmips/stand/sbmips/netboot/dev_net.c   Mon Apr 12 03:55:40 2021 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: dev_net.c,v 1.1.1.1 2017/07/24 08:56:29 mrg Exp $ */
+/* $NetBSD: dev_net.c,v 1.2 2021/04/12 03:55:40 mrg Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -67,23 +67,6 @@ extern int debug;
 extern int nfs_root_node[];    /* XXX - get from nfs_mount() */
 
 /*
- * Various globals needed by the network code:
- */
-
-#if 0
-/* for arp.c, rarp.c */
-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 */
-n_long netmask;                /* subnet or net mask */
-
-char rootpath[FNAME_SIZE];
-char hostname[FNAME_SIZE];
-
-/*
  * Local things...
  */
 static int netdev_sock = -1;
diff -r 45cc3665ee6f -r d3a3c73a6c45 sys/arch/hp300/stand/common/netio.c
--- a/sys/arch/hp300/stand/common/netio.c       Mon Apr 12 02:54:07 2021 +0000
+++ b/sys/arch/hp300/stand/common/netio.c       Mon Apr 12 03:55:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netio.c,v 1.17 2020/04/28 14:45:23 tsutsui Exp $       */
+/*     $NetBSD: netio.c,v 1.18 2021/04/12 03:55:40 mrg Exp $   */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -93,10 +93,6 @@
 
 extern int nfs_root_node[];    /* XXX - get from nfs_mount() */
 
-struct in_addr myip, rootip, gateip;
-n_long netmask;
-char rootpath[FNAME_SIZE];
-
 static int netdev_sock = -1;
 static int open_count;
 
diff -r 45cc3665ee6f -r d3a3c73a6c45 sys/arch/macppc/stand/Makefile.inc
--- a/sys/arch/macppc/stand/Makefile.inc        Mon Apr 12 02:54:07 2021 +0000
+++ b/sys/arch/macppc/stand/Makefile.inc        Mon Apr 12 03:55:40 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.6 2020/09/06 07:20:29 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.7 2021/04/12 03:55:40 mrg Exp $
 
 BINDIR=                /usr/mdec
 
@@ -12,5 +12,3 @@ LINKFLAGS_UNWIND=     --no-ld-generated-unwi
 # just use it for type-checking.
 CWARNFLAGS.clang+=     -Wno-error=address-of-packed-member
 CWARNFLAGS.gcc+=       ${GCC_NO_ADDR_OF_PACKED_MEMBER}
-
-COPTS+=        -fcommon
diff -r 45cc3665ee6f -r d3a3c73a6c45 sys/arch/macppc/stand/ofwboot/net.c
--- a/sys/arch/macppc/stand/ofwboot/net.c       Mon Apr 12 02:54:07 2021 +0000
+++ b/sys/arch/macppc/stand/ofwboot/net.c       Mon Apr 12 03:55:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.9 2020/04/23 00:09:26 joerg Exp $    */
+/*     $NetBSD: net.c,v 1.10 2021/04/12 03:55:40 mrg Exp $     */
 
 /*
  * Copyright (C) 1995 Wolfgang Solfrank.
@@ -69,8 +69,6 @@
 #include "ofdev.h"
 #include "netif_of.h"
 
-extern char    rootpath[FNAME_SIZE];
-
 static int netdev_sock = -1;
 static int open_count;
 
diff -r 45cc3665ee6f -r d3a3c73a6c45 sys/arch/newsmips/stand/boot/net.c
--- a/sys/arch/newsmips/stand/boot/net.c        Mon Apr 12 02:54:07 2021 +0000
+++ b/sys/arch/newsmips/stand/boot/net.c        Mon Apr 12 03:55:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.6 2018/09/30 14:02:06 tsutsui Exp $  */
+/*     $NetBSD: net.c,v 1.7 2021/04/12 03:55:40 mrg Exp $      */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -61,8 +61,6 @@
 
 #include "netif_news.h"
 
-char rootpath[FNAME_SIZE];
-
 int    netdev_sock = -1;
 static int open_count;
 
diff -r 45cc3665ee6f -r d3a3c73a6c45 sys/arch/ofppc/stand/ofwboot/net.c
--- a/sys/arch/ofppc/stand/ofwboot/net.c        Mon Apr 12 02:54:07 2021 +0000
+++ b/sys/arch/ofppc/stand/ofwboot/net.c        Mon Apr 12 03:55:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.6 2003/06/26 20:46:31 aymeric Exp $  */
+/*     $NetBSD: net.c,v 1.7 2021/04/12 03:55:40 mrg Exp $      */
 
 /*
  * Copyright (C) 1995 Wolfgang Solfrank.
@@ -69,8 +69,6 @@
 #include "ofdev.h"
 #include "netif_of.h"
 
-char   rootpath[FNAME_SIZE];
-
 static int netdev_sock = -1;
 static int open_count;
 
diff -r 45cc3665ee6f -r d3a3c73a6c45 sys/arch/shark/stand/ofwboot/net.c
--- a/sys/arch/shark/stand/ofwboot/net.c        Mon Apr 12 02:54:07 2021 +0000
+++ b/sys/arch/shark/stand/ofwboot/net.c        Mon Apr 12 03:55:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.4 2005/12/11 12:19:05 christos Exp $ */
+/*     $NetBSD: net.c,v 1.5 2021/04/12 03:55:40 mrg Exp $      */
 
 /*
  * Copyright (C) 1995 Wolfgang Solfrank.
@@ -68,8 +68,6 @@
 #include "ofdev.h"
 #include "netif_of.h"
 
-char   rootpath[FNAME_SIZE];
-
 static int netdev_sock = -1;
 static int open_count;
 
diff -r 45cc3665ee6f -r d3a3c73a6c45 sys/arch/sparc/stand/common/net.c
--- a/sys/arch/sparc/stand/common/net.c Mon Apr 12 02:54:07 2021 +0000
+++ b/sys/arch/sparc/stand/common/net.c Mon Apr 12 03:55:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.10 2020/04/23 00:09:26 joerg Exp $   */
+/*     $NetBSD: net.c,v 1.11 2021/04/12 03:55:40 mrg Exp $     */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
@@ -60,8 +60,6 @@
 
 #include <sparc/stand/common/promdev.h>
 
-extern char    rootpath[FNAME_SIZE];
-
 int    netdev_sock = -1;
 static int open_count;
 
diff -r 45cc3665ee6f -r d3a3c73a6c45 sys/arch/sparc/stand/ofwboot/net.c
--- a/sys/arch/sparc/stand/ofwboot/net.c        Mon Apr 12 02:54:07 2021 +0000
+++ b/sys/arch/sparc/stand/ofwboot/net.c        Mon Apr 12 03:55:40 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.9 2020/04/23 00:09:26 joerg Exp $    */
+/*     $NetBSD: net.c,v 1.10 2021/04/12 03:55:41 mrg Exp $     */
 
 /*
  * Copyright (C) 1995 Wolfgang Solfrank.
@@ -73,8 +73,6 @@
 static int net_mountroot_bootparams(void);
 static int net_mountroot_bootp(void);
 
-extern char    rootpath[FNAME_SIZE];
-
 static int netdev_sock = -1;
 static int open_count;
 
diff -r 45cc3665ee6f -r d3a3c73a6c45 sys/arch/zaurus/stand/Makefile.inc
--- a/sys/arch/zaurus/stand/Makefile.inc        Mon Apr 12 02:54:07 2021 +0000
+++ b/sys/arch/zaurus/stand/Makefile.inc        Mon Apr 12 03:55:40 2021 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.7 2020/09/06 07:20:29 mrg Exp $
+#      $NetBSD: Makefile.inc,v 1.8 2021/04/12 03:55:41 mrg Exp $
 
 BINDIR=                /usr/mdec
 KLINK_MACHINE= zaurus
@@ -8,5 +8,3 @@ KLINK_MACHINE=  zaurus
 # just use it for type-checking.
 CWARNFLAGS.clang+=     -Wno-error=address-of-packed-member
 CWARNFLAGS.gcc+=       ${GCC_NO_ADDR_OF_PACKED_MEMBER}
-
-COPTS+=        -fcommon