Module Name: src
Committed By: mrg
Date: Mon Apr 12 03:55:41 UTC 2021
Modified Files:
src/sys/arch/alpha/stand/netboot: dev_net.c
src/sys/arch/evbmips/stand/sbmips/netboot: dev_net.c
src/sys/arch/hp300/stand/common: netio.c
src/sys/arch/macppc/stand: Makefile.inc
src/sys/arch/macppc/stand/ofwboot: net.c
src/sys/arch/newsmips/stand/boot: net.c
src/sys/arch/ofppc/stand/ofwboot: net.c
src/sys/arch/shark/stand/ofwboot: net.c
src/sys/arch/sparc/stand/common: net.c
src/sys/arch/sparc/stand/ofwboot: net.c
src/sys/arch/zaurus/stand: Makefile.inc
Log Message:
remove shadowed (common) declarations of various libsa variables
from various boot programs. for macppc and zaurus, avoid building
with -fcommon any more.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/stand/netboot/dev_net.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/arch/evbmips/stand/sbmips/netboot/dev_net.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hp300/stand/common/netio.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/macppc/stand/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/macppc/stand/ofwboot/net.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/newsmips/stand/boot/net.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ofppc/stand/ofwboot/net.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/shark/stand/ofwboot/net.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/sparc/stand/common/net.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc/stand/ofwboot/net.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/zaurus/stand/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/alpha/stand/netboot/dev_net.c
diff -u src/sys/arch/alpha/stand/netboot/dev_net.c:1.16 src/sys/arch/alpha/stand/netboot/dev_net.c:1.17
--- src/sys/arch/alpha/stand/netboot/dev_net.c:1.16 Sun Jul 17 20:54:36 2011
+++ src/sys/arch/alpha/stand/netboot/dev_net.c Mon Apr 12 03:55:40 2021
@@ -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;
Index: src/sys/arch/evbmips/stand/sbmips/netboot/dev_net.c
diff -u src/sys/arch/evbmips/stand/sbmips/netboot/dev_net.c:1.1.1.1 src/sys/arch/evbmips/stand/sbmips/netboot/dev_net.c:1.2
--- src/sys/arch/evbmips/stand/sbmips/netboot/dev_net.c:1.1.1.1 Mon Jul 24 08:56:29 2017
+++ src/sys/arch/evbmips/stand/sbmips/netboot/dev_net.c Mon Apr 12 03:55:40 2021
@@ -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;
Index: src/sys/arch/hp300/stand/common/netio.c
diff -u src/sys/arch/hp300/stand/common/netio.c:1.17 src/sys/arch/hp300/stand/common/netio.c:1.18
--- src/sys/arch/hp300/stand/common/netio.c:1.17 Tue Apr 28 14:45:23 2020
+++ src/sys/arch/hp300/stand/common/netio.c Mon Apr 12 03:55:40 2021
@@ -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;
Index: src/sys/arch/macppc/stand/Makefile.inc
diff -u src/sys/arch/macppc/stand/Makefile.inc:1.6 src/sys/arch/macppc/stand/Makefile.inc:1.7
--- src/sys/arch/macppc/stand/Makefile.inc:1.6 Sun Sep 6 07:20:29 2020
+++ src/sys/arch/macppc/stand/Makefile.inc Mon Apr 12 03:55:40 2021
@@ -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
Index: src/sys/arch/macppc/stand/ofwboot/net.c
diff -u src/sys/arch/macppc/stand/ofwboot/net.c:1.9 src/sys/arch/macppc/stand/ofwboot/net.c:1.10
--- src/sys/arch/macppc/stand/ofwboot/net.c:1.9 Thu Apr 23 00:09:26 2020
+++ src/sys/arch/macppc/stand/ofwboot/net.c Mon Apr 12 03:55:40 2021
@@ -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;
Index: src/sys/arch/newsmips/stand/boot/net.c
diff -u src/sys/arch/newsmips/stand/boot/net.c:1.6 src/sys/arch/newsmips/stand/boot/net.c:1.7
--- src/sys/arch/newsmips/stand/boot/net.c:1.6 Sun Sep 30 14:02:06 2018
+++ src/sys/arch/newsmips/stand/boot/net.c Mon Apr 12 03:55:40 2021
@@ -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;
Index: src/sys/arch/ofppc/stand/ofwboot/net.c
diff -u src/sys/arch/ofppc/stand/ofwboot/net.c:1.6 src/sys/arch/ofppc/stand/ofwboot/net.c:1.7
--- src/sys/arch/ofppc/stand/ofwboot/net.c:1.6 Thu Jun 26 20:46:31 2003
+++ src/sys/arch/ofppc/stand/ofwboot/net.c Mon Apr 12 03:55:40 2021
@@ -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;
Index: src/sys/arch/shark/stand/ofwboot/net.c
diff -u src/sys/arch/shark/stand/ofwboot/net.c:1.4 src/sys/arch/shark/stand/ofwboot/net.c:1.5
--- src/sys/arch/shark/stand/ofwboot/net.c:1.4 Sun Dec 11 12:19:05 2005
+++ src/sys/arch/shark/stand/ofwboot/net.c Mon Apr 12 03:55:40 2021
@@ -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;
Index: src/sys/arch/sparc/stand/common/net.c
diff -u src/sys/arch/sparc/stand/common/net.c:1.10 src/sys/arch/sparc/stand/common/net.c:1.11
--- src/sys/arch/sparc/stand/common/net.c:1.10 Thu Apr 23 00:09:26 2020
+++ src/sys/arch/sparc/stand/common/net.c Mon Apr 12 03:55:40 2021
@@ -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;
Index: src/sys/arch/sparc/stand/ofwboot/net.c
diff -u src/sys/arch/sparc/stand/ofwboot/net.c:1.9 src/sys/arch/sparc/stand/ofwboot/net.c:1.10
--- src/sys/arch/sparc/stand/ofwboot/net.c:1.9 Thu Apr 23 00:09:26 2020
+++ src/sys/arch/sparc/stand/ofwboot/net.c Mon Apr 12 03:55:41 2021
@@ -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;
Index: src/sys/arch/zaurus/stand/Makefile.inc
diff -u src/sys/arch/zaurus/stand/Makefile.inc:1.7 src/sys/arch/zaurus/stand/Makefile.inc:1.8
--- src/sys/arch/zaurus/stand/Makefile.inc:1.7 Sun Sep 6 07:20:29 2020
+++ src/sys/arch/zaurus/stand/Makefile.inc Mon Apr 12 03:55:41 2021
@@ -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
