CVS commit: src/sys/compat/linux/arch
Module Name:src
Committed By: njoly
Date: Sat May 31 08:51:19 UTC 2014
Modified Files:
src/sys/compat/linux/arch/amd64: syscalls.master
src/sys/compat/linux/arch/arm: syscalls.master
src/sys/compat/linux/arch/i386: syscalls.master
src/sys/compat/linux/arch/m68k: syscalls.master
src/sys/compat/linux/arch/mips: syscalls.master
src/sys/compat/linux/arch/powerpc: syscalls.master
Log Message:
Fix munmap(2) signature.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/compat/linux/arch/amd64/syscalls.master
cvs rdiff -u -r1.60 -r1.61 src/sys/compat/linux/arch/arm/syscalls.master
cvs rdiff -u -r1.117 -r1.118 src/sys/compat/linux/arch/i386/syscalls.master
cvs rdiff -u -r1.87 -r1.88 src/sys/compat/linux/arch/m68k/syscalls.master
cvs rdiff -u -r1.55 -r1.56 src/sys/compat/linux/arch/mips/syscalls.master
cvs rdiff -u -r1.64 -r1.65 src/sys/compat/linux/arch/powerpc/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.51 src/sys/compat/linux/arch/amd64/syscalls.master:1.52
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.51 Thu May 29 10:35:26 2014
+++ src/sys/compat/linux/arch/amd64/syscalls.master Sat May 31 08:51:19 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.51 2014/05/29 10:35:26 njoly Exp $
+ $NetBSD: syscalls.master,v 1.52 2014/05/31 08:51:19 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -85,7 +85,7 @@
linux_off_t offset); }
10 STD { int|linux_sys||mprotect(const void *start, \
unsigned long len, int prot); }
-11 NOARGS { int|sys||munmap(void *addr, int len); }
+11 NOARGS { int|sys||munmap(void *addr, size_t len); }
12 STD { int|linux_sys||brk(char *nsize); }
13 STD { int|linux_sys||rt_sigaction(int signum, \
const struct linux_sigaction *nsa, \
Index: src/sys/compat/linux/arch/arm/syscalls.master
diff -u src/sys/compat/linux/arch/arm/syscalls.master:1.60 src/sys/compat/linux/arch/arm/syscalls.master:1.61
--- src/sys/compat/linux/arch/arm/syscalls.master:1.60 Thu May 29 10:35:27 2014
+++ src/sys/compat/linux/arch/arm/syscalls.master Sat May 31 08:51:19 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.60 2014/05/29 10:35:27 njoly Exp $
+ $NetBSD: syscalls.master,v 1.61 2014/05/31 08:51:19 njoly Exp $
; Derived from sys/compat/linux/arch/*/syscalls.master
; and from Linux 2.4.12 arch/arm/kernel/calls.S
@@ -177,7 +177,7 @@
89 STD { int|linux_sys||readdir(int fd, void *dent, \
unsigned int count); }
90 STD { int|linux_sys||old_mmap(struct linux_oldmmap *lmp); }
-91 NOARGS { int|sys||munmap(void *addr, int len); }
+91 NOARGS { int|sys||munmap(void *addr, size_t len); }
92 NOARGS { int|compat_43_sys||truncate(const char *path, \
long length); }
93 NOARGS { int|compat_43_sys||ftruncate(int fd, long length); }
Index: src/sys/compat/linux/arch/i386/syscalls.master
diff -u src/sys/compat/linux/arch/i386/syscalls.master:1.117 src/sys/compat/linux/arch/i386/syscalls.master:1.118
--- src/sys/compat/linux/arch/i386/syscalls.master:1.117 Thu May 29 10:35:27 2014
+++ src/sys/compat/linux/arch/i386/syscalls.master Sat May 31 08:51:19 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.117 2014/05/29 10:35:27 njoly Exp $
+ $NetBSD: syscalls.master,v 1.118 2014/05/31 08:51:19 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -178,7 +178,7 @@
89 STD { int|linux_sys||readdir(int fd, void *dent, \
unsigned int count); }
90 STD { int|linux_sys||old_mmap(struct linux_oldmmap *lmp); }
-91 NOARGS { int|sys||munmap(void *addr, int len); }
+91 NOARGS { int|sys||munmap(void *addr, size_t len); }
92 NOARGS { int|compat_43_sys||truncate(const char *path, \
long length); }
93 NOARGS { int|compat_43_sys||ftruncate(int fd, long length); }
Index: src/sys/compat/linux/arch/m68k/syscalls.master
diff -u src/sys/compat/linux/arch/m68k/syscalls.master:1.87 src/sys/compat/linux/arch/m68k/syscalls.master:1.88
--- src/sys/compat/linux/arch/m68k/syscalls.master:1.87 Thu May 29 10:35:27 2014
+++ src/sys/compat/linux/arch/m68k/syscalls.master Sat May 31 08:51:19 2014
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.87 2014/05/29 10:35:27 njoly Exp $
+ $NetBSD: syscalls.master,v 1.88 2014/05/31 08:51:19 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -193,7 +193,7 @@
89 STD { int|linux_sys||readdir(int fd, void *dent, \
unsigned int count); }
90 STD { int|linux_sys||old_mmap(struct linux_oldmmap *lmp); }
-91 NOARGS { int|sys||munmap(void *addr, int len); }
+91 NOARGS { int|sys||munmap(void *addr, size_t len); }
92 NOARGS { int|compat_43_sys||truncate(const char *path, \
long length); }
#if !defined(_KERNEL) || defined(COMPAT_43)
Index: src/sys/compat/linux/arch/mips/syscalls.master
diff -u
CVS commit: src/sys/compat/linux/arch
Module Name:src Committed By: njoly Date: Sat May 31 08:52:55 UTC 2014 Modified Files: src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/arm: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/i386: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/m68k: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/mips: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c src/sys/compat/linux/arch/powerpc: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c Log Message: Regen for munmap(2) signature. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/sys/compat/linux/arch/amd64/linux_syscall.h \ src/sys/compat/linux/arch/amd64/linux_syscallargs.h \ src/sys/compat/linux/arch/amd64/linux_syscalls.c \ src/sys/compat/linux/arch/amd64/linux_sysent.c cvs rdiff -u -r1.63 -r1.64 src/sys/compat/linux/arch/arm/linux_syscall.h \ src/sys/compat/linux/arch/arm/linux_syscallargs.h \ src/sys/compat/linux/arch/arm/linux_syscalls.c \ src/sys/compat/linux/arch/arm/linux_sysent.c cvs rdiff -u -r1.102 -r1.103 src/sys/compat/linux/arch/i386/linux_syscall.h \ src/sys/compat/linux/arch/i386/linux_syscallargs.h \ src/sys/compat/linux/arch/i386/linux_sysent.c cvs rdiff -u -r1.103 -r1.104 src/sys/compat/linux/arch/i386/linux_syscalls.c cvs rdiff -u -r1.93 -r1.94 src/sys/compat/linux/arch/m68k/linux_syscall.h \ src/sys/compat/linux/arch/m68k/linux_syscalls.c \ src/sys/compat/linux/arch/m68k/linux_sysent.c cvs rdiff -u -r1.92 -r1.93 src/sys/compat/linux/arch/m68k/linux_syscallargs.h cvs rdiff -u -r1.60 -r1.61 src/sys/compat/linux/arch/mips/linux_syscall.h cvs rdiff -u -r1.59 -r1.60 src/sys/compat/linux/arch/mips/linux_syscallargs.h \ src/sys/compat/linux/arch/mips/linux_syscalls.c \ src/sys/compat/linux/arch/mips/linux_sysent.c cvs rdiff -u -r1.69 -r1.70 src/sys/compat/linux/arch/powerpc/linux_syscall.h \ src/sys/compat/linux/arch/powerpc/linux_sysent.c cvs rdiff -u -r1.68 -r1.69 \ src/sys/compat/linux/arch/powerpc/linux_syscallargs.h \ src/sys/compat/linux/arch/powerpc/linux_syscalls.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/compat/linux/arch/amd64/linux_syscall.h diff -u src/sys/compat/linux/arch/amd64/linux_syscall.h:1.53 src/sys/compat/linux/arch/amd64/linux_syscall.h:1.54 --- src/sys/compat/linux/arch/amd64/linux_syscall.h:1.53 Thu May 29 10:36:31 2014 +++ src/sys/compat/linux/arch/amd64/linux_syscall.h Sat May 31 08:52:54 2014 @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscall.h,v 1.53 2014/05/29 10:36:31 njoly Exp $ */ +/* $NetBSD: linux_syscall.h,v 1.54 2014/05/31 08:52:54 njoly Exp $ */ /* * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.51 2014/05/29 10:35:26 njoly Exp + * created from NetBSD: syscalls.master,v 1.52 2014/05/31 08:51:19 njoly Exp */ #ifndef _LINUX_SYS_SYSCALL_H_ @@ -45,7 +45,7 @@ /* syscall: mprotect ret: int args: const void * unsigned long int */ #define LINUX_SYS_mprotect 10 -/* syscall: munmap ret: int args: void * int */ +/* syscall: munmap ret: int args: void * size_t */ #define LINUX_SYS_munmap 11 /* syscall: brk ret: int args: char * */ Index: src/sys/compat/linux/arch/amd64/linux_syscallargs.h diff -u src/sys/compat/linux/arch/amd64/linux_syscallargs.h:1.53 src/sys/compat/linux/arch/amd64/linux_syscallargs.h:1.54 --- src/sys/compat/linux/arch/amd64/linux_syscallargs.h:1.53 Thu May 29 10:36:31 2014 +++ src/sys/compat/linux/arch/amd64/linux_syscallargs.h Sat May 31 08:52:54 2014 @@ -1,10 +1,10 @@ -/* $NetBSD: linux_syscallargs.h,v 1.53 2014/05/29 10:36:31 njoly Exp $ */ +/* $NetBSD: linux_syscallargs.h,v 1.54 2014/05/31 08:52:54 njoly Exp $ */ /* * System call argument lists. * * DO NOT EDIT-- this file is automatically generated. - * created from NetBSD: syscalls.master,v 1.51 2014/05/29 10:35:26 njoly Exp + * created from NetBSD: syscalls.master,v 1.52 2014/05/31 08:51:19 njoly Exp */ #ifndef _LINUX_SYS_SYSCALLARGS_H_ Index: src/sys/compat/linux/arch/amd64/linux_syscalls.c diff -u src/sys/compat/linux/arch/amd64/linux_syscalls.c:1.53 src/sys/compat/linux/arch/amd64/linux_syscalls.c:1.54 --- src/sys/compat/linux/arch/amd64/linux_syscalls.c:1.53 Thu May 29 10:36:31 2014 +++ src/sys/compat/linux/arch/amd64/linux_syscalls.c Sat May 31 08:52:54 2014 @@ -1,14 +1,14 @@ -/* $NetBSD: linux_syscalls.c,v 1.53 2014/05/29 10:36:31 njoly Exp $ */ +/* $NetBSD: linux_syscalls.c,v 1.54 2014/05/31 08:52:54 njoly Exp $ */ /* * System call names. * * DO NOT EDIT-- this
CVS commit: src/distrib/common
Module Name:src
Committed By: martin
Date: Sat May 31 10:18:47 UTC 2014
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
Add a variable CDMAKEFSEXTRAOPTS to provide additional parameters to the
makefs invocation that do not belong in the image option list (CDMAKEFSOPTIONS)
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/distrib/common/Makefile.bootcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.24 src/distrib/common/Makefile.bootcd:1.25
--- src/distrib/common/Makefile.bootcd:1.24 Sat Feb 15 09:43:02 2014
+++ src/distrib/common/Makefile.bootcd Sat May 31 10:18:47 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.24 2014/02/15 09:43:02 dsl Exp $
+# $NetBSD: Makefile.bootcd,v 1.25 2014/05/31 10:18:47 martin Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -25,6 +25,7 @@
# BOOTXX_CD9660 Defaults to $DESTDIR/usr/mdec/bootxx_cd9660
# CDBOOTOPTIONS Options for installboot, eg -o console=com0,speed=9600
# CDMAKEFSOPTIONS Options for makefs, eg bootimage=i386;bootxx,no-emul-boot
+# CDMAKEFSEXTRAOPTS additional options for makefs, e.g. -F specfile
# CDROMS_RELEASEDIR Where to install ${CDBASE}.iso
# CDINSTKERNEL instkernel directory (relative to ${.CURDIR})
# CDKERNELS couples of the form:
@@ -206,7 +207,7 @@ copy-releasedir:
fi
image:
- ${TOOL_MAKEFS} -t cd9660 -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
+ ${TOOL_MAKEFS} -t cd9660 ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} ${CDIMAGE} cdrom
.if ${CDRELEASE} == false
release: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image_md_pre .WAIT image .WAIT image_md_post
CVS commit: src/distrib/vax/cdroms/installcd
Module Name:src
Committed By: martin
Date: Sat May 31 10:43:00 UTC 2014
Modified Files:
src/distrib/vax/cdroms/installcd: Makefile
Log Message:
Instead of running MAKEDEV inside the image content dir (which would only
work for root), make it emit a mtree spec file and pass that to makefs.
This should also work for unprivileged builds.
Problem pointed out by Izumi Tsutsui.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/distrib/vax/cdroms/installcd/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/vax/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.5 src/distrib/vax/cdroms/installcd/Makefile:1.6
--- src/distrib/vax/cdroms/installcd/Makefile:1.5 Fri May 30 13:24:22 2014
+++ src/distrib/vax/cdroms/installcd/Makefile Sat May 31 10:43:00 2014
@@ -1,8 +1,11 @@
-# $NetBSD: Makefile,v 1.5 2014/05/30 13:24:22 martin Exp $
+# $NetBSD: Makefile,v 1.6 2014/05/31 10:43:00 martin Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
CDRELEASE_NOISOS=true
+CDMAKEFSEXTRAOPTS+=-F ./fs.spec
+
+CLEANFILES+= fs.spec
# for PRINTOBJDIR
.include bsd.own.mk
@@ -29,7 +32,9 @@ image_md_pre:
${INSTALL} ${COPY} $$f cdrom; \
done
${TOOL_GZIP} -d cdrom/netbsd.gz
- (cd cdrom/dev ${HOST_SH} ./MAKEDEV all)
+ echo '. type=dir optional' ./fs.spec
+ echo './dev type=dir optional' ./fs.spec
+ ${HOST_SH} cdrom/dev/MAKEDEV -s all | ${TOOL_SED} -e '1d' -e 's:^\./:./dev/:' ./fs.spec
${MKDIR} cdrom/var
${MKDIR} cdrom/kern
CVS commit: src/share/examples/npf
Module Name:src
Committed By: spz
Date: Sat May 31 11:54:37 UTC 2014
Modified Files:
src/share/examples/npf: host-npf.conf
Log Message:
example for port remapping added
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/share/examples/npf/host-npf.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/npf/host-npf.conf
diff -u src/share/examples/npf/host-npf.conf:1.6 src/share/examples/npf/host-npf.conf:1.7
--- src/share/examples/npf/host-npf.conf:1.6 Sat Feb 8 01:32:19 2014
+++ src/share/examples/npf/host-npf.conf Sat May 31 11:54:37 2014
@@ -1,4 +1,4 @@
-# $NetBSD: host-npf.conf,v 1.6 2014/02/08 01:32:19 rmind Exp $
+# $NetBSD: host-npf.conf,v 1.7 2014/05/31 11:54:37 spz Exp $
#
# this is an example of NPF rules for a host (i.e., not routing) with
# two network interfaces, wired and wifi
@@ -31,6 +31,10 @@ procedure log {
log: npflog0
}
+# make a service running on a high port on 127.0.0.1 available on $wired_if
+# see also the pass rules below
+map $wired_if dynamic 127.0.0.1 port 8080 - $wired_v4 port 80
+
group wired on $wired_if {
# not being picky about our own address here
@@ -45,6 +49,11 @@ group wired on $wired_if {
pass in final family inet6 proto tcp to $wired_v6 port ssh
+ # the port mapping
+ # Note the filter sees packets before translation
+ pass in final family inet4 proto tcp from any to $wired_v4 port 80
+ pass out final family inet4 proto tcp from 127.0.0.1 port 8080 to any
+
pass in final family inet4 proto tcp flags S/SA \
from $backupsrv_v4 to $wired_v4 port $backup_port
pass in final family inet4 proto udp \
CVS commit: src/share/examples/npf
Module Name:src
Committed By: spz
Date: Sat May 31 12:33:14 UTC 2014
Modified Files:
src/share/examples/npf: l2tp_gw-npf.conf
Log Message:
- match up comment and interface identifiers
- use RFC5737 documentation prefixes
- use a variable for the RFC1918 private address ranges
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/share/examples/npf/l2tp_gw-npf.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/examples/npf/l2tp_gw-npf.conf
diff -u src/share/examples/npf/l2tp_gw-npf.conf:1.4 src/share/examples/npf/l2tp_gw-npf.conf:1.5
--- src/share/examples/npf/l2tp_gw-npf.conf:1.4 Tue May 27 23:34:43 2014
+++ src/share/examples/npf/l2tp_gw-npf.conf Sat May 31 12:33:14 2014
@@ -1,17 +1,19 @@
# ex0 - (internal) network interface
-# 192.168.2.254/24
-# hme0 - (external) connection to Two Sigma
-# 74.66.0.142/24
+# 192.0.2.254/24
+# hme0 - (external) connection to Peer
+# 198.51.100.142/24
-$int_if = sk0
-$ext_if = bge0
+$int_if = ex0
+$ext_if = hme0
+
+$private_addr = { 10.0.0.0/8, 172.16.0.0/14, 192.168.0.0/16 }
alg icmp
#
# NAT for all.
#
-map $ext_if dynamic 192.168.1.0/24 - inet4($ext_if)
+map $ext_if dynamic 192.0.2.0/24 - inet4($ext_if)
#table 1 type tree file /etc/npf_problem_sites
@@ -37,20 +39,15 @@ group external on $ext_if {
#
# Block IANA-reserved addresses from entering or exiting
#
- block in final from 10.0.0.0/8 apply log
- block in final from 172.16.0.0/12 apply log
- block in final from 192.168.0.0/16 apply log
- #
- block out final to 10.0.0.0/8 apply log
- block out final to 172.16.0.0/12 apply log
- block out final to 192.168.0.0/16 apply log
+ block in final from $private_addr apply log
+ block out final to $private_addr apply log
#
pass stateful out final proto tcp all
pass stateful out final proto udp all
pass stateful out final proto icmp all
pass stateful out final proto ipv6-icmp all
- block in final proto tcp to 192.168.2.255 apply log
+ block in final proto tcp to 192.0.2.255 apply log
#
# Prevent IP spoofing attacks on the firewall.
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3
Module Name:src
Committed By: christos
Date: Sat May 31 14:03:08 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
Log Message:
use weak symbols instead of linking against libpthread.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
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/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.12 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.13
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.12 Wed May 28 12:41:06 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Sat May 31 10:03:08 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2014/05/28 16:41:06 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2014/05/31 14:03:08 christos Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -12,8 +12,8 @@ LDADD= -lgcc_s
LIBDPLIBS+= m ${.CURDIR}/../../../../../lib/libm
-COPTS+= -pthread
-LDFLAGS+= -pthread
+#COPTS+= -pthread
+#LDFLAGS+= -pthread
UNSUPPORTED_COMPILER.clang= # defined
CWARNFLAGS.clang+= -Wno-logical-op-parentheses \
@@ -37,7 +37,7 @@ CXXFLAGS+= -fno-implicit-templates -fdia
CPPFLAGS+= -I${DIST}/libstdc++-v3/include
CPPFLAGS+= -I${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}
# include backwards compatible code
-CPPFLAGS+= -D_GLIBCXX_SHARED
+CPPFLAGS+= -D_GLIBCXX_SHARED -D_GLIBCXX_GTHREAD_USE_WEAK
CONF= ${DIST}/libstdc++-v3/config
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Sat May 31 14:31:02 UTC 2014 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: add new directory To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 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/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.105 src/etc/mtree/NetBSD.dist.tests:1.106 --- src/etc/mtree/NetBSD.dist.tests:1.105 Sat May 10 10:15:25 2014 +++ src/etc/mtree/NetBSD.dist.tests Sat May 31 10:31:01 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.105 2014/05/10 14:15:25 martin Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.106 2014/05/31 14:31:01 christos Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -166,6 +166,7 @@ ./usr/tests/bin/ps ./usr/tests/bin/sleep ./usr/tests/bin/sh +./usr/tests/bin/sh/dotcmd ./usr/tests/bin/tar ./usr/tests/crypto ./usr/tests/crypto/libcrypto
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: christos Date: Sat May 31 14:36:03 UTC 2014 Modified Files: src/distrib/sets/lists/tests: mi Log Message: new shell tests To generate a diff of this commit: cvs rdiff -u -r1.569 -r1.570 src/distrib/sets/lists/tests/mi 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.569 src/distrib/sets/lists/tests/mi:1.570 --- src/distrib/sets/lists/tests/mi:1.569 Thu May 15 12:32:28 2014 +++ src/distrib/sets/lists/tests/mi Sat May 31 10:36:03 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.569 2014/05/15 16:32:28 apb Exp $ +# $NetBSD: mi,v 1.570 2014/05/31 14:36:03 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -840,6 +840,202 @@ ./usr/tests/bin/sh/t_ulimit tests-bin-tests atf ./usr/tests/bin/sh/t_varquote tests-bin-tests atf ./usr/tests/bin/sh/t_wait tests-bin-tests atf +./usr/tests/bin/sh/dotcmd tests-bin-tests +./usr/tests/bin/sh/dotcmd/scopped_command tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/t_dotcmd tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out tests-bin-tests +./usr/tests/bin/sh/dotcmd/out/case_break_case.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_break_compound.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_break_file.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_break_for.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_break_func.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_break_subshell.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_break_until.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_break_while.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_continue_case.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_continue_compound.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_continue_file.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_continue_for.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_continue_func.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_continue_subshell.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_continue_until.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_continue_while.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_return_case.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_return_compound.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_return_file.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_return_for.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_return_func.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_return_subshell.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_return_until.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/case_return_while.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_break_case.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_break_compound.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_break_file.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_break_for.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_break_func.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_break_subshell.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_break_until.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_break_while.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_continue_case.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_continue_compound.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_continue_file.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_continue_for.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_continue_func.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_continue_subshell.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_continue_until.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_continue_while.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_return_case.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_return_compound.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_return_file.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_return_for.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_return_func.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_return_subshell.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_return_until.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/compound_return_while.out tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/out/file_break_case.out tests-bin-tests atf
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Sat May 31 14:36:53 UTC 2014 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: add one more directory. To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 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/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.106 src/etc/mtree/NetBSD.dist.tests:1.107 --- src/etc/mtree/NetBSD.dist.tests:1.106 Sat May 31 10:31:01 2014 +++ src/etc/mtree/NetBSD.dist.tests Sat May 31 10:36:53 2014 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.106 2014/05/31 14:31:01 christos Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.107 2014/05/31 14:36:53 christos Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -167,6 +167,7 @@ ./usr/tests/bin/sleep ./usr/tests/bin/sh ./usr/tests/bin/sh/dotcmd +./usr/tests/bin/sh/dotcmd/out ./usr/tests/bin/tar ./usr/tests/crypto ./usr/tests/crypto/libcrypto
CVS commit: src/bin/sh
Module Name:src
Committed By: christos
Date: Sat May 31 14:42:18 UTC 2014
Modified Files:
src/bin/sh: eval.c eval.h main.c sh.1
Log Message:
PR/48843: Jarmo Jaakkola: dot commands mess up scope nesting tracking
Evaluation of commands goes completely haywire if a file containing
a break/continue/return command outside its intended scope is sourced
using a dot command inside its intended scope. The main symptom is
not exiting from the sourced file when supposed to, leading to evaluation
of commands that were not supposed to be evaluated. A secondary symptom
is that these extra commands are not evaluated correctly, as some of them
are skipped. Some examples are listed in the How-To-Repeat section.
According to the POSIX standard, this is how it should work:
dot:
The shell shall execute commands from the file in the current
environment.
break:
The break utility shall exit from the smallest enclosing for, while,
or until loop, [...]
continue:
The continue utility shall return to the top of the smallest
enclosing for, while, or until loop, [...]
return:
The return utility shall cause the shell to stop executing
the current function or dot script. If the shell is not currently
executing a function or dot script, the results are unspecified.
It is clear that return should return from a sourced file, which
it does not do. Whether break and continue should work from the sourced
file might be debatable. Because the dot command says in the current
environment, I'd say yes. In any case, it should not fail in weird
ways like it does now!
The problems occur with return (a) and break/continue (b) because:
1) dotcmd() does not record the function nesting level prior to
sourcing the file nor does it touch the loopnest variable,
leading to either
2 a) returncmd() being unable to detect that it should not set
evalskip to SKIPFUNC but SKIPFILE, or
b) breakcmd() setting evalskip to SKIPCONT or SKIPBREAK,
leading to
3) cmdloop() not detecting that it should skip the rest of
the file, due to only checking for SKIPFILE.
The result is that cmdloop() keeps executing lines from the file
whilst evalskip is set, which is the main symptom. Because
evalskip is checked in multiple places in eval.c, the secondary
symptom appears.
How-To-Repeat:
Run the following script:
printf break\necho break1; echo break2 break
printf continue\necho continue1; echo continue2 continue
printf return\necho return1; echo return2 return
while true; do . ./break; done
for i in 1 2; do . ./continue; done
func() {
. ./return
}
func
No output should be produced, but instead this is the result:
break1
continue1
continue1
return1
The main symptom is evident from the unexpected output and the secondary
one from the fact that there are no lines with '2' in them.
Fix:
Here is patch to src/bin/sh to fix the above problems. It keeps
track of the function nesting level at the beginning of a dot command
to enable the return command to work properly.
I also changed the undefined-by-standard functionality of the return
command when it's not in a dot command or function from (indirectly)
exiting the shell to being silently ignored. This was done because
the previous way has at least one bug: the shell exits without asking
for confirmation when there are stopped jobs.
Because I read the standard to mean that break and continue should have
an effect outside the sourced file, that's how I implemented it. For what
it's worth, this also seems to be what bash does. Also laziness, because
this way required no changes to loopnesting tracking. If this is not
wanted, it might make sense to move the nesting tracking to the inputfile
stack.
The patch also does some clean-up to reduce the amount of global
variables by moving the dotcmd() and the find_dot_file() functions from
main.c to eval.c and making in_function() a proper function.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/bin/sh/eval.c
cvs rdiff -u -r1.15 -r1.16 src/bin/sh/eval.h
cvs rdiff -u -r1.57 -r1.58 src/bin/sh/main.c
cvs rdiff -u -r1.112 -r1.113 src/bin/sh/sh.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.108 src/bin/sh/eval.c:1.109
--- src/bin/sh/eval.c:1.108 Sun Jan 26 17:38:20 2014
+++ src/bin/sh/eval.c Sat May 31 10:42:18 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: eval.c,v 1.108 2014/01/26 22:38:20 christos Exp $ */
+/* $NetBSD: eval.c,v 1.109 2014/05/31 14:42:18 christos Exp $ */
/*-
* Copyright (c) 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = @(#)eval.c 8.9 (Berkeley) 6/8/95;
#else
-__RCSID($NetBSD: eval.c,v 1.108 2014/01/26 22:38:20 christos Exp $);
+__RCSID($NetBSD: eval.c,v 1.109
CVS commit: src/sys/arch/sgimips/conf
Module Name:src Committed By: macallan Date: Sat May 31 16:16:52 UTC 2014 Modified Files: src/sys/arch/sgimips/conf: std.sgimips64_32 Log Message: we don't need or want COMPAT_NETBSD32 in a 32bit kernel should cure pkgsrc MACHINE_ARCH mismatches To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sgimips/conf/std.sgimips64_32 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/sgimips/conf/std.sgimips64_32 diff -u src/sys/arch/sgimips/conf/std.sgimips64_32:1.1 src/sys/arch/sgimips/conf/std.sgimips64_32:1.2 --- src/sys/arch/sgimips/conf/std.sgimips64_32:1.1 Wed May 21 10:04:03 2014 +++ src/sys/arch/sgimips/conf/std.sgimips64_32 Sat May 31 16:16:52 2014 @@ -1,9 +1,10 @@ -# $NetBSD: std.sgimips64_32,v 1.1 2014/05/21 10:04:03 macallan Exp $ +# $NetBSD: std.sgimips64_32,v 1.2 2014/05/31 16:16:52 macallan Exp $ # this is for building n32 kernels no makeoptions MACHINE_ARCH makeoptions MACHINE_ARCH=mips64eb makeoptions LP64=no +# we do not need or want these in a 32bit kernel #options EXEC_ELF64 # exec ELF64 binaries -options COMPAT_NETBSD32 +#options COMPAT_NETBSD32
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: christos
Date: Sat May 31 16:25:29 UTC 2014
Modified Files:
src/sys/dev/pci: siside.c
Log Message:
PR/48858: Roy Bixler: siside0:0:1:0: lost interrupt, submitter claims this
makes the cdrom work.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/siside.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/siside.c
diff -u src/sys/dev/pci/siside.c:1.35 src/sys/dev/pci/siside.c:1.36
--- src/sys/dev/pci/siside.c:1.35 Sat May 24 18:14:26 2014
+++ src/sys/dev/pci/siside.c Sat May 31 12:25:29 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: siside.c,v 1.35 2014/05/24 22:14:26 abs Exp $ */
+/* $NetBSD: siside.c,v 1.36 2014/05/31 16:25:29 christos Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: siside.c,v 1.35 2014/05/24 22:14:26 abs Exp $);
+__KERNEL_RCSID(0, $NetBSD: siside.c,v 1.36 2014/05/31 16:25:29 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -158,7 +158,7 @@ static struct sis_hostbr_type {
{PCI_PRODUCT_SIS_740, 0x00, 5, 740, SIS_TYPE_SOUTH},
{PCI_PRODUCT_SIS_741, 0x00, 5, 741, SIS_TYPE_SOUTH},
{PCI_PRODUCT_SIS_745, 0x00, 5, 745, SIS_TYPE_100NEW},
- {PCI_PRODUCT_SIS_746, 0x00, 6, 746, SIS_TYPE_SOUTH},
+ {PCI_PRODUCT_SIS_746, 0x00, 6, 746, SIS_TYPE_100NEW},
{PCI_PRODUCT_SIS_748, 0x00, 6, 748, SIS_TYPE_SOUTH},
{PCI_PRODUCT_SIS_750, 0x00, 6, 750, SIS_TYPE_SOUTH},
{PCI_PRODUCT_SIS_751, 0x00, 6, 751, SIS_TYPE_SOUTH},
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Sat May 31 18:22:29 UTC 2014 Modified Files: src/sys/arch/sparc64/sparc64: locore.s Log Message: sun4v: added missing dtsb miss handling for trap level 1 - with this update the kernel now reaches configure() on sun4v systems To generate a diff of this commit: cvs rdiff -u -r1.359 -r1.360 src/sys/arch/sparc64/sparc64/locore.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/sparc64/sparc64/locore.s diff -u src/sys/arch/sparc64/sparc64/locore.s:1.359 src/sys/arch/sparc64/sparc64/locore.s:1.360 --- src/sys/arch/sparc64/sparc64/locore.s:1.359 Fri May 30 21:55:32 2014 +++ src/sys/arch/sparc64/sparc64/locore.s Sat May 31 18:22:29 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.359 2014/05/30 21:55:32 palle Exp $ */ +/* $NetBSD: locore.s,v 1.360 2014/05/31 18:22:29 palle Exp $ */ /* * Copyright (c) 2006-2010 Matthew R. Green @@ -893,7 +893,7 @@ TABLE(syscall): .macro sun4v_trap_entry count .rept \count - ba,a,pt %xcc, slowtrap + ba slowtrap nop .align 32 .endr @@ -921,7 +921,7 @@ _C_LABEL(trapbase_sun4v): ! trap level 0 ! sun4v_trap_entry 49! 0x000-0x030 - VTRAP(T_DATA_MMU_MISS, sun4v_tl0_dtsb_miss) ! 0x031 = data MMU miss + VTRAP(T_DATA_MMU_MISS, sun4v_dtsb_miss) ! 0x031 = data MMU miss sun4v_trap_entry 78! 0x032-0x07f SPILL64(uspill8_sun4v,ASI_AIUS) ! 0x080 spill_0_normal -- used to save user windows in user mode SPILL32(uspill4_sun4v,ASI_AIUS) ! 0x084 spill_1_normal @@ -959,7 +959,9 @@ _C_LABEL(trapbase_sun4v): ! ! trap level 1 ! - sun4v_trap_entry_fail 512 ! 0x000-0x1ff + sun4v_trap_entry_fail 49 ! 0x000-0x030 + VTRAP(T_DATA_MMU_MISS, sun4v_dtsb_miss) ! 0x031 = data MMU miss + sun4v_trap_entry_fail 462 ! 0x032-0x1ff #endif @@ -2562,13 +2564,13 @@ text_error: * Traps for sun4v. */ -sun4v_tl0_dtsb_miss: +sun4v_dtsb_miss: GET_MMFSA %g1! MMU Fault status area - add %g1, 0x48, %g3 + add %g1, 0x48, %g3 LDPTRA [%g3] ASI_PHYS_CACHED, %g3 ! Data fault address - add %g1, 0x50, %g6 + add %g1, 0x50, %g6 LDPTRA [%g6] ASI_PHYS_CACHED, %g6 ! Data fault context - + GET_CTXBUSY %g4 sllx %g6, 3, %g6 ! Make it into an offset into ctxbusy LDPTR [%g4 + %g6], %g4 ! Load up our page table. @@ -2628,17 +2630,27 @@ sun4v_tl0_dtsb_miss: add %g2, %g3, %g2 ! location of TTE in ci_tsb_dmmu membar #StoreStore - + STPTR %g4, [%g2 + 8] ! store TTE data STPTR %g1, [%g2] ! store TTE tag retry NOTREACHED -sun4v_datatrap: +sun4v_datatrap: ! branch further based on trap level + rdpr %tl, %g1 + dec %g1 + beq sun4v_datatrap_tl0 + nop + ba sun4v_datatrap_tl1 + nop +sun4v_datatrap_tl0: /* XXX missing implementaion */ sir - +sun4v_datatrap_tl1: + /* XXX missing implementaion */ + sir + /* * End of traps for sun4v. */
CVS commit: src/sys/arch/sparc64/doc
Module Name:src Committed By: palle Date: Sat May 31 18:27:03 UTC 2014 Modified Files: src/sys/arch/sparc64/doc: TODO Log Message: Updated TODO with relevant things to fix on sun4v To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/sparc64/doc/TODO 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/sparc64/doc/TODO diff -u src/sys/arch/sparc64/doc/TODO:1.2 src/sys/arch/sparc64/doc/TODO:1.3 --- src/sys/arch/sparc64/doc/TODO:1.2 Fri Feb 21 18:00:09 2014 +++ src/sys/arch/sparc64/doc/TODO Sat May 31 18:27:03 2014 @@ -1,4 +1,4 @@ - /* $NetBSD: TODO,v 1.2 2014/02/21 18:00:09 palle Exp $ */ + /* $NetBSD: TODO,v 1.3 2014/05/31 18:27:03 palle Exp $ */ Things to be done: @@ -9,4 +9,5 @@ sun4v: - 32-bit kernel support - libkvm - ofwboot: tlb_init_sun4v() hardcodes number of slots to 64 -- sun4v_datatrap: missing implementation +- locore.s: sun4v_datatrap missing implementation for trap levels 0 and 1 +- pmap.c: pmap_calculate_colors() should known about sun4v
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3
Module Name:src
Committed By: christos
Date: Sat May 31 20:09:15 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
Log Message:
Add different defines to force weak pthread symbols.
XXX: I think these should be generated automatically.
XXX[2]: Why:
gthr-default.h - $NETBSDSRCDIR/external/gpl3/gcc/dist/libgcc/gthr-posix.h
and wes still have old arch/*/gthr* files?
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
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/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.13 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.14
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.13 Sat May 31 10:03:08 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Sat May 31 16:09:15 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2014/05/31 14:03:08 christos Exp $
+# $NetBSD: Makefile,v 1.14 2014/05/31 20:09:15 christos Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -37,7 +37,7 @@ CXXFLAGS+= -fno-implicit-templates -fdia
CPPFLAGS+= -I${DIST}/libstdc++-v3/include
CPPFLAGS+= -I${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}
# include backwards compatible code
-CPPFLAGS+= -D_GLIBCXX_SHARED -D_GLIBCXX_GTHREAD_USE_WEAK
+CPPFLAGS+= -D_GLIBCXX_SHARED -DGTHREAD_USE_WEAK -DSUPPORTS_WEAK
CONF= ${DIST}/libstdc++-v3/config
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: christos Date: Sat May 31 20:26:51 UTC 2014 Modified Files: src/distrib/sets/lists/tests: mi Log Message: add missing files for dotcmd tests To generate a diff of this commit: cvs rdiff -u -r1.570 -r1.571 src/distrib/sets/lists/tests/mi 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.570 src/distrib/sets/lists/tests/mi:1.571 --- src/distrib/sets/lists/tests/mi:1.570 Sat May 31 10:36:03 2014 +++ src/distrib/sets/lists/tests/mi Sat May 31 16:26:51 2014 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.570 2014/05/31 14:36:03 christos Exp $ +# $NetBSD: mi,v 1.571 2014/05/31 20:26:51 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -841,8 +841,143 @@ ./usr/tests/bin/sh/t_varquote tests-bin-tests atf ./usr/tests/bin/sh/t_wait tests-bin-tests atf ./usr/tests/bin/sh/dotcmd tests-bin-tests -./usr/tests/bin/sh/dotcmd/scopped_command tests-bin-tests atf -./usr/tests/bin/sh/dotcmd/t_dotcmd tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/Atffile tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/break_case tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/break_compound tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/break_file tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/break_for tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/break_func tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/break_subshell tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/break_until tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/break_while tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_break_case tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_break_compound tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_break_file tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_break_for tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_break_func tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_break_subshell tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_break_until tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_break_while tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_continue_case tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_continue_compound tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_continue_file tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_continue_for tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_continue_func tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_continue_subshell tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_continue_until tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_continue_while tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_return_case tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_return_compound tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_return_file tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_return_for tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_return_func tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_return_subshell tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_return_until tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/case_return_while tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_break_case tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_break_compound tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_break_file tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_break_for tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_break_func tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_break_subshell tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_break_until tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_break_while tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_continue_case tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_continue_compound tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_continue_file tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_continue_for tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_continue_func tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_continue_subshell tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_continue_until tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_continue_while tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_return_case tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_return_compound tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_return_file tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_return_for tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_return_func tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_return_subshell tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_return_until tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/compound_return_while tests-bin-tests atf +./usr/tests/bin/sh/dotcmd/continue_case
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: rmind
Date: Sat May 31 22:37:05 UTC 2014
Modified Files:
src/usr.sbin/npf/npfctl: npf_scan.l
Log Message:
npfctl: allow group of zeroes in IPv6 address; noted by spz@.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.sbin/npf/npfctl/npf_scan.l
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf_scan.l
diff -u src/usr.sbin/npf/npfctl/npf_scan.l:1.20 src/usr.sbin/npf/npfctl/npf_scan.l:1.21
--- src/usr.sbin/npf/npfctl/npf_scan.l:1.20 Fri Mar 14 11:29:45 2014
+++ src/usr.sbin/npf/npfctl/npf_scan.l Sat May 31 22:37:05 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_scan.l,v 1.20 2014/03/14 11:29:45 rmind Exp $ */
+/* $NetBSD: npf_scan.l,v 1.21 2014/05/31 22:37:05 rmind Exp $ */
/*-
* Copyright (c) 2011-2012 The NetBSD Foundation, Inc.
@@ -84,6 +84,7 @@ npfctl_parse_string(const char *str)
ID [a-zA-Z_][a-zA-Z_0-9]*
DID [a-zA-Z_][a-zA-Z_0-9-]*
NUMBER [0-9]+
+HEXDIG [0-9a-fA-F]+
%%
alg return ALG;
@@ -151,7 +152,7 @@ any return ANY;
, return COMMA;
= return EQ;
-0x[0-9a-fA-F]+ {
+0x{HEXDIG} {
char *endp, *buf = ecalloc(1, yyleng + 1);
buf[yyleng] = 0;
yylval.num = strtoul(buf+2, endp, 16);
@@ -166,7 +167,12 @@ any return ANY;
return FPNUM;
}
-[0-9a-fA-F]+:[0-9a-fA-F:]* {
+{HEXDIG}:[0-9a-fA-F:]* {
+ yylval.str = estrndup(yytext, yyleng);
+ return IPV6ADDR;
+ }
+
+::{HEXDIG}[0-9a-fA-F:]* {
yylval.str = estrndup(yytext, yyleng);
return IPV6ADDR;
}
CVS commit: [LLVM] src/external/bsd/llvm/dist/clang
Module Name:src Committed By: joerg Date: Sat May 31 22:40:33 UTC 2014 Removed Files: src/external/bsd/llvm/dist/clang/include/clang/Analysis/FlowSensitive [LLVM]: DataflowSolver.h src/external/bsd/llvm/dist/clang/include/clang/Basic [LLVM]: OnDiskHashTable.h OpenCL.h src/external/bsd/llvm/dist/clang/include/clang/Driver [LLVM]: CC1Options.h src/external/bsd/llvm/dist/clang/include/clang/Lex [LLVM]: CMakeLists.txt Makefile src/external/bsd/llvm/dist/clang/lib/CodeGen [LLVM]: MicrosoftVBTables.cpp MicrosoftVBTables.h src/external/bsd/llvm/dist/clang/lib/Frontend [LLVM]: Warnings.cpp src/external/bsd/llvm/dist/clang/lib/Headers [LLVM]: module.map src/external/bsd/llvm/dist/clang/lib/Parse [LLVM]: ParsePragma.h src/external/bsd/llvm/dist/clang/lib/Sema [LLVM]: TargetAttributesSema.cpp TargetAttributesSema.h src/external/bsd/llvm/dist/clang/lib/StaticAnalyzer/Checkers [LLVM]: IdempotentOperationChecker.cpp src/external/bsd/llvm/dist/clang/lib/StaticAnalyzer/Frontend [LLVM]: AnalysisConsumer.h src/external/bsd/llvm/dist/clang/test/ARCMT [LLVM]: objcmt-deprecated-category.m objcmt-deprecated-category.m.result src/external/bsd/llvm/dist/clang/test/Analysis [LLVM]: idempotent-operations-limited-loops.c idempotent-operations.c idempotent-operations.cpp idempotent-operations.m src/external/bsd/llvm/dist/clang/test/CXX/expr/expr.prim/expr.prim.lambda [LLVM]: generic-lambda-unimplemented-1y.cpp src/external/bsd/llvm/dist/clang/test/CodeGen [LLVM]: a15.c a5.c aarch64-arguments.c aarch64-neon-copy.c aarch64-neon-crypto.c aarch64-neon-ld-sideeffect.c builtins-aarch64.c debug-dead-local-var.c debug-info-iv.c dllimport-dllexport.c instr-attribute.c instr-profile.c long-double-x86-nacl.c mips-target-data.c r5.c sparc-target-data.c src/external/bsd/llvm/dist/clang/test/CodeGen/Inputs [LLVM]: instr-attribute.pgodata instr-profile.pgodata src/external/bsd/llvm/dist/clang/test/CodeGenCXX [LLVM]: debug-info-pubtypes.cpp instr-profile-class.cpp instr-profile-throws.cpp instr-profile.cpp microsoft-abi-vtables-multiple-nonvirtual-inheritance.cpp microsoft-abi-vtables-virtual-inheritance-pr18967.cpp unary-type-trait.cpp src/external/bsd/llvm/dist/clang/test/CodeGenCXX/Inputs [LLVM]: instr-profile-class.pgodata instr-profile-throws.pgodata instr-profile.pgodata src/external/bsd/llvm/dist/clang/test/CodeGenObjC [LLVM]: instr-profile.m src/external/bsd/llvm/dist/clang/test/CodeGenObjC/Inputs [LLVM]: instr-profile.profdata src/external/bsd/llvm/dist/clang/test/Driver [LLVM]: bounds-checking.c cfi.c darwin-eabi.c dwarf2-cfi-asm.c mips-cs-header-search.cpp mips-cs-ld.c src/external/bsd/llvm/dist/clang/test/Headers [LLVM]: carbon.c warn-sysheader.cpp src/external/bsd/llvm/dist/clang/test/Lexer [LLVM]: clang-keywords.cpp cxx0x_keyword.cpp gnu_keywords.c src/external/bsd/llvm/dist/clang/test/PCH [LLVM]: cocoa.m src/external/bsd/llvm/dist/clang/test/Preprocessor [LLVM]: macro-multiline.c.ignoreme src/external/bsd/llvm/dist/clang/test/Rewriter [LLVM]: dllimport-typedef.c src/external/bsd/llvm/dist/clang/test/Sema [LLVM]: alloc_size.c carbon.c dllimport-dllexport.c src/external/bsd/llvm/dist/clang/test/SemaCUDA [LLVM]: cuda.h src/external/bsd/llvm/dist/clang/test/SemaCXX [LLVM]: warn-func-as-bool.cpp src/external/bsd/llvm/dist/clang/test/SemaObjC [LLVM]: attr-ns-bridged.m cocoa.m unsued-backing-ivar-warning.m src/external/bsd/llvm/dist/clang/tools/libclang [LLVM]: RecursiveASTVisitor.h src/external/bsd/llvm/dist/clang/utils [LLVM]: clangVisualizers.txt src/external/bsd/llvm/dist/clang/www/analyzer/images/tree [LLVM]: bullet.gif minus.gif plus.gif src/external/bsd/llvm/dist/clang/www/analyzer/scripts [LLVM]: dbtree.js Log Message: Mark files without clang-209886 tag as dead. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/llvm/dist/clang/include/clang/Analysis/FlowSensitive/DataflowSolver.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/llvm/dist/clang/include/clang/Basic/OnDiskHashTable.h \ src/external/bsd/llvm/dist/clang/include/clang/Basic/OpenCL.h cvs rdiff -u -r1.1.1.1 -r0 \ src/external/bsd/llvm/dist/clang/include/clang/Driver/CC1Options.h cvs rdiff -u -r1.1.1.2 -r0 \ src/external/bsd/llvm/dist/clang/include/clang/Lex/CMakeLists.txt cvs rdiff -u
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: rmind
Date: Sat May 31 22:41:37 UTC 2014
Modified Files:
src/usr.sbin/npf/npfctl: npf_bpf_comp.c npf_build.c npf_show.c
Log Message:
npfctl_build_code: generate TCP/UDP check for ports case when other blocks
do not imply L4 check; add an assert in npfctl_bpf_proto() and elsewhere.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/npf/npfctl/npf_bpf_comp.c
cvs rdiff -u -r1.37 -r1.38 src/usr.sbin/npf/npfctl/npf_build.c
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/npf/npfctl/npf_show.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.sbin/npf/npfctl/npf_bpf_comp.c
diff -u src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.5 src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.6
--- src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.5 Thu May 15 02:34:29 2014
+++ src/usr.sbin/npf/npfctl/npf_bpf_comp.c Sat May 31 22:41:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_bpf_comp.c,v 1.5 2014/05/15 02:34:29 rmind Exp $ */
+/* $NetBSD: npf_bpf_comp.c,v 1.6 2014/05/31 22:41:37 rmind Exp $ */
/*-
* Copyright (c) 2010-2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: npf_bpf_comp.c,v 1.5 2014/05/15 02:34:29 rmind Exp $);
+__RCSID($NetBSD: npf_bpf_comp.c,v 1.6 2014/05/31 22:41:37 rmind Exp $);
#include stdlib.h
#include stdbool.h
@@ -62,7 +62,8 @@ __RCSID($NetBSD: npf_bpf_comp.c,v 1.5 2
* something other than L4 header offset. Generally, when BPF_LDX is used.
*/
#define FETCHED_L3 0x01
-#define X_EQ_L4OFF 0x02
+#define CHECKED_L4 0x02
+#define X_EQ_L4OFF 0x04
struct npf_bpf {
/*
@@ -283,8 +284,8 @@ fetch_l3(npf_bpf_t *ctx, sa_family_t af,
}
/*
- * Fetch L3 information. The coprocessor populates the following
- * words in the scratch memory store:
+ * Call NPF_COP_L3 to fetch L3 information. The coprocessor
+ * populates the following words in the scratch memory store:
* - BPF_MW_IPVER: IP version (4 or 6).
* - BPF_MW_L4OFF: L4 header offset.
* - BPF_MW_L4PROTO: L4 protocol.
@@ -369,6 +370,7 @@ npfctl_bpf_proto(npf_bpf_t *ctx, sa_fami
uint32_t mwords[] = { BM_PROTO, 1, proto };
done_block(ctx, mwords, sizeof(mwords));
+ ctx-flags |= CHECKED_L4;
}
/*
@@ -471,6 +473,7 @@ npfctl_bpf_ports(npf_bpf_t *ctx, u_int o
/* TCP and UDP port offsets are the same. */
assert(sport_off == offsetof(struct tcphdr, th_sport));
assert(dport_off == offsetof(struct tcphdr, th_dport));
+ assert(ctx-flags CHECKED_L4);
assert(((opts MATCH_SRC) != 0) ^ ((opts MATCH_DST) != 0));
off = (opts MATCH_SRC) ? sport_off : dport_off;
@@ -516,11 +519,12 @@ void
npfctl_bpf_tcpfl(npf_bpf_t *ctx, uint8_t tf, uint8_t tf_mask, bool checktcp)
{
const u_int tcpfl_off = offsetof(struct tcphdr, th_flags);
+ const bool usingmask = tf_mask != tf;
/* X - IP header length */
fetch_l3(ctx, AF_UNSPEC, X_EQ_L4OFF);
if (checktcp) {
- const u_int jf = (tf_mask != tf) ? 3 : 2;
+ const u_int jf = usingmask ? 3 : 2;
assert(ctx-ingroup == false);
/* A - L4 protocol; A == TCP? If not, jump out. */
@@ -529,6 +533,8 @@ npfctl_bpf_tcpfl(npf_bpf_t *ctx, uint8_t
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, IPPROTO_TCP, 0, jf),
};
add_insns(ctx, insns_tcp, __arraycount(insns_tcp));
+ } else {
+ assert(ctx-flags CHECKED_L4);
}
struct bpf_insn insns_tf[] = {
@@ -537,7 +543,7 @@ npfctl_bpf_tcpfl(npf_bpf_t *ctx, uint8_t
};
add_insns(ctx, insns_tf, __arraycount(insns_tf));
- if (tf_mask != tf) {
+ if (usingmask) {
/* A - (A mask) */
struct bpf_insn insns_mask[] = {
BPF_STMT(BPF_ALU+BPF_AND+BPF_K, tf_mask),
@@ -567,6 +573,7 @@ npfctl_bpf_icmp(npf_bpf_t *ctx, int type
const u_int type_off = offsetof(struct icmp, icmp_type);
const u_int code_off = offsetof(struct icmp, icmp_code);
+ assert(ctx-flags CHECKED_L4);
assert(offsetof(struct icmp6_hdr, icmp6_type) == type_off);
assert(offsetof(struct icmp6_hdr, icmp6_code) == code_off);
assert(type != -1 || code != -1);
Index: src/usr.sbin/npf/npfctl/npf_build.c
diff -u src/usr.sbin/npf/npfctl/npf_build.c:1.37 src/usr.sbin/npf/npfctl/npf_build.c:1.38
--- src/usr.sbin/npf/npfctl/npf_build.c:1.37 Thu May 15 02:34:29 2014
+++ src/usr.sbin/npf/npfctl/npf_build.c Sat May 31 22:41:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_build.c,v 1.37 2014/05/15 02:34:29 rmind Exp $ */
+/* $NetBSD: npf_build.c,v 1.38 2014/05/31 22:41:37 rmind Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: npf_build.c,v 1.37 2014/05/15 02:34:29 rmind Exp $);
+__RCSID($NetBSD: npf_build.c,v 1.38 2014/05/31 22:41:37 rmind Exp $);
#include sys/types.h
#include sys/mman.h
@@ -293,10 +293,10 @@ static bool
npfctl_build_code(nl_rule_t *rl, sa_family_t family, const opt_proto_t *op,
const filt_opts_t *fopts)
{
+ bool noproto, noaddrs, noports, need_tcpudp = false;
const addr_port_t *apfrom
CVS commit: [LLVM] src/external/bsd/llvm/dist/llvm
Module Name:src Committed By: joerg Date: Sat May 31 22:42:16 UTC 2014 Removed Files: src/external/bsd/llvm/dist/llvm/autoconf [LLVM]: depcomp ltmain.sh src/external/bsd/llvm/dist/llvm/autoconf/m4 [LLVM]: libtool.m4 ltdl.m4 src/external/bsd/llvm/dist/llvm/docs/CommandGuide [LLVM]: llvm-prof.rst src/external/bsd/llvm/dist/llvm/include/llvm [LLVM]: AutoUpgrade.h DIBuilder.h DebugInfo.h GVMaterializer.h InstVisitor.h Linker.h src/external/bsd/llvm/dist/llvm/include/llvm/ADT [LLVM]: ImmutableIntervalMap.h ValueMap.h polymorphic_ptr.h src/external/bsd/llvm/dist/llvm/include/llvm/Analysis [LLVM]: BlockFrequencyImpl.h DominatorInternals.h Dominators.h Verifier.h src/external/bsd/llvm/dist/llvm/include/llvm/Assembly [LLVM]: AssemblyAnnotationWriter.h Parser.h PrintModulePass.h Writer.h src/external/bsd/llvm/dist/llvm/include/llvm/CodeGen [LLVM]: LiveRegUnits.h src/external/bsd/llvm/dist/llvm/include/llvm/CodeGen/PBQP [LLVM]: HeuristicBase.h HeuristicSolver.h src/external/bsd/llvm/dist/llvm/include/llvm/CodeGen/PBQP/Heuristics [LLVM]: Briggs.h src/external/bsd/llvm/dist/llvm/include/llvm/Support [LLVM]: CFG.h CallSite.h ConstantFolder.h ConstantRange.h DataFlow.h DebugLoc.h GetElementPtrTypeIterator.h InstIterator.h LeakDetector.h NoFolder.h PassNameParser.h PatternMatch.h PredIteratorCache.h TargetFolder.h ValueHandle.h src/external/bsd/llvm/dist/llvm/include/llvm/Target [LLVM]: Mangler.h src/external/bsd/llvm/dist/llvm/lib/CodeGen [LLVM]: LiveRegUnits.cpp src/external/bsd/llvm/dist/llvm/lib/CodeGen/AsmPrinter [LLVM]: DwarfCompileUnit.cpp DwarfCompileUnit.h src/external/bsd/llvm/dist/llvm/lib/IR [LLVM]: PrintModulePass.cpp src/external/bsd/llvm/dist/llvm/lib/MC [LLVM]: MCPureStreamer.cpp src/external/bsd/llvm/dist/llvm/lib/Support [LLVM]: ConstantRange.cpp src/external/bsd/llvm/dist/llvm/lib/Support/Windows [LLVM]: Windows.h src/external/bsd/llvm/dist/llvm/lib/Target [LLVM]: Mangler.cpp src/external/bsd/llvm/dist/llvm/lib/Target/AArch64 [LLVM]: AArch64AsmPrinter.h AArch64BranchFixupPass.cpp AArch64CallingConv.td AArch64InstrNEON.td AArch64MachineFunctionInfo.cpp README.txt src/external/bsd/llvm/dist/llvm/lib/Target/ARM [LLVM]: ARMBuildAttrs.h src/external/bsd/llvm/dist/llvm/lib/Target/ARM/MCTargetDesc [LLVM]: ARMBuildAttrs.cpp ARMBuildAttrs.h ARMUnwindOp.h src/external/bsd/llvm/dist/llvm/lib/Target/Mips/MCTargetDesc [LLVM]: MipsReginfo.cpp MipsReginfo.h src/external/bsd/llvm/dist/llvm/lib/Target/NVPTX [LLVM]: NVPTXSplitBBatBar.cpp NVPTXSplitBBatBar.h src/external/bsd/llvm/dist/llvm/lib/Target/Sparc/MCTargetDesc [LLVM]: SparcBaseInfo.h src/external/bsd/llvm/dist/llvm/lib/Target/X86 [LLVM]: X86COFFMachineModuleInfo.cpp X86COFFMachineModuleInfo.h src/external/bsd/llvm/dist/llvm/lib/Target/X86/Disassembler [LLVM]: X86DisassemblerDecoder.c src/external/bsd/llvm/dist/llvm/lib/Transforms/Scalar [LLVM]: CodeGenPrepare.cpp src/external/bsd/llvm/dist/llvm/projects/sample [LLVM]: Makefile Makefile.common.in Makefile.llvm.config.in Makefile.llvm.rules configure src/external/bsd/llvm/dist/llvm/projects/sample/autoconf [LLVM]: AutoRegen.sh ExportMap.map LICENSE.TXT config.guess config.sub configure.ac install-sh ltmain.sh mkinstalldirs src/external/bsd/llvm/dist/llvm/projects/sample/autoconf/m4 [LLVM]: build_exeext.m4 c_printf_a.m4 check_gnu_make.m4 config_makefile.m4 config_project.m4 cxx_flag_check.m4 find_std_program.m4 func_isinf.m4 func_isnan.m4 func_mmap_file.m4 header_mmap_anonymous.m4 huge_val.m4 libtool.m4 link_options.m4 linux_mixed_64_32.m4 ltdl.m4 need_dev_zero_for_mmap.m4 path_tclsh.m4 rand48.m4 sanity_check.m4 single_cxx_check.m4 visibility_inlines_hidden.m4 src/external/bsd/llvm/dist/llvm/projects/sample/docs [LLVM]: index.html src/external/bsd/llvm/dist/llvm/projects/sample/include [LLVM]: sample.h src/external/bsd/llvm/dist/llvm/projects/sample/lib [LLVM]: Makefile src/external/bsd/llvm/dist/llvm/projects/sample/lib/sample [LLVM]: Makefile sample.c src/external/bsd/llvm/dist/llvm/projects/sample/tools [LLVM]: Makefile src/external/bsd/llvm/dist/llvm/projects/sample/tools/sample [LLVM]: Makefile main.c src/external/bsd/llvm/dist/llvm/test/Analysis/ScalarEvolution [LLVM]: xor-and.ll src/external/bsd/llvm/dist/llvm/test/Assembler [LLVM]:
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: mrg
Date: Sat May 31 22:55:17 UTC 2014
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.gcc-tool Makefile.inc
src/external/gpl3/gcc/usr.bin/cc1: Makefile
src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
src/external/gpl3/gcc/usr.bin/common: Makefile
src/external/gpl3/gcc/usr.bin/common-target: Makefile
src/external/gpl3/gcc/usr.bin/cpp: Makefile
src/external/gpl3/gcc/usr.bin/frontend: Makefile
src/external/gpl3/gcc/usr.bin/g++: Makefile
src/external/gpl3/gcc/usr.bin/gcc: Makefile
Log Message:
make sure that files containing version numbers are rebuilt when
the version actually changes.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool
cvs rdiff -u -r1.22 -r1.23 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/common/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/common-target/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/cpp/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/frontend/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/g++/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/usr.bin/gcc/Makefile
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/usr.bin/Makefile.gcc-tool
diff -u src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool:1.1 src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool:1.2
--- src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool:1.1 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool Sat May 31 22:55:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gcc-tool,v 1.1 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile.gcc-tool,v 1.2 2014/05/31 22:55:16 mrg Exp $
PROG= gcc-${GCC_TOOL}
SRCS= gcc-ar.c file-find.c
@@ -15,6 +15,8 @@ CPPFLAGS= \
# Skip these because we don't have them in paths.
# -DDEFAULT_TARGET_VERSION=\${G_version}\
# -DDEFAULT_TARGET_MACHINE=\{GNU_MACHINE_ARCH}\
+#
+# ${SRCS}: ${GCCARCH}/defs.mk
CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ} ${G_ALL_CFLAGS:M-D*} ${G_INCLUDES:M-I*:N-I.*}
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.22 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.23
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.22 Thu May 29 07:40:37 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Sat May 31 22:55:16 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.22 2014/05/29 07:40:37 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.23 2014/05/31 22:55:16 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -79,6 +79,7 @@ VER_CPPFLAGS= -DBASEVER=\${BASEVER}\
-DBUGURL=$(G_BUGURL_s)
CPPFLAGS.version.c+= ${VER_CPPFLAGS}
+version.c: ${GCCARCH}/defs.mk ${TOP}/tools/gcc/gcc-version.mk
.include ${GCCARCH}/defs.mk
Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.8 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.9
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.8 Sat Mar 22 19:52:21 2014
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile Sat May 31 22:55:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/03/22 19:52:21 tron Exp $
+# $NetBSD: Makefile,v 1.9 2014/05/31 22:55:17 mrg Exp $
PROG= cc1
SRCS= ${G_C_OBJS:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -30,6 +30,7 @@ CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.
# VER_CPPFLAGS from Makefile.inc
CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS}
+c-cppbuiltin.c: ${GCCARCH}/defs.mk
COPTS.c-ada-spec.c= -Wno-stack-protector
COPTS.c-aux-info.c= -Wno-stack-protector
Index: src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.7 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.8
--- src/external/gpl3/gcc/usr.bin/cc1obj/Makefile:1.7 Sat Mar 22 17:57:47 2014
+++ src/external/gpl3/gcc/usr.bin/cc1obj/Makefile Sat May 31 22:55:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/03/22 17:57:47 tron Exp $
+# $NetBSD: Makefile,v 1.8 2014/05/31 22:55:17 mrg Exp $
MYOBJS= ${G_OBJC_OBJS} ${G_C_AND_OBJC_OBJS}
PROG= cc1obj
@@ -33,6 +33,7 @@ CHECKSUM_OBJS= ${BACKENDOBJ}/libbackend.
# VER_CPPFLAGS from Makefile.inc
CPPFLAGS.c-cppbuiltin.c= ${VER_CPPFLAGS}
+c-cppbuiltin.c: ${GCCARCH}/defs.mk
COPTS.c-ada-spec.c+= -Wno-stack-protector
COPTS.c-aux-info.c+= -Wno-stack-protector
Index: src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1plus/Makefile:1.8
