CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: matt
Date: Fri Sep 19 00:24:28 UTC 2014
Modified Files:
src/external/gpl3/gcc/dist/gcc: config.gcc
src/external/gpl3/gcc/dist/gcc/config/or1k: netbsd.h or1k.c
src/external/gpl3/gcc/lib/libstdc++-v3/arch/or1k: c++config.h
src/external/gpl3/gcc/usr.bin/gcc/arch/or1k: auto-host.h configargs.h
Log Message:
Simplify or1k config.gcc configury bits. use gcc_cv_initfini_array=yes
to enable initfini. remove hacked initfini support and use the common gcc
implementation. Rerun native-gcc.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/config/or1k/netbsd.h \
src/external/gpl3/gcc/dist/gcc/config/or1k/or1k.c
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/or1k/c++config.h
cvs rdiff -u -r1.1 -r1.2 \
src/external/gpl3/gcc/usr.bin/gcc/arch/or1k/auto-host.h \
src/external/gpl3/gcc/usr.bin/gcc/arch/or1k/configargs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.29 src/external/gpl3/gcc/dist/gcc/config.gcc:1.30
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.29 Wed Sep 3 19:02:53 2014
+++ src/external/gpl3/gcc/dist/gcc/config.gcc Fri Sep 19 00:24:28 2014
@@ -2071,40 +2071,42 @@ mn10300-*-*)
use_collect2=no
use_gcc_stdint=wrap
;;
-or1k-*-elf*)
- tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h ${cpu_type}/elf.h"
- extra_parts="crti.o crtbegin.o crtend.o crtn.o"
- tmake_file=or1k/t-or1k
- tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_ON"
- ;;
-or1k-*-linux-*)
- tm_file="${tm_file} dbxelf.h elfos.h or1k/elf.h gnu-user.h linux.h or1k/linux-gas.h or1k/linux-elf.h uclibc-stdint.h"
- tmake_file="or1k/t-or1k or1k/t-linux ${tmake_file}"
- tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_ON"
- ;;
-or1k-*-netbsd*)
- tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h netbsd-stdint.h or1k/netbsd.h"
- #tmake_file="or1k/t-or1k ${tmake_file}"
- extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
- tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_ON"
- ;;
-or1knd-*-elf*)
- tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h ${cpu_type}/elf.h"
- extra_parts="crti.o crtbegin.o crtend.o crtn.o"
- tmake_file=or1k/t-or1knd
- tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_OFF"
- ;;
-or1knd-*-linux-*)
- tm_file="${tm_file} dbxelf.h elfos.h or1k/elf.h linux.h or1k/linux-gas.h or1k/linux-elf.h uclibc-stdint.h"
- tmake_file="or1k/t-or1knd or1k/t-linux ${tmake_file}"
- tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_OFF"
- ;;
-or1knd-*-netbsd*)
- tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h netbsd-stdint.h or1k/netbsd.h"
- #tmake_file="or1k/t-or1k ${tmake_file}"
- extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
- tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_OFF"
- ;;
+or1k*-*-elf*)
+ tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h ${cpu_type}/elf.h"
+ extra_parts="crti.o crtbegin.o crtend.o crtn.o"
+ case ${target} in
+ or1knd-*)
+ tmake_file=or1k/t-or1knd
+ tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_OFF"
+ ;;
+ *)
+ tmake_file=or1k/t-or1k
+ tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_ON"
+ ;;
+ esac
+ ;;
+or1k*-*-linux-*)
+ tm_file="${tm_file} dbxelf.h elfos.h or1k/elf.h gnu-user.h linux.h or1k/linux-gas.h or1k/linux-elf.h uclibc-stdint.h"
+ case ${target} in
+ or1knd-*)
+ tmake_file="or1k/t-or1knd or1k/t-linux ${tmake_file}"
+ tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_OFF"
+ ;;
+ *)
+ tmake_file="or1k/t-or1k or1k/t-linux ${tmake_file}"
+ tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_ON"
+ ;;
+ esac
+ ;;
+or1k*-*-netbsd*)
+ tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h netbsd-stdint.h or1k/netbsd.h"
+ extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
+ case ${target} in
+ or1knd-*) tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_OFF" ;;
+ *) tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_ON" ;;
+ esac
+ gcc_cv_initfini_array=yes
+ ;;
pdp11-*-*)
tm_file="${tm_file} newlib-stdint.h"
use_gcc_stdint=wrap
Index: src/external/gpl3/gcc/dist/gcc/config/or1k/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/or1k/netbsd.h:1.1 src/external/gpl3/gcc/dist/gcc/config/or1k/netbsd.h:1.2
--- src/external/gpl3/gcc/dist/gcc/config/or1k/netbsd.h:1.1 Wed Sep 3 19:02:54 2014
+++ src/external/gpl3/gcc/dist/gcc/config/or1k/netbsd.h Fri Sep 19 00:24:28 2014
@@ -65,43 +65,3 @@ Boston, MA 02111-1307, USA. */
(/*MASK_HARD_FLOAT |*/
CVS commit: src/sys/arch/powerpc/booke
Module Name:src
Committed By: joerg
Date: Thu Sep 18 23:37:51 UTC 2014
Modified Files:
src/sys/arch/powerpc/booke: trap_subr.S
Log Message:
Typo
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/booke/trap_subr.S
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/powerpc/booke/trap_subr.S
diff -u src/sys/arch/powerpc/booke/trap_subr.S:1.10 src/sys/arch/powerpc/booke/trap_subr.S:1.11
--- src/sys/arch/powerpc/booke/trap_subr.S:1.10 Thu Jul 31 01:04:00 2014
+++ src/sys/arch/powerpc/booke/trap_subr.S Thu Sep 18 23:37:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: trap_subr.S,v 1.10 2014/07/31 01:04:00 matt Exp $ */
+/* $NetBSD: trap_subr.S,v 1.11 2014/09/18 23:37:51 joerg Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,14 +34,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-RCSID("$NetBSD: trap_subr.S,v 1.10 2014/07/31 01:04:00 matt Exp $")
+RCSID("$NetBSD: trap_subr.S,v 1.11 2014/09/18 23:37:51 joerg Exp $")
.globl _C_LABEL(sctrapexit), _C_LABEL(trapexit), _C_LABEL(intrcall)
/*
* We have a problem with critical (MSR[CE] or machine check (MSR[ME])
* or debug (MSR[DE]) interrupts/exception in that they could happen
- * inbewtween the mtsprg1 %r2 and mfsprg1 %r2. If that happens, %r2
+ * inbetween the mtsprg1 %r2 and mfsprg1 %r2. If that happens, %r2
* will be lost. Even if we moved to a different sprg, subsequent
* expceptions would use SPRG1 and its value would be lost. The only
* way to be safe for CE/ME/DE faults to save and restore SPRG1.
CVS commit: src/doc
Module Name:src Committed By: roy Date: Thu Sep 18 20:47:39 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.4.5 To generate a diff of this commit: cvs rdiff -u -r1.1150 -r1.1151 src/doc/3RDPARTY cvs rdiff -u -r1.1980 -r1.1981 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1150 src/doc/3RDPARTY:1.1151 --- src/doc/3RDPARTY:1.1150 Tue Sep 16 22:28:56 2014 +++ src/doc/3RDPARTY Thu Sep 18 20:47:39 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1150 2014/09/16 22:28:56 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1151 2014/09/18 20:47:39 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -305,8 +305,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.4.4 -Current Vers: 6.4.4 +Version: 6.4.5 +Current Vers: 6.4.5 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1980 src/doc/CHANGES:1.1981 --- src/doc/CHANGES:1.1980 Tue Sep 16 22:28:56 2014 +++ src/doc/CHANGES Thu Sep 18 20:47:39 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1980 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1981 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -48,4 +48,4 @@ Changes from NetBSD 7.0 to NetBSD 8.0: awinmmc(4): Use DMA for MMC transfers. [jmcneill 20140908] rtsol(8): Removed in favour of dhcpcd. [roy 20140911] rtsold(8): Removed in favour of dhcpcd. [roy 20140911] - dhcpcd(8): Import dhcpcd-6.4.4. [roy 20140916] + dhcpcd(8): Import dhcpcd-6.4.5. [roy 20140918]
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src
Committed By: roy
Date: Thu Sep 18 20:46:30 UTC 2014
Modified Files:
src/external/bsd/dhcpcd/dist: dhcpcd.c if-bsd.c ipv6nd.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/dhcpcd/dist/dhcpcd.c \
src/external/bsd/dhcpcd/dist/if-bsd.c
cvs rdiff -u -r1.11 -r1.12 src/external/bsd/dhcpcd/dist/ipv6nd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.c:1.8 src/external/bsd/dhcpcd/dist/dhcpcd.c:1.9
--- src/external/bsd/dhcpcd/dist/dhcpcd.c:1.8 Tue Sep 16 22:27:04 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.c Thu Sep 18 20:46:30 2014
@@ -1,5 +1,5 @@
#include
- __RCSID("$NetBSD: dhcpcd.c,v 1.8 2014/09/16 22:27:04 roy Exp $");
+ __RCSID("$NetBSD: dhcpcd.c,v 1.9 2014/09/18 20:46:30 roy Exp $");
/*
* dhcpcd - DHCP client daemon
@@ -102,7 +102,7 @@ read_pid(const char *pidfile)
return pid;
}
-static inline int
+static int
write_pid(int fd, pid_t pid)
{
@@ -381,7 +381,7 @@ configure_interface1(struct interface *i
if (ifo->options & DHCPCD_IPV6RS) {
ra_global = if_checkipv6(ifp->ctx, NULL,
ifp->ctx->options & DHCPCD_IPV6RA_OWN ? 1 : 0);
- ra_iface = if_checkipv6(ifp->ctx, ifp->name,
+ ra_iface = if_checkipv6(ifp->ctx, ifp,
ifp->options->options & DHCPCD_IPV6RA_OWN ? 1 : 0);
if (ra_global == -1 || ra_iface == -1)
ifo->options &= ~DHCPCD_IPV6RS;
Index: src/external/bsd/dhcpcd/dist/if-bsd.c
diff -u src/external/bsd/dhcpcd/dist/if-bsd.c:1.8 src/external/bsd/dhcpcd/dist/if-bsd.c:1.9
--- src/external/bsd/dhcpcd/dist/if-bsd.c:1.8 Tue Sep 16 22:27:04 2014
+++ src/external/bsd/dhcpcd/dist/if-bsd.c Thu Sep 18 20:46:30 2014
@@ -1,5 +1,5 @@
#include
- __RCSID("$NetBSD: if-bsd.c,v 1.8 2014/09/16 22:27:04 roy Exp $");
+ __RCSID("$NetBSD: if-bsd.c,v 1.9 2014/09/18 20:46:30 roy Exp $");
/*
* dhcpcd - DHCP client daemon
@@ -772,7 +772,7 @@ int
if_managelink(struct dhcpcd_ctx *ctx)
{
/* route and ifwatchd like a msg buf size of 2048 */
- char msg[2048], *p, *e, *cp, ifname[IF_NAMESIZE];
+ char msg[2048], *p, *e, *cp;
ssize_t bytes;
struct rt_msghdr *rtm;
struct if_announcemsghdr *ifan;
@@ -781,6 +781,7 @@ if_managelink(struct dhcpcd_ctx *ctx)
struct sockaddr *sa, *rti_info[RTAX_MAX];
int len;
struct sockaddr_dl sdl;
+ struct interface *ifp;
#ifdef INET
struct rt rt;
#endif
@@ -819,8 +820,7 @@ if_managelink(struct dhcpcd_ctx *ctx)
#endif
case RTM_IFINFO:
ifm = (struct if_msghdr *)(void *)p;
- memset(ifname, 0, sizeof(ifname));
- if (!(if_indextoname(ifm->ifm_index, ifname)))
+ if ((ifp = if_findindex(ctx, ifm->ifm_index)) == NULL)
break;
switch (ifm->ifm_data.ifi_link_state) {
case LINK_STATE_DOWN:
@@ -841,7 +841,7 @@ if_managelink(struct dhcpcd_ctx *ctx)
break;
}
dhcpcd_handlecarrier(ctx, len,
- (unsigned int)ifm->ifm_flags, ifname);
+ (unsigned int)ifm->ifm_flags, ifp->name);
break;
case RTM_DELETE:
if (~rtm->rtm_addrs &
@@ -867,7 +867,7 @@ if_managelink(struct dhcpcd_ctx *ctx)
case RTM_DELADDR: /* FALLTHROUGH */
case RTM_NEWADDR:
ifam = (struct ifa_msghdr *)(void *)p;
- if (!if_indextoname(ifam->ifam_index, ifname))
+ if ((ifp = if_findindex(ctx, ifam->ifam_index)) == NULL)
break;
cp = (char *)(void *)(ifam + 1);
get_addrs(ifam->ifam_addrs, cp, rti_info);
@@ -884,7 +884,7 @@ if_managelink(struct dhcpcd_ctx *ctx)
#endif
memcpy(&sdl, rti_info[RTAX_IFA],
rti_info[RTAX_IFA]->sa_len);
-dhcpcd_handlehwaddr(ctx, ifname,
+dhcpcd_handlehwaddr(ctx, ifp->name,
(const unsigned char*)CLLADDR(&sdl),
sdl.sdl_alen);
break;
@@ -895,7 +895,7 @@ if_managelink(struct dhcpcd_ctx *ctx)
COPYOUT(rt.net, rti_info[RTAX_NETMASK]);
COPYOUT(rt.gate, rti_info[RTAX_BRD]);
ipv4_handleifa(ctx, rtm->rtm_type,
-NULL, ifname,
+NULL, ifp->name,
&rt.dest, &rt.net, &rt.gate);
break;
#endif
@@ -905,13 +905,14 @@ if_managelink(struct dhcpcd_ctx *ctx)
rti_info[RTAX_IFA];
ia6 = sin6->sin6_addr;
if (rtm->rtm_type == RTM_NEWADDR) {
- ifa_flags = if_addrflags6(ifname, &ia6);
+ ifa_flags = if_addrflags6(ifp->name,
+ &ia6);
if (ifa_flags == -1)
break;
} else
ifa_flags = 0;
ipv6_handleifa(ctx, rtm->rtm_type, NULL,
-ifname, &ia6, ifa_flags);
+ifp->name, &ia6, ifa_flags);
break;
#endif
}
@@ -1042,38 +1043,38 @@ if_raflush(void)
if (s == -1)
return -1;
strlcpy(dummy, "lo0", sizeof(dummy));
- if (ioctl(s, SIOCSRTRFLUSH_IN6, (caddr_t)&dummy) == -1)
+ if (ioctl(s, SIOCSRTRFLUSH_IN6, (void *)&dummy) == -1)
syslog(LOG_ERR, "SIOSRTRFLUSH_IN6: %m");
- if (ioctl(s, SIOCSPFXFLUSH_IN6, (caddr_t)&dummy) == -1)
+ if (ioctl(s, SIOCSPFXFLUSH_IN6, (void *)&dummy) == -1)
syslog(LOG_ERR, "SIO
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Thu Sep 18 20:43:58 UTC 2014 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3735 Log Message: Import dhcpcd-6.4.5 with the following changes: * Remove all instances of if_indextoname as we already know the index * Check we have allocated IPv6 resources before checkings RA's Status: Vendor Tag: roy Release Tags: dhcpcd-6-4-5 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c C src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c U src/external/bsd/dhcpcd/dist/if.c U src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c C src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/arp.c U src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c C src/external/bsd/dhcpcd/dist/ipv6nd.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/auth.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c.in U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dev.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6nd.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 3 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src
Module Name:src Committed By: wiz Date: Thu Sep 18 19:45:25 UTC 2014 Modified Files: src/distrib/sets/lists/modules: md.amd64 md.evbppc.powerpc mi src/sys/modules/dtrace/fbt: Makefile src/sys/modules/dtrace/profile: Makefile src/sys/modules/dtrace/sdt: Makefile Log Message: Per the wiki roadmap, rename the three dtrace modules to have a "dtrace_" prefix. amd64 build tested, other set list changes done the same way. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/modules/md.amd64 cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/modules/md.evbppc.powerpc cvs rdiff -u -r1.69 -r1.70 src/distrib/sets/lists/modules/mi cvs rdiff -u -r1.4 -r1.5 src/sys/modules/dtrace/fbt/Makefile cvs rdiff -u -r1.1 -r1.2 src/sys/modules/dtrace/profile/Makefile cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/sdt/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/modules/md.amd64 diff -u src/distrib/sets/lists/modules/md.amd64:1.43 src/distrib/sets/lists/modules/md.amd64:1.44 --- src/distrib/sets/lists/modules/md.amd64:1.43 Fri Aug 22 10:51:38 2014 +++ src/distrib/sets/lists/modules/md.amd64 Thu Sep 18 19:45:24 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.43 2014/08/22 10:51:38 apb Exp $ +# $NetBSD: md.amd64,v 1.44 2014/09/18 19:45:24 wiz Exp $ # # NOTE that there are two sets of files here: # @MODULEDIR@ and amd64-xen @@ -252,6 +252,12 @@ ./stand/amd64-xen/@OSRELEASE@/modules/drm/drm.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/dtracebase-kernel-modules kmod,dtrace,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/dtrace/dtrace.kmod base-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/dtrace_fbt base-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/dtrace_fbt/dtrace_fbt.kmod base-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/dtrace_profilebase-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/dtrace_profile/dtrace_profile.kmod base-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/dtrace_sdt base-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/dtrace_sdt/dtrace_sdt.kmod base-kernel-modules kmod,dtrace,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/dtvbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/dtv/dtv.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/dtv_mathbase-kernel-modules kmod,compatmodules @@ -270,8 +276,8 @@ ./stand/amd64-xen/@OSRELEASE@/modules/exec_script/exec_script.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/ext2fsbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/ext2fs/ext2fs.kmod base-kernel-modules kmod,compatmodules -./stand/amd64-xen/@OSRELEASE@/modules/fbtbase-kernel-modules kmod,dtrace,compatmodules -./stand/amd64-xen/@OSRELEASE@/modules/fbt/fbt.kmod base-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/fbtbase-obsolete obsolete +./stand/amd64-xen/@OSRELEASE@/modules/fbt/fbt.kmod base-obsolete obsolete ./stand/amd64-xen/@OSRELEASE@/modules/fdescbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/fdesc/fdesc.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/ffsbase-kernel-modules kmod,compatmodules @@ -410,8 +416,8 @@ ./stand/amd64-xen/@OSRELEASE@/modules/ppp_deflate/ppp_deflate.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/procfsbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/procfs/procfs.kmod base-kernel-modules kmod,compatmodules -./stand/amd64-xen/@OSRELEASE@/modules/profilebase-kernel-modules kmod,dtrace,compatmodules -./stand/amd64-xen/@OSRELEASE@/modules/profile/profile.kmod base-kernel-modules kmod,dtrace,compatmodules +./stand/amd64-xen/@OSRELEASE@/modules/profilebase-obsolete obsolete +./stand/amd64-xen/@OSRELEASE@/modules/profile/profile.kmod base-obsolete obsolete ./stand/amd64-xen/@OSRELEASE@/modules/ptyfsbase-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/ptyfs/ptyfs.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/puffsbase-kernel-modules kmod,compatmodules @@ -422,8 +428,8 @@ ./stand/amd64-xen/@OSRELEASE@/modules/pwdog/pwdog.kmod base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/scsiverbose base-kernel-modules kmod,compatmodules ./stand/amd64-xen/@OSRELEASE@/modules/scsiverbose/scsiverbose.kmod base-kernel-modules kmod,compatmodules -./stand/amd64-xen/@OSRELEASE@/modules/sdtbase-kernel-modul
CVS commit: xsrc/external/mit/libXfont/dist/src/fontfile
Module Name:xsrc
Committed By: christos
Date: Thu Sep 18 19:23:10 UTC 2014
Modified Files:
xsrc/external/mit/libXfont/dist/src/fontfile: fileio.c filewr.c
Log Message:
Set close-on-exec for font file i/o.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 \
xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c \
xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c
diff -u xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c:1.1.1.3 xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c:1.2
--- xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c:1.1.1.3 Thu May 30 21:08:57 2013
+++ xsrc/external/mit/libXfont/dist/src/fontfile/fileio.c Thu Sep 18 15:23:10 2014
@@ -36,6 +36,9 @@ in this Software without prior written a
#ifndef O_BINARY
#define O_BINARY O_RDONLY
#endif
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
FontFilePtr
FontFileOpen (const char *name)
@@ -44,7 +47,7 @@ FontFileOpen (const char *name)
int len;
BufFilePtr raw, cooked;
-fd = open (name, O_BINARY);
+fd = open (name, O_BINARY|O_CLOEXEC);
if (fd < 0)
return 0;
raw = BufFileOpenRead (fd);
Index: xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c
diff -u xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c:1.1.1.3 xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c:1.2
--- xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c:1.1.1.3 Thu May 30 21:08:57 2013
+++ xsrc/external/mit/libXfont/dist/src/fontfile/filewr.c Thu Sep 18 15:23:10 2014
@@ -33,17 +33,19 @@ in this Software without prior written a
#endif
#include
#include
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
FontFilePtr
FontFileOpenWrite (const char *name)
{
int fd;
-#if defined(WIN32) || defined(__CYGWIN__)
-fd = open (name, O_CREAT|O_TRUNC|O_RDWR|O_BINARY, 0666);
-#else
-fd = creat (name, 0666);
-#endif
+fd = open (name, O_CREAT|O_TRUNC|O_RDWR|O_BINARY|O_CLOEXEC, 0666);
if (fd < 0)
return 0;
return (FontFilePtr) BufFileOpenWrite (fd);
CVS commit: xsrc/external/mit/xsm/dist
Module Name:xsrc
Committed By: christos
Date: Thu Sep 18 19:13:50 UTC 2014
Modified Files:
xsrc/external/mit/xsm/dist: auth.c choose.c lock.c remote.c restart.c
saveutil.c
Log Message:
set close-on-exec for all fds opened...
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r1.2 xsrc/external/mit/xsm/dist/auth.c \
xsrc/external/mit/xsm/dist/choose.c xsrc/external/mit/xsm/dist/lock.c \
xsrc/external/mit/xsm/dist/remote.c xsrc/external/mit/xsm/dist/restart.c \
xsrc/external/mit/xsm/dist/saveutil.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xsm/dist/auth.c
diff -u xsrc/external/mit/xsm/dist/auth.c:1.1.1.3 xsrc/external/mit/xsm/dist/auth.c:1.2
--- xsrc/external/mit/xsm/dist/auth.c:1.1.1.3 Fri May 31 03:51:30 2013
+++ xsrc/external/mit/xsm/dist/auth.c Thu Sep 18 15:13:50 2014
@@ -154,25 +154,25 @@ SetAuthentication(int count, IceListenOb
if ((addAuthFile = unique_filename (path, ".xsm")) == NULL)
goto bad;
-if (!(addfp = fopen (addAuthFile, "w")))
+if (!(addfp = fopen (addAuthFile, "we")))
goto bad;
if ((remAuthFile = unique_filename (path, ".xsm")) == NULL)
goto bad;
-if (!(removefp = fopen (remAuthFile, "w")))
+if (!(removefp = fopen (remAuthFile, "we")))
goto bad;
#else
if ((addAuthFile = unique_filename (path, ".xsm", &fd)) == NULL)
goto bad;
-if (!(addfp = fdopen(fd, "wb")))
+if (!(addfp = fdopen(fd, "wbe")))
goto bad;
if ((remAuthFile = unique_filename (path, ".xsm", &fd)) == NULL)
goto bad;
-if (!(removefp = fdopen(fd, "wb")))
+if (!(removefp = fdopen(fd, "wbe")))
goto bad;
#endif
Index: xsrc/external/mit/xsm/dist/choose.c
diff -u xsrc/external/mit/xsm/dist/choose.c:1.1.1.3 xsrc/external/mit/xsm/dist/choose.c:1.2
--- xsrc/external/mit/xsm/dist/choose.c:1.1.1.3 Fri May 31 03:51:31 2013
+++ xsrc/external/mit/xsm/dist/choose.c Thu Sep 18 15:13:50 2014
@@ -98,6 +98,8 @@ GetSessionNames(int *count_ret, String *
if ((dir = opendir (path)) == NULL)
return 0;
+(void)fcntl(dirfd(dir), F_SETFD, FD_CLOEXEC);
+
count = 0;
while ((entry = readdir (dir)) != NULL)
Index: xsrc/external/mit/xsm/dist/lock.c
diff -u xsrc/external/mit/xsm/dist/lock.c:1.1.1.3 xsrc/external/mit/xsm/dist/lock.c:1.2
--- xsrc/external/mit/xsm/dist/lock.c:1.1.1.3 Fri May 31 03:51:30 2013
+++ xsrc/external/mit/xsm/dist/lock.c Thu Sep 18 15:13:50 2014
@@ -117,7 +117,7 @@ GetLockId(const char *session_name)
snprintf (lock_file, sizeof(lock_file), "%s/.XSMlock-%s",
path, session_name);
-if ((fp = fopen (lock_file, "r")) == NULL)
+if ((fp = fopen (lock_file, "re")) == NULL)
{
return (NULL);
}
Index: xsrc/external/mit/xsm/dist/remote.c
diff -u xsrc/external/mit/xsm/dist/remote.c:1.1.1.3 xsrc/external/mit/xsm/dist/remote.c:1.2
--- xsrc/external/mit/xsm/dist/remote.c:1.1.1.3 Fri May 31 03:51:30 2013
+++ xsrc/external/mit/xsm/dist/remote.c Thu Sep 18 15:13:50 2014
@@ -111,7 +111,7 @@ remote_start(const char *restart_protoco
default: /* parent */
close (pipefd[0]);
- fp = (FILE *) fdopen (pipefd[1], "w");
+ fp = fdopen (pipefd[1], "we");
fprintf (fp, "CONTEXT X\n");
fprintf (fp, "DIR %s\n", cwd);
Index: xsrc/external/mit/xsm/dist/restart.c
diff -u xsrc/external/mit/xsm/dist/restart.c:1.1.1.3 xsrc/external/mit/xsm/dist/restart.c:1.2
--- xsrc/external/mit/xsm/dist/restart.c:1.1.1.3 Fri May 31 03:51:30 2013
+++ xsrc/external/mit/xsm/dist/restart.c Thu Sep 18 15:13:50 2014
@@ -531,11 +531,11 @@ StartDefaultApps (void)
home = ".";
snprintf (filename, sizeof(filename), "%s/.xsmstartup", home);
-f = fopen (filename, "r");
+f = fopen (filename, "re");
if (!f)
{
- f = fopen (SYSTEM_INIT_FILE, "r");
+ f = fopen (SYSTEM_INIT_FILE, "re");
if (!f)
{
printf ("Could not find default apps file. Make sure you did\n");
Index: xsrc/external/mit/xsm/dist/saveutil.c
diff -u xsrc/external/mit/xsm/dist/saveutil.c:1.1.1.3 xsrc/external/mit/xsm/dist/saveutil.c:1.2
--- xsrc/external/mit/xsm/dist/saveutil.c:1.1.1.3 Fri May 31 03:51:30 2013
+++ xsrc/external/mit/xsm/dist/saveutil.c Thu Sep 18 15:13:50 2014
@@ -65,7 +65,7 @@ ReadSave(const char *session_name, char
int state, i;
int version_number;
-f = fopen(session_save_file, "r");
+f = fopen(session_save_file, "re");
if(!f) {
if (verbose)
printf("No session save file.\n");
@@ -306,7 +306,7 @@ WriteSave(const char *sm_id)
char *p, *c;
int count;
-f = fopen (session_save_file, "w");
+f = fopen (session_save_file, "we");
if (!f)
{
@@ -427,7 +427,7 @@ DeleteSession(const char *session_name)
snprintf (filename, sizeof(filename), "%s/.XSM-%s", dir, session_name);
-f = fopen(filename, "r");
+f = fopen(filename, "re");
if(!f) {
return (0);
}
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Sep 18 15:50:49 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket 109 To generate a diff of this commit: cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.34 src/doc/CHANGES-7.0:1.1.2.35 --- src/doc/CHANGES-7.0:1.1.2.34 Thu Sep 18 15:21:44 2014 +++ src/doc/CHANGES-7.0 Thu Sep 18 15:50:49 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.34 2014/09/18 15:21:44 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.35 2014/09/18 15:50:49 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -724,3 +724,11 @@ sys/dev/pci/agp_i810.c1.113-1.114 Revert to mapping the whole GTTMMADR region all at once for now and use the right BAR for MMIO register sizing on i810. [riastradh, ticket #94] + +external/gpl3/gcc.old/dist/gcc/config/i386/pmm_malloc.h 1.2 + + Apply r1.2 from our GCC 4.8 version of the same file: + + Kill the "throw()" on a forward declaration for posix_memalign (it + does not match our base declaration and may cause warnings). + [joerg, ticket #109]
CVS commit: [netbsd-7] src/external/gpl3/gcc.old/dist/gcc/config/i386
Module Name:src Committed By: martin Date: Thu Sep 18 15:47:20 UTC 2014 Modified Files: src/external/gpl3/gcc.old/dist/gcc/config/i386 [netbsd-7]: pmm_malloc.h Log Message: Pull up following revision(s) (requested by joerg in ticket #109): external/gpl3/gcc.old/dist/gcc/config/i386/pmm_malloc.h: revision 1.2 Apply r1.2 from our GCC 4.8 version of the same file: Kill the "throw()" on a forward declaration for posix_memalign (it does not match our base declaration and may cause warnings). To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.1.1.1.6.1 \ src/external/gpl3/gcc.old/dist/gcc/config/i386/pmm_malloc.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc.old/dist/gcc/config/i386/pmm_malloc.h diff -u src/external/gpl3/gcc.old/dist/gcc/config/i386/pmm_malloc.h:1.1.1.1 src/external/gpl3/gcc.old/dist/gcc/config/i386/pmm_malloc.h:1.1.1.1.6.1 --- src/external/gpl3/gcc.old/dist/gcc/config/i386/pmm_malloc.h:1.1.1.1 Tue Feb 25 18:38:57 2014 +++ src/external/gpl3/gcc.old/dist/gcc/config/i386/pmm_malloc.h Thu Sep 18 15:47:20 2014 @@ -31,7 +31,7 @@ #ifndef __cplusplus extern int posix_memalign (void **, size_t, size_t); #else -extern "C" int posix_memalign (void **, size_t, size_t) throw (); +extern "C" int posix_memalign (void **, size_t, size_t); #endif static __inline void *
CVS commit: src
Module Name:src Committed By: ozaki-r Date: Thu Sep 18 15:25:10 UTC 2014 Modified Files: src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.tests Log Message: Add net/if_bridge test To generate a diff of this commit: cvs rdiff -u -r1.590 -r1.591 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.109 -r1.110 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.590 src/distrib/sets/lists/tests/mi:1.591 --- src/distrib/sets/lists/tests/mi:1.590 Mon Aug 25 20:40:52 2014 +++ src/distrib/sets/lists/tests/mi Thu Sep 18 15:25:10 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.590 2014/08/25 20:40:52 joerg Exp $ +# $NetBSD: mi,v 1.591 2014/09/18 15:25:10 ozaki-r Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3119,6 +3119,10 @@ ./usr/tests/net/if/Atffile tests-net-tests atf,rump ./usr/tests/net/if/Kyuafile tests-net-tests atf,rump,kyua ./usr/tests/net/if/t_compat tests-net-tests atf,rump +./usr/tests/net/if_bridge tests-net-tests +./usr/tests/net/if_bridge/Atffile tests-net-tests atf,rump +./usr/tests/net/if_bridge/Kyuafile tests-net-tests atf,rump,kyua +./usr/tests/net/if_bridge/t_bridge tests-net-tests atf,rump ./usr/tests/net/if_looptests-net-tests ./usr/tests/net/if_loop/Atffile tests-net-tests atf,rump ./usr/tests/net/if_loop/Kyuafile tests-net-tests atf,rump,kyua Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.109 src/etc/mtree/NetBSD.dist.tests:1.110 --- src/etc/mtree/NetBSD.dist.tests:1.109 Fri Aug 22 16:45:32 2014 +++ src/etc/mtree/NetBSD.dist.tests Thu Sep 18 15:25:10 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.109 2014/08/22 16:45:32 apb Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.110 2014/09/18 15:25:10 ozaki-r Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -307,6 +307,7 @@ ./usr/tests/net/fdpass ./usr/tests/net/icmp ./usr/tests/net/if +./usr/tests/net/if_bridge ./usr/tests/net/if_loop ./usr/tests/net/mpls ./usr/tests/net/net
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Thu Sep 18 15:21:44 UTC 2014 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Ticket 94 To generate a diff of this commit: cvs rdiff -u -r1.1.2.33 -r1.1.2.34 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.33 src/doc/CHANGES-7.0:1.1.2.34 --- src/doc/CHANGES-7.0:1.1.2.33 Fri Sep 12 08:17:20 2014 +++ src/doc/CHANGES-7.0 Thu Sep 18 15:21:44 2014 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.33 2014/09/12 08:17:20 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.34 2014/09/18 15:21:44 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -719,3 +719,8 @@ sys/fs/puffs/puffs_vnops.c 1.186 - Return EFBIG instead of EINVAL for negative offsets, as FFS does [manu, ticket #93] +sys/dev/pci/agp_i810.c1.113-1.114 + + Revert to mapping the whole GTTMMADR region all at once for now and + use the right BAR for MMIO register sizing on i810. + [riastradh, ticket #94]
CVS commit: src/tests/net
Module Name:src
Committed By: ozaki-r
Date: Thu Sep 18 15:13:27 UTC 2014
Modified Files:
src/tests/net: Makefile
Added Files:
src/tests/net/if_bridge: Makefile t_bridge.sh
Log Message:
Add net/if_bridge test
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/tests/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/if_bridge/Makefile \
src/tests/net/if_bridge/t_bridge.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.17 src/tests/net/Makefile:1.18
--- src/tests/net/Makefile:1.17 Mon Jun 30 21:30:51 2014
+++ src/tests/net/Makefile Thu Sep 18 15:13:27 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/06/30 21:30:51 alnsn Exp $
+# $NetBSD: Makefile,v 1.18 2014/09/18 15:13:27 ozaki-r Exp $
.include
@@ -6,7 +6,7 @@ TESTSDIR= ${TESTSBASE}/net
TESTS_SUBDIRS= fdpass net route sys
.if (${MKRUMP} != "no")
-TESTS_SUBDIRS+= bpf bpfilter carp icmp if if_loop mpls npf
+TESTS_SUBDIRS+= bpf bpfilter carp icmp if if_bridge if_loop mpls npf
.if (${MKSLJIT} != "no")
TESTS_SUBDIRS+= bpfjit
.endif
Added files:
Index: src/tests/net/if_bridge/Makefile
diff -u /dev/null src/tests/net/if_bridge/Makefile:1.1
--- /dev/null Thu Sep 18 15:13:27 2014
+++ src/tests/net/if_bridge/Makefile Thu Sep 18 15:13:27 2014
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2014/09/18 15:13:27 ozaki-r Exp $
+#
+
+.include
+
+TESTSDIR= ${TESTSBASE}/net/if_bridge
+
+TESTS_SH= t_bridge
+
+.include
Index: src/tests/net/if_bridge/t_bridge.sh
diff -u /dev/null src/tests/net/if_bridge/t_bridge.sh:1.1
--- /dev/null Thu Sep 18 15:13:27 2014
+++ src/tests/net/if_bridge/t_bridge.sh Thu Sep 18 15:13:27 2014
@@ -0,0 +1,312 @@
+#! /usr/bin/atf-sh
+# $NetBSD: t_bridge.sh,v 1.1 2014/09/18 15:13:27 ozaki-r Exp $
+#
+# Copyright (c) 2014 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+inetserver="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_bridge -lrumpnet_shmif"
+inet6server="rump_server -lrumpnet -lrumpnet_net -lrumpnet_netinet -lrumpnet_netinet6 -lrumpnet_bridge -lrumpnet_shmif"
+
+SOCK1=unix://commsock1
+SOCK2=unix://commsock2
+SOCK3=unix://commsock3
+IP1=10.0.0.1
+IP2=10.0.0.2
+IP61=fc00::1
+IP62=fc00::2
+
+atf_test_case basic cleanup
+atf_test_case basic6 cleanup
+
+basic_head()
+{
+ atf_set "descr" "Does simple if_bridge tests"
+ atf_set "require.progs" "rump_server"
+}
+
+basic6_head()
+{
+ atf_set "descr" "Does simple if_bridge tests (IPv6)"
+ atf_set "require.progs" "rump_server"
+}
+
+setup_endpoint()
+{
+ sock=${1}
+ addr=${2}
+ bus=${3}
+ mode=${4}
+
+ export RUMP_SERVER=${sock}
+ atf_check -s exit:0 rump.ifconfig shmif0 create
+ atf_check -s exit:0 rump.ifconfig shmif0 linkstr ${bus}
+ if [ $mode = "ipv6" ]; then
+ atf_check -s exit:0 rump.ifconfig shmif0 inet6 ${addr}
+ else
+ atf_check -s exit:0 rump.ifconfig shmif0 inet ${addr} netmask 0xff00
+ fi
+
+ atf_check -s exit:0 rump.ifconfig shmif0 up
+ rump.ifconfig shmif0
+}
+
+test_endpoint()
+{
+ sock=${1}
+ addr=${2}
+ bus=${3}
+ mode=${4}
+
+ export RUMP_SERVER=${sock}
+ atf_check -s exit:0 -o match:shmif0 rump.ifconfig
+ if [ $mode = "ipv6" ]; then
+ export LD_PRELOAD=/usr/lib/librumphijack.so
+ atf_check -s exit:0 -o ignore ping6 -n -c 1 ${addr}
+ unset LD_PRELOAD
+ else
+ atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 ${addr}
+ fi
+}
+
+show_endpoint()
+{
+ sock=${1}
+
+ export RUMP_SERVER=${sock}
+ rump.ifconfig -v shmif0
+}
+
+test_setup()
+{
+ test_endpoint $SOCK1 $IP1 bus1 ipv4
+ test_endpoint $SOCK3 $IP2 bus2 ipv4
+
+ export RUMP_SERVER=$SOCK2
+ atf_ch
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: wiz Date: Thu Sep 18 15:00:08 UTC 2014 Modified Files: src/sys/arch/evbarm/conf: BEAGLEBONE SHEEVAPLUG Log Message: Add commented out KDTRACE_HOOKS line. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/BEAGLEBONE cvs rdiff -u -r1.43 -r1.44 src/sys/arch/evbarm/conf/SHEEVAPLUG 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/evbarm/conf/BEAGLEBONE diff -u src/sys/arch/evbarm/conf/BEAGLEBONE:1.27 src/sys/arch/evbarm/conf/BEAGLEBONE:1.28 --- src/sys/arch/evbarm/conf/BEAGLEBONE:1.27 Sat Aug 23 20:26:57 2014 +++ src/sys/arch/evbarm/conf/BEAGLEBONE Thu Sep 18 15:00:08 2014 @@ -1,5 +1,5 @@ # -# $NetBSD: BEAGLEBONE,v 1.27 2014/08/23 20:26:57 dholland Exp $ +# $NetBSD: BEAGLEBONE,v 1.28 2014/09/18 15:00:08 wiz Exp $ # # BEAGLEBONE -- TI AM335x board Kernel # @@ -130,6 +130,7 @@ options KTRACE # system call tracing, #options PERFCTRS # performance counters options DIAGNOSTIC # internal consistency checks options DEBUG +#options KDTRACE_HOOKS # kernel DTrace hooks #options PMAP_DEBUG # Enable pmap_debug_level code #options IPKDB # remote kernel debugging #options VERBOSE_INIT_ARM # verbose bootstraping messages Index: src/sys/arch/evbarm/conf/SHEEVAPLUG diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.43 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.44 --- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.43 Sat Aug 23 20:26:57 2014 +++ src/sys/arch/evbarm/conf/SHEEVAPLUG Thu Sep 18 15:00:08 2014 @@ -1,4 +1,4 @@ -# $NetBSD: SHEEVAPLUG,v 1.43 2014/08/23 20:26:57 dholland Exp $ +# $NetBSD: SHEEVAPLUG,v 1.44 2014/09/18 15:00:08 wiz Exp $ # # This configuration supports for generically Marvell SheevaPlug # @@ -157,6 +157,7 @@ options USBVERBOSE # verbose USB device #options PERFCTRS # performance counters options DIAGNOSTIC # internal consistency checks options DEBUG +#options KDTRACE_HOOKS # kernel DTrace hooks #options LOCKDEBUG #options PMAP_DEBUG # Enable pmap_debug_level code #options VERBOSE_INIT_ARM # verbose bootstraping messages
CVS commit: src/sys/arch
Module Name:src Committed By: wiz Date: Thu Sep 18 14:58:22 UTC 2014 Modified Files: src/sys/arch/amd64/conf: GENERIC src/sys/arch/i386/conf: GENERIC Log Message: Add commented out KDTRACE_HOOKS line. To generate a diff of this commit: cvs rdiff -u -r1.396 -r1.397 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1. -r1.1112 src/sys/arch/i386/conf/GENERIC 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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.396 src/sys/arch/amd64/conf/GENERIC:1.397 --- src/sys/arch/amd64/conf/GENERIC:1.396 Sun Aug 24 07:59:22 2014 +++ src/sys/arch/amd64/conf/GENERIC Thu Sep 18 14:58:22 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.396 2014/08/24 07:59:22 jnemeth Exp $ +# $NetBSD: GENERIC,v 1.397 2014/09/18 14:58:22 wiz Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.396 $" +#ident "GENERIC-$Revision: 1.397 $" maxusers 64 # estimated number of users @@ -108,6 +108,7 @@ options DDB_HISTORY_SIZE=512 # enable h #options SYSCALL_STATS # per syscall counts #options SYSCALL_TIMES # per syscall times #options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) +#options KDTRACE_HOOKS # kernel DTrace hooks # Compatibility options options COMPAT_15 # NetBSD 1.5, Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1. src/sys/arch/i386/conf/GENERIC:1.1112 --- src/sys/arch/i386/conf/GENERIC:1. Sun Aug 24 07:59:22 2014 +++ src/sys/arch/i386/conf/GENERIC Thu Sep 18 14:58:21 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1. 2014/08/24 07:59:22 jnemeth Exp $ +# $NetBSD: GENERIC,v 1.1112 2014/09/18 14:58:21 wiz Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1. $" +#ident "GENERIC-$Revision: 1.1112 $" maxusers 64 # estimated number of users @@ -123,6 +123,7 @@ options DDB_HISTORY_SIZE=512 # enable h #options SYSCALL_STATS # per syscall counts #options SYSCALL_TIMES # per syscall times #options SYSCALL_TIMES_HASCOUNTER # use 'broken' rdtsc (soekris) +#options KDTRACE_HOOKS # kernel DTrace hooks # Compatibility options options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
CVS commit: src/lib/libc
Module Name:src
Committed By: christos
Date: Thu Sep 18 13:58:21 UTC 2014
Modified Files:
src/lib/libc/gen: fmtmsg.c fts.c getcap.c getpass.c nlist.c syslog.c
utmpx.c
src/lib/libc/gmon: gmon.c
src/lib/libc/hash: hashhl.c
src/lib/libc/md: mdXhl.c
src/lib/libc/net: ethers.c hesiod.c nsdispatch.c rcmd.c
src/lib/libc/rpc: getnetconfig.c
src/lib/libc/stdlib: malloc.c
src/lib/libc/time: getdate.c localtime.c strftime.c
src/lib/libc/yp: yplib.c
Log Message:
make more descriptors that we open as close-on-exec
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/gen/fmtmsg.c
cvs rdiff -u -r1.46 -r1.47 src/lib/libc/gen/fts.c
cvs rdiff -u -r1.53 -r1.54 src/lib/libc/gen/getcap.c \
src/lib/libc/gen/syslog.c
cvs rdiff -u -r1.28 -r1.29 src/lib/libc/gen/getpass.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/gen/nlist.c
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/gen/utmpx.c
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/gmon/gmon.c
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/hash/hashhl.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/md/mdXhl.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/net/ethers.c
cvs rdiff -u -r1.27 -r1.28 src/lib/libc/net/hesiod.c
cvs rdiff -u -r1.37 -r1.38 src/lib/libc/net/nsdispatch.c
cvs rdiff -u -r1.69 -r1.70 src/lib/libc/net/rcmd.c
cvs rdiff -u -r1.21 -r1.22 src/lib/libc/rpc/getnetconfig.c
cvs rdiff -u -r1.55 -r1.56 src/lib/libc/stdlib/malloc.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/time/getdate.c
cvs rdiff -u -r1.85 -r1.86 src/lib/libc/time/localtime.c
cvs rdiff -u -r1.31 -r1.32 src/lib/libc/time/strftime.c
cvs rdiff -u -r1.45 -r1.46 src/lib/libc/yp/yplib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/fmtmsg.c
diff -u src/lib/libc/gen/fmtmsg.c:1.5 src/lib/libc/gen/fmtmsg.c:1.6
--- src/lib/libc/gen/fmtmsg.c:1.5 Tue Mar 20 12:36:05 2012
+++ src/lib/libc/gen/fmtmsg.c Thu Sep 18 09:58:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fmtmsg.c,v 1.5 2012/03/20 16:36:05 matt Exp $ */
+/* $NetBSD: fmtmsg.c,v 1.6 2014/09/18 13:58:20 christos Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: fmtmsg.c,v 1.5 2012/03/20 16:36:05 matt Exp $");
+__RCSID("$NetBSD: fmtmsg.c,v 1.6 2014/09/18 13:58:20 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include
@@ -213,7 +213,7 @@ fmtmsg(long classification, const char *
}
/* Similar to MM_PRINT but ignoring $MSGVERB. */
if (classification & MM_CONSOLE) {
- if ((console = fopen(_PATH_CONSOLE, "w")) != NULL) {
+ if ((console = fopen(_PATH_CONSOLE, "we")) != NULL) {
if (writeit(console, MM_VERBALL,
label, sevstr, text, action, tag) < 0)
result |= MM_NOCON;
Index: src/lib/libc/gen/fts.c
diff -u src/lib/libc/gen/fts.c:1.46 src/lib/libc/gen/fts.c:1.47
--- src/lib/libc/gen/fts.c:1.46 Wed Sep 26 11:33:43 2012
+++ src/lib/libc/gen/fts.c Thu Sep 18 09:58:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fts.c,v 1.46 2012/09/26 15:33:43 msaitoh Exp $ */
+/* $NetBSD: fts.c,v 1.47 2014/09/18 13:58:20 christos Exp $ */
/*-
* Copyright (c) 1990, 1993, 1994
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94";
#else
-__RCSID("$NetBSD: fts.c,v 1.46 2012/09/26 15:33:43 msaitoh Exp $");
+__RCSID("$NetBSD: fts.c,v 1.47 2014/09/18 13:58:20 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -601,7 +601,7 @@ fts_children(FTS *sp, int instr)
ISSET(FTS_NOCHDIR))
return (sp->fts_child = fts_build(sp, instr));
- if ((fd = open(".", O_RDONLY, 0)) == -1)
+ if ((fd = open(".", O_RDONLY | O_CLOEXEC, 0)) == -1)
return (sp->fts_child = NULL);
sp->fts_child = fts_build(sp, instr);
if (fchdir(fd)) {
@@ -1211,7 +1211,7 @@ fts_safe_changedir(const FTS *sp, const
if (ISSET(FTS_NOCHDIR))
return 0;
- if (oldfd < 0 && (fd = open(path, O_RDONLY)) == -1)
+ if (oldfd < 0 && (fd = open(path, O_RDONLY | O_CLOEXEC)) == -1)
return -1;
if (fstat(fd, &sb) == -1)
Index: src/lib/libc/gen/getcap.c
diff -u src/lib/libc/gen/getcap.c:1.53 src/lib/libc/gen/getcap.c:1.54
--- src/lib/libc/gen/getcap.c:1.53 Thu Jun 26 16:14:32 2014
+++ src/lib/libc/gen/getcap.c Thu Sep 18 09:58:20 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: getcap.c,v 1.53 2014/06/26 20:14:32 christos Exp $ */
+/* $NetBSD: getcap.c,v 1.54 2014/09/18 13:58:20 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)getcap.c 8.3 (Berkeley) 3/25/94";
#else
-__RCSID("$NetBSD: getcap.c,v 1.53 2014/06/26 20:14:32 christos Exp $");
+__RCSID("$NetBSD: getcap.c,v 1.54 2014/09/18 13:58:20 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -322,8 +322,8 @@ getent(char **cap, size_t *len, const ch
size_t clen;
(void)snprintf(pbuf, sizeof(pbuf), "%s.db", *db_p);
- if ((capdbp = dbopen(pbuf, O_RDO
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src Committed By: martin Date: Thu Sep 18 10:25:33 UTC 2014 Modified Files: src/sys/dev/pci [netbsd-7]: agp_i810.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #94): sys/dev/pci/agp_i810.c: revision 1.113 sys/dev/pci/agp_i810.c: revision 1.114 Revert to mapping the whole GTTMMADR region all at once for now and use the right BAR for MMIO register sizing on i810. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.112.2.1 src/sys/dev/pci/agp_i810.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/agp_i810.c diff -u src/sys/dev/pci/agp_i810.c:1.112 src/sys/dev/pci/agp_i810.c:1.112.2.1 --- src/sys/dev/pci/agp_i810.c:1.112 Fri Jul 25 23:05:54 2014 +++ src/sys/dev/pci/agp_i810.c Thu Sep 18 10:25:33 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: agp_i810.c,v 1.112 2014/07/25 23:05:54 riastradh Exp $ */ +/* $NetBSD: agp_i810.c,v 1.112.2.1 2014/09/18 10:25:33 martin Exp $ */ /*- * Copyright (c) 2000 Doug Rabson @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.112 2014/07/25 23:05:54 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: agp_i810.c,v 1.112.2.1 2014/09/18 10:25:33 martin Exp $"); #include #include @@ -405,7 +405,9 @@ agp_i810_attach(device_t parent, device_ apbase = AGP_I965_GMADR; mmadr_bar = AGP_I965_MMADR; mmadr_type |= PCI_MAPREG_MEM_TYPE_64BIT; - isc->size = 512*1024; + if (pci_mapreg_info(isc->vga_pa.pa_pc, isc->vga_pa.pa_tag, + AGP_I965_MMADR, mmadr_type, NULL, &isc->size, NULL)) + isc->size = 512*1024; /* XXX */ gtt_bar = 0; gtt_off = AGP_I965_GTT; break; @@ -413,14 +415,18 @@ agp_i810_attach(device_t parent, device_ apbase = AGP_I965_GMADR; mmadr_bar = AGP_I965_MMADR; mmadr_type |= PCI_MAPREG_MEM_TYPE_64BIT; - isc->size = 512*1024; + if (pci_mapreg_info(isc->vga_pa.pa_pc, isc->vga_pa.pa_tag, + AGP_I965_MMADR, mmadr_type, NULL, &isc->size, NULL)) + isc->size = 512*1024; /* XXX */ gtt_bar = 0; gtt_off = AGP_G4X_GTT; break; default: apbase = AGP_I810_GMADR; mmadr_bar = AGP_I810_MMADR; - isc->size = 512*1024; + if (pci_mapreg_info(isc->vga_pa.pa_pc, isc->vga_pa.pa_tag, + AGP_I810_MMADR, mmadr_type, NULL, &isc->size, NULL)) + isc->size = 512*1024; /* XXX */ gtt_bar = 0; gtt_off = AGP_I810_GTT; break;
CVS commit: src/usr.bin/make
Module Name:src
Committed By: dholland
Date: Thu Sep 18 08:06:13 UTC 2014
Modified Files:
src/usr.bin/make: parse.c
Log Message:
Comments, and one very minor tidyup.
To generate a diff of this commit:
cvs rdiff -u -r1.203 -r1.204 src/usr.bin/make/parse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.203 src/usr.bin/make/parse.c:1.204
--- src/usr.bin/make/parse.c:1.203 Sun Sep 7 20:55:34 2014
+++ src/usr.bin/make/parse.c Thu Sep 18 08:06:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: parse.c,v 1.203 2014/09/07 20:55:34 joerg Exp $ */
+/* $NetBSD: parse.c,v 1.204 2014/09/18 08:06:13 dholland Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,14 +69,14 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: parse.c,v 1.203 2014/09/07 20:55:34 joerg Exp $";
+static char rcsid[] = "$NetBSD: parse.c,v 1.204 2014/09/18 08:06:13 dholland Exp $";
#else
#include
#ifndef lint
#if 0
static char sccsid[] = "@(#)parse.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: parse.c,v 1.203 2014/09/07 20:55:34 joerg Exp $");
+__RCSID("$NetBSD: parse.c,v 1.204 2014/09/18 08:06:13 dholland Exp $");
#endif
#endif /* not lint */
#endif
@@ -1193,7 +1193,17 @@ ParseDoDependency(char *line)
curTargs = Lst_Init(FALSE);
+/*
+ * First, grind through the targets.
+ */
+
do {
+ /*
+ * Here LINE points to the beginning of the next word, and
+ * LSTART points to the actual beginning of the line.
+ */
+
+ /* Find the end of the next word. */
for (cp = line; *cp && (ParseIsEscaped(lstart, cp) ||
!(isspace((unsigned char)*cp) ||
*cp == '!' || *cp == ':' || *cp == LPAREN));
@@ -1216,6 +1226,10 @@ ParseDoDependency(char *line)
}
}
+ /*
+ * If the word is followed by a left parenthesis, it's the
+ * name of an object file inside an archive (ar file).
+ */
if (!ParseIsEscaped(lstart, cp) && *cp == LPAREN) {
/*
* Archives must be handled specially to make sure the OP_ARCHV
@@ -1232,13 +1246,16 @@ ParseDoDependency(char *line)
"Error in archive specification: \"%s\"", line);
goto out;
} else {
+ /* Done with this word; on to the next. */
continue;
}
}
- savec = *cp;
if (!*cp) {
/*
+ * We got to the end of the line while we were still
+ * looking at targets.
+ *
* Ending a dependency line without an operator is a Bozo
* no-no. As a heuristic, this is also often triggered by
* undetected conflicts from cvs/rcs merges.
@@ -1253,10 +1270,13 @@ ParseDoDependency(char *line)
: "Need an operator");
goto out;
}
+
+ /* Insert a null terminator. */
+ savec = *cp;
*cp = '\0';
/*
- * Have a word in line. See if it's a special target and set
+ * Got the word. See if it's a special target and if so set
* specType to match it.
*/
if (*line == '.' && isupper ((unsigned char)line[1])) {
@@ -1395,6 +1415,8 @@ ParseDoDependency(char *line)
(void)Lst_AtEnd(curTargs, line);
}
+ /* Apply the targets. */
+
while(!Lst_IsEmpty(curTargs)) {
char *targName = (char *)Lst_DeQueue(curTargs);
@@ -1412,7 +1434,9 @@ ParseDoDependency(char *line)
Parse_Error(PARSE_WARNING, "Extra target (%s) ignored", line);
}
+ /* Don't need the inserted null terminator any more. */
*cp = savec;
+
/*
* If it is a special type and not .PATH, it's the only target we
* allow on this line...
@@ -1488,12 +1512,21 @@ ParseDoDependency(char *line)
goto out;
}
-cp++; /* Advance beyond operator */
+/* Advance beyond the operator */
+cp++;
+/*
+ * Apply the operator to the target. This is how we remember which
+ * operator a target was defined with. It fails if the operator
+ * used isn't consistent across all references.
+ */
Lst_ForEach(targets, ParseDoOp, &op);
/*
- * Get to the first source
+ * Onward to the sources.
+ *
+ * LINE will now point to the first source word, if any, or the
+ * end of the string if not.
*/
while (*cp && isspace ((unsigned char)*cp)) {
cp++;
