CVS commit: src/external/bsd/ntp/dist/ntpd
Module Name:src
Committed By: christos
Date: Fri Aug 10 08:22:49 UTC 2012
Modified Files:
src/external/bsd/ntp/dist/ntpd: refclock_parse.c
Log Message:
Homogenize all strn{cpy,cat} and snprintf() to a single append function to
prevent incorrect usage and buffer overflow.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/ntp/dist/ntpd/refclock_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/external/bsd/ntp/dist/ntpd/refclock_parse.c
diff -u src/external/bsd/ntp/dist/ntpd/refclock_parse.c:1.5 src/external/bsd/ntp/dist/ntpd/refclock_parse.c:1.6
--- src/external/bsd/ntp/dist/ntpd/refclock_parse.c:1.5 Wed Feb 1 02:46:22 2012
+++ src/external/bsd/ntp/dist/ntpd/refclock_parse.c Fri Aug 10 04:22:49 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: refclock_parse.c,v 1.5 2012/02/01 07:46:22 kardel Exp $ */
+/* $NetBSD: refclock_parse.c,v 1.6 2012/08/10 08:22:49 christos Exp $ */
/*
* /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.81 2009/05/01 10:15:29 kardel RELEASE_20090105_A
@@ -2418,6 +2418,20 @@ init_iobinding(
** support routines
**/
+static char *
+ap(char *buffer, size_t len, char *pos, const char *fmt, ...)
+{
+ va_list va;
+ int l;
+
+ va_start(va, fmt);
+ l = vsnprintf(pos, len - (pos - buffer), fmt, va);
+ va_end(va);
+ if (l != -1)
+ pos += l;
+ return pos;
+}
+
/*--
* convert a flag field to a string
*/
@@ -2464,8 +2478,6 @@ parsestate(
int i;
char *s, *t;
-
- *buffer = '\0';
s = t = buffer;
i = 0;
@@ -2474,9 +2486,8 @@ parsestate(
if (flagstrings[i].bit lstate)
{
if (s != t)
-strncpy(t, ; , BUFFER_SIZES(buffer, t, size));
- strncat(t, flagstrings[i].name, BUFFER_SIZES(buffer, t, size));
- t += strlen(t);
+t = ap(buffer, size, t, ; );
+ t = ap(buffer, size, t, %s, flagstrings[i].name);
}
i++;
}
@@ -2484,13 +2495,11 @@ parsestate(
if (lstate (PARSEB_S_LEAP|PARSEB_S_ANTENNA|PARSEB_S_PPS|PARSEB_S_POSITION))
{
if (s != t)
- strncpy(t, ; , BUFFER_SIZES(buffer, t, size));
-
- t += strlen(t);
+ t = ap(buffer, size, t, ; );
- strncpy(t, (, BUFFER_SIZES(buffer, t, size));
+ t = ap(buffer, size, t, ();
- s = t = t + strlen(t);
+ s = t;
i = 0;
while (sflagstrings[i].bit)
@@ -2499,16 +2508,15 @@ parsestate(
{
if (t != s)
{
- strncpy(t, ; , BUFFER_SIZES(buffer, t, size));
- t += 2;
+ t = ap(buffer, size, t, ; );
}
-strncpy(t, sflagstrings[i].name, BUFFER_SIZES(buffer, t, size));
-t += strlen(t);
+t = ap(buffer, size, t, %s,
+sflagstrings[i].name);
}
i++;
}
- strncpy(t, ), BUFFER_SIZES(buffer, t, size));
+ t = ap(buffer, size, t, ));
}
return buffer;
}
@@ -2539,7 +2547,9 @@ parsestatus(
{ 0, NULL }
};
int i;
+ char *t;
+ t = buffer;
*buffer = '\0';
i = 0;
@@ -2547,9 +2557,9 @@ parsestatus(
{
if (flagstrings[i].bit lstate)
{
- if (buffer[0])
-strncat(buffer, ; , size);
- strncat(buffer, flagstrings[i].name, size - 2);
+ if (t == buffer)
+t = ap(buffer, size, t, ; );
+ t = ap(buffer, size, t, %s, flagstrings[i].name);
}
i++;
}
@@ -2612,10 +2622,11 @@ l_mktime(
char *t;
buffer[0] = '\0';
+ t = buffer;
if ((tmp = delta / (60*60*24)) != 0)
{
- snprintf(buffer, BUFFER_SIZE(buffer, buffer), %ldd+, (u_long)tmp);
+ t = ap(buffer, sizeof(buffer), t, %ldd+, (u_long)tmp);
delta -= tmp * 60*60*24;
}
@@ -2624,10 +2635,8 @@ l_mktime(
m = delta % 60;
delta /= 60;
- t = buffer + strlen(buffer);
-
- snprintf(t, BUFFER_SIZE(buffer, t), %02d:%02d:%02d,
- (int)delta, (int)m, (int)s);
+ t = ap(buffer, sizeof(buffer), t, %02d:%02d:%02d,
+ (int)delta, (int)m, (int)s);
return buffer;
}
@@ -3206,7 +3215,7 @@ parse_start(
return 0; /* well, ok - special initialisation broke */
}
- strncpy(tmp_ctl.parseformat.parse_buffer, parse-parse_type-cl_format, sizeof(tmp_ctl.parseformat.parse_buffer));
+ strlcpy(tmp_ctl.parseformat.parse_buffer, parse-parse_type-cl_format, sizeof(tmp_ctl.parseformat.parse_buffer));
tmp_ctl.parseformat.parse_count = strlen(tmp_ctl.parseformat.parse_buffer);
if (!PARSE_SETFMT(parse, tmp_ctl))
@@ -3490,16 +3499,16 @@ parse_control(
}
start = tt = add_var(out-kv_list, 128, RO|DEF);
- snprintf(tt, 128, refclock_time=\);
- tt += strlen(tt);
+ tt = ap(start, 128, tt, refclock_time=\);
if (parse-timedata.parse_time.fp.l_ui == 0)
{
- strncpy(tt, UNDEFINED\, BUFFER_SIZES(start, tt, 128));
+ tt = ap(start, 128, tt, UNDEFINED\);
}
else
{
- snprintf(tt, 128, %s\, gmprettydate(parse-timedata.parse_time.fp));
+ tt = ap(start, 128, tt, %s\,
+ gmprettydate(parse-timedata.parse_time.fp));
}
if (!PARSE_GETTIMECODE(parse, tmpctl))
@@ -3510,8 +3519,7 @@ parse_control(
else
{
start = tt = add_var(out-kv_list, 512,
CVS commit: src
Module Name:src
Committed By: manu
Date: Fri Aug 10 08:42:11 UTC 2012
Modified Files:
src/lib/libpuffs: dispatcher.c
src/sys/fs/puffs: puffs_vnops.c
Log Message:
Fix race condition between (create|mknod|mkdir|symlino) and reclaim, just
like we did it between lookup and reclaim.
To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 src/lib/libpuffs/dispatcher.c
cvs rdiff -u -r1.171 -r1.172 src/sys/fs/puffs/puffs_vnops.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/libpuffs/dispatcher.c
diff -u src/lib/libpuffs/dispatcher.c:1.42 src/lib/libpuffs/dispatcher.c:1.43
--- src/lib/libpuffs/dispatcher.c:1.42 Sat Jul 21 05:17:10 2012
+++ src/lib/libpuffs/dispatcher.c Fri Aug 10 08:42:10 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: dispatcher.c,v 1.42 2012/07/21 05:17:10 manu Exp $ */
+/* $NetBSD: dispatcher.c,v 1.43 2012/08/10 08:42:10 manu Exp $ */
/*
* Copyright (c) 2006, 2007, 2008 Antti Kantee. All Rights Reserved.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
#if !defined(lint)
-__RCSID($NetBSD: dispatcher.c,v 1.42 2012/07/21 05:17:10 manu Exp $);
+__RCSID($NetBSD: dispatcher.c,v 1.43 2012/08/10 08:42:10 manu Exp $);
#endif /* !lint */
#include sys/types.h
@@ -315,6 +315,7 @@ dispatch(struct puffs_cc *pcc)
struct puffs_vnmsg_create *auxt = auxbuf;
struct puffs_newinfo pni;
struct puffs_cn pcn;
+ struct puffs_node *pn = NULL;
if (pops-puffs_node_create == NULL) {
error = 0;
@@ -343,13 +344,16 @@ dispatch(struct puffs_cc *pcc)
if (error) {
pu-pu_pathfree(pu, pcn.pcn_po_full);
} else {
- struct puffs_node *pn;
-
pn = PU_CMAP(pu, auxt-pvnr_newnode);
pn-pn_po = pcn.pcn_po_full;
}
}
+ if (!error) {
+if (pn == NULL)
+ pn = PU_CMAP(pu, auxt-pvnr_newnode);
+pn-pn_nlookup++;
+ }
break;
}
@@ -358,6 +362,7 @@ dispatch(struct puffs_cc *pcc)
struct puffs_vnmsg_mknod *auxt = auxbuf;
struct puffs_newinfo pni;
struct puffs_cn pcn;
+ struct puffs_node *pn = NULL;
if (pops-puffs_node_mknod == NULL) {
error = 0;
@@ -386,13 +391,16 @@ dispatch(struct puffs_cc *pcc)
if (error) {
pu-pu_pathfree(pu, pcn.pcn_po_full);
} else {
- struct puffs_node *pn;
-
pn = PU_CMAP(pu, auxt-pvnr_newnode);
pn-pn_po = pcn.pcn_po_full;
}
}
+ if (!error) {
+if (pn == NULL)
+ pn = PU_CMAP(pu, auxt-pvnr_newnode);
+pn-pn_nlookup++;
+ }
break;
}
@@ -659,6 +667,7 @@ dispatch(struct puffs_cc *pcc)
struct puffs_vnmsg_mkdir *auxt = auxbuf;
struct puffs_newinfo pni;
struct puffs_cn pcn;
+ struct puffs_node *pn = NULL;
if (pops-puffs_node_mkdir == NULL) {
error = 0;
@@ -687,13 +696,16 @@ dispatch(struct puffs_cc *pcc)
if (error) {
pu-pu_pathfree(pu, pcn.pcn_po_full);
} else {
- struct puffs_node *pn;
-
pn = PU_CMAP(pu, auxt-pvnr_newnode);
pn-pn_po = pcn.pcn_po_full;
}
}
+ if (!error) {
+if (pn == NULL)
+ pn = PU_CMAP(pu, auxt-pvnr_newnode);
+pn-pn_nlookup++;
+ }
break;
}
@@ -719,6 +731,7 @@ dispatch(struct puffs_cc *pcc)
struct puffs_vnmsg_symlink *auxt = auxbuf;
struct puffs_newinfo pni;
struct puffs_cn pcn;
+ struct puffs_node *pn = NULL;
if (pops-puffs_node_symlink == NULL) {
error = 0;
@@ -748,13 +761,16 @@ dispatch(struct puffs_cc *pcc)
if (error) {
pu-pu_pathfree(pu, pcn.pcn_po_full);
} else {
- struct puffs_node *pn;
-
pn = PU_CMAP(pu, auxt-pvnr_newnode);
pn-pn_po = pcn.pcn_po_full;
}
}
+ if (!error) {
+if (pn == NULL)
+ pn = PU_CMAP(pu, auxt-pvnr_newnode);
+pn-pn_nlookup++;
+ }
break;
}
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.171 src/sys/fs/puffs/puffs_vnops.c:1.172
--- src/sys/fs/puffs/puffs_vnops.c:1.171 Fri Jul 27 07:38:44 2012
+++ src/sys/fs/puffs/puffs_vnops.c Fri Aug 10 08:42:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.171 2012/07/27 07:38:44 manu Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.172 2012/08/10 08:42:11 manu Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.171 2012/07/27 07:38:44 manu Exp $);
+__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.172 2012/08/10 08:42:11 manu Exp $);
#include sys/param.h
#include sys/buf.h
@@ -446,7 +446,7 @@ puffs_abortbutton(struct puffs_mount *pm
}
callinactive(pmp, ck, 0);
- callreclaim(pmp, ck, 0);
+ callreclaim(pmp, ck, 1);
}
/*
CVS commit: src/sys/ufs/chfs
Module Name:src
Committed By: ttoth
Date: Fri Aug 10 09:26:58 UTC 2012
Modified Files:
src/sys/ufs/chfs: chfs.h chfs_build.c chfs_gc.c chfs_malloc.c
chfs_nodeops.c chfs_readinode.c chfs_scan.c chfs_subr.c
chfs_vfsops.c chfs_vnode.c chfs_vnode_cache.c chfs_vnops.c
chfs_write.c ebh.c
Log Message:
chfs bugfix [node was obsoleted twice]
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/ufs/chfs/chfs.h
cvs rdiff -u -r1.3 -r1.4 src/sys/ufs/chfs/chfs_build.c \
src/sys/ufs/chfs/chfs_write.c
cvs rdiff -u -r1.2 -r1.3 src/sys/ufs/chfs/chfs_gc.c \
src/sys/ufs/chfs/chfs_malloc.c src/sys/ufs/chfs/chfs_readinode.c \
src/sys/ufs/chfs/chfs_scan.c src/sys/ufs/chfs/ebh.c
cvs rdiff -u -r1.1 -r1.2 src/sys/ufs/chfs/chfs_nodeops.c \
src/sys/ufs/chfs/chfs_vnode_cache.c
cvs rdiff -u -r1.4 -r1.5 src/sys/ufs/chfs/chfs_subr.c \
src/sys/ufs/chfs/chfs_vfsops.c
cvs rdiff -u -r1.5 -r1.6 src/sys/ufs/chfs/chfs_vnode.c
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/chfs/chfs_vnops.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/ufs/chfs/chfs.h
diff -u src/sys/ufs/chfs/chfs.h:1.6 src/sys/ufs/chfs/chfs.h:1.7
--- src/sys/ufs/chfs/chfs.h:1.6 Fri Apr 13 14:50:35 2012
+++ src/sys/ufs/chfs/chfs.h Fri Aug 10 09:26:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs.h,v 1.6 2012/04/13 14:50:35 ttoth Exp $ */
+/* $NetBSD: chfs.h,v 1.7 2012/08/10 09:26:58 ttoth Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -494,6 +494,10 @@ int chfs_update_eb_dirty(struct chfs_mou
struct chfs_eraseblock *, uint32_t);
void chfs_add_node_to_list(struct chfs_mount *, struct chfs_vnode_cache *,
struct chfs_node_ref *, struct chfs_node_ref **);
+void chfs_remove_node_from_list(struct chfs_mount *, struct chfs_vnode_cache *,
+struct chfs_node_ref *, struct chfs_node_ref **);
+void chfs_remove_and_obsolete(struct chfs_mount *, struct chfs_vnode_cache *,
+struct chfs_node_ref *, struct chfs_node_ref **);
void chfs_add_fd_to_inode(struct chfs_mount *,
struct chfs_inode *, struct chfs_dirent *);
void chfs_add_vnode_ref_to_vc(struct chfs_mount *, struct chfs_vnode_cache *,
@@ -522,7 +526,6 @@ chfs_nref_to_vc(struct chfs_node_ref *nr
dbg(Empty!\n);
}
}
- //dbg(vno: %llu\n, ((struct chfs_vnode_cache *)(nref))-vno);
//dbg(NREF_TO_VC: GET IT\n);
//dbg(nref_next: %p, lnr: %u, ofs: %u\n, nref-nref_next, nref-nref_lnr, nref-nref_offset);
@@ -564,7 +567,9 @@ void chfs_free_tmp_dnode_info(struct chf
/* chfs_readinode.c */
int chfs_read_inode(struct chfs_mount *, struct chfs_inode *);
int chfs_read_inode_internal(struct chfs_mount *, struct chfs_inode *);
-void chfs_kill_fragtree(struct rb_tree *);
+void chfs_remove_frags_of_node(struct chfs_mount *, struct rb_tree *,
+ struct chfs_node_ref *);
+void chfs_kill_fragtree(struct chfs_mount *, struct rb_tree *);
uint32_t chfs_truncate_fragtree(struct chfs_mount *,
struct rb_tree *, uint32_t);
int chfs_add_full_dnode_to_inode(struct chfs_mount *,
@@ -653,8 +658,6 @@ void chfs_change_size_wasted(struct chfs
/* chfs_vnode_cache.c */
struct chfs_vnode_cache **chfs_vnocache_hash_init(void);
void chfs_vnocache_hash_destroy(struct chfs_vnode_cache **);
-void chfs_vnode_cache_set_state(struct chfs_mount *,
-struct chfs_vnode_cache *, int);
struct chfs_vnode_cache* chfs_vnode_cache_get(struct chfs_mount *, ino_t);
void chfs_vnode_cache_add(struct chfs_mount *, struct chfs_vnode_cache *);
void chfs_vnode_cache_remove(struct chfs_mount *, struct chfs_vnode_cache *);
Index: src/sys/ufs/chfs/chfs_build.c
diff -u src/sys/ufs/chfs/chfs_build.c:1.3 src/sys/ufs/chfs/chfs_build.c:1.4
--- src/sys/ufs/chfs/chfs_build.c:1.3 Thu Apr 12 15:31:01 2012
+++ src/sys/ufs/chfs/chfs_build.c Fri Aug 10 09:26:58 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: chfs_build.c,v 1.3 2012/04/12 15:31:01 ttoth Exp $ */
+/* $NetBSD: chfs_build.c,v 1.4 2012/08/10 09:26:58 ttoth Exp $ */
/*-
* Copyright (c) 2010 Department of Software Engineering,
@@ -67,11 +67,11 @@ void
chfs_build_set_vnodecache_nlink(struct chfs_mount *chmp,
struct chfs_vnode_cache *vc)
{
- struct chfs_dirent *fd;
+ struct chfs_dirent *fd, *tmpfd;
//dbg(set nlink\n);
// for (fd = vc-scan_dirents; fd; fd = fd-next) {
- TAILQ_FOREACH(fd, vc-scan_dirents, fds) {
+ TAILQ_FOREACH_SAFE(fd, vc-scan_dirents, fds, tmpfd) {
struct chfs_vnode_cache *child_vc;
if (!fd-vno)
@@ -82,6 +82,7 @@ chfs_build_set_vnodecache_nlink(struct c
mutex_exit(chmp-chm_lock_vnocache);
if (!child_vc) {
chfs_mark_node_obsolete(chmp, fd-nref);
+ TAILQ_REMOVE(vc-scan_dirents, fd, fds);
continue;
}
if (fd-type == CHT_DIR) {
@@ -122,8 +123,8 @@ chfs_build_remove_unlinked_vnode(struct
dbg(START\n);
dbg(vno: %llu\n, (unsigned long long)vc-vno);
- nref = vc-dnode;
KASSERT(mutex_owned(chmp-chm_lock_mountfields));
+ nref = vc-dnode;
// The
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: sborrill Date: Fri Aug 10 11:32:33 UTC 2012 Modified Files: src/sys/arch/i386/conf: GENERIC Log Message: Add uts(4) To generate a diff of this commit: cvs rdiff -u -r1.1077 -r1.1078 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/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1077 src/sys/arch/i386/conf/GENERIC:1.1078 --- src/sys/arch/i386/conf/GENERIC:1.1077 Wed Aug 1 04:20:05 2012 +++ src/sys/arch/i386/conf/GENERIC Fri Aug 10 11:32:32 2012 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.1077 2012/08/01 04:20:05 matt Exp $ +# $NetBSD: GENERIC,v 1.1078 2012/08/10 11:32:32 sborrill 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.1077 $ +#ident GENERIC-$Revision: 1.1078 $ maxusers 64 # estimated number of users @@ -1155,6 +1155,10 @@ uhidev* at uhub? port ? configuration ? ums* at uhidev? reportid ? wsmouse* at ums? mux 0 +# USB generic touchscreen +uts* at uhidev? reportid ? +wsmouse* at uts? mux 0 + # USB eGalax touch-panel uep* at uhub? port ? wsmouse* at uep? mux 0
CVS commit: src
Module Name:src
Committed By: joerg
Date: Fri Aug 10 12:10:30 UTC 2012
Modified Files:
src/usr.bin/ctags: Makefile
src/usr.bin/telnet: Makefile
src/usr.bin/tr: Makefile
src/usr.sbin/bootp/bootptest: Makefile
src/usr.sbin/dev_mkdb: Makefile
src/usr.sbin/dhcp: Makefile.inc
src/usr.sbin/dumplfs: Makefile
src/usr.sbin/installboot: Makefile
src/usr.sbin/isdn/isdnd: Makefile
src/usr.sbin/isdn/isdnmonitor: Makefile
src/usr.sbin/isdn/isdntel: Makefile
src/usr.sbin/isdn/isdntrace: Makefile
src/usr.sbin/makefs/cd9660: Makefile.inc
src/usr.sbin/mopd/common: Makefile
src/usr.sbin/mopd/mopd: Makefile
src/usr.sbin/mopd/mopprobe: Makefile
src/usr.sbin/mscdlabel: Makefile
src/usr.sbin/pppd: Makefile.inc
src/usr.sbin/pppd/pppd: Makefile
src/usr.sbin/rarpd: Makefile
src/usr.sbin/rbootd: Makefile
src/usr.sbin/rpc.pcnfsd: Makefile
src/usr.sbin/rtadvd: Makefile
src/usr.sbin/wiconfig: Makefile
Log Message:
Remove many HAVE_GCC || HAVE_PCC conditionals as the options also apply
to Clang. Add a few cases of HAVE_LLVM for -fno-strict-aliasing.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/ctags/Makefile
cvs rdiff -u -r1.49 -r1.50 src/usr.bin/telnet/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/tr/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/bootp/bootptest/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/dev_mkdb/Makefile
cvs rdiff -u -r1.26 -r1.27 src/usr.sbin/dhcp/Makefile.inc
cvs rdiff -u -r1.14 -r1.15 src/usr.sbin/dumplfs/Makefile
cvs rdiff -u -r1.46 -r1.47 src/usr.sbin/installboot/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/isdn/isdnd/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/isdn/isdnmonitor/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.sbin/isdn/isdntel/Makefile
cvs rdiff -u -r1.4 -r1.5 src/usr.sbin/isdn/isdntrace/Makefile
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/makefs/cd9660/Makefile.inc
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/mopd/common/Makefile
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/mopd/mopd/Makefile
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/mopd/mopprobe/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/mscdlabel/Makefile
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/pppd/Makefile.inc
cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/pppd/pppd/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/rarpd/Makefile
cvs rdiff -u -r1.13 -r1.14 src/usr.sbin/rbootd/Makefile
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/rpc.pcnfsd/Makefile
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/rtadvd/Makefile
cvs rdiff -u -r1.5 -r1.6 src/usr.sbin/wiconfig/Makefile
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/ctags/Makefile
diff -u src/usr.bin/ctags/Makefile:1.12 src/usr.bin/ctags/Makefile:1.13
--- src/usr.bin/ctags/Makefile:1.12 Mon Jun 20 07:44:01 2011
+++ src/usr.bin/ctags/Makefile Fri Aug 10 12:10:27 2012
@@ -1,14 +1,12 @@
-# $NetBSD: Makefile,v 1.12 2011/06/20 07:44:01 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2012/08/10 12:10:27 joerg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= ctags
CPPFLAGS+=-I${.CURDIR}
SRCS= C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c
-.include bsd.prog.mk
-
.if !defined(HOSTPROGNAME)
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.ctags.c+= -Wno-pointer-sign
.endif
-.endif
+
+.include bsd.prog.mk
Index: src/usr.bin/telnet/Makefile
diff -u src/usr.bin/telnet/Makefile:1.49 src/usr.bin/telnet/Makefile:1.50
--- src/usr.bin/telnet/Makefile:1.49 Mon Jan 9 16:08:55 2012
+++ src/usr.bin/telnet/Makefile Fri Aug 10 12:10:27 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2012/01/09 16:08:55 christos Exp $
+# $NetBSD: Makefile,v 1.50 2012/08/10 12:10:27 joerg Exp $
#
# Copyright (c) 1990 The Regents of the University of California.
# All rights reserved.
@@ -80,10 +80,8 @@ LDADD+= -lpam ${PAM_STATIC_LDADD}
DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
.endif
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in commands telnet terminal utilities
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
-.endif
.include bsd.prog.mk
Index: src/usr.bin/tr/Makefile
diff -u src/usr.bin/tr/Makefile:1.7 src/usr.bin/tr/Makefile:1.8
--- src/usr.bin/tr/Makefile:1.7 Mon Jun 20 07:44:01 2011
+++ src/usr.bin/tr/Makefile Fri Aug 10 12:10:28 2012
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.7 2011/06/20 07:44:01 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2012/08/10 12:10:28 joerg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= tr
SRCS= str.c tr.c
-.include bsd.prog.mk
-
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in str tr
COPTS.${f}.c+= -Wno-pointer-sign
.endfor
-.endif
+
+.include bsd.prog.mk
Index: src/usr.sbin/bootp/bootptest/Makefile
diff -u src/usr.sbin/bootp/bootptest/Makefile:1.4 src/usr.sbin/bootp/bootptest/Makefile:1.5
--- src/usr.sbin/bootp/bootptest/Makefile:1.4 Mon Jun 20 07:44:01 2011
+++
CVS commit: src/gnu/usr.bin
Module Name:src
Committed By: joerg
Date: Fri Aug 10 12:11:30 UTC 2012
Modified Files:
src/gnu/usr.bin: Makefile
Log Message:
Only build gcc here, if MKGCC != no.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/gnu/usr.bin/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/Makefile
diff -u src/gnu/usr.bin/Makefile:1.135 src/gnu/usr.bin/Makefile:1.136
--- src/gnu/usr.bin/Makefile:1.135 Tue Jun 21 04:52:50 2011
+++ src/gnu/usr.bin/Makefile Fri Aug 10 12:11:30 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.135 2011/06/21 04:52:50 mrg Exp $
+# $NetBSD: Makefile,v 1.136 2012/08/10 12:11:30 joerg Exp $
.include bsd.own.mk
@@ -23,10 +23,12 @@ SUBDIR+= gdb6
.endif
.endif
+.if ${MKGCC} != no
.if ${HAVE_GCC} == 4
.if ${MKGCCCMDS} != no
SUBDIR+= gcc4
.endif
.endif
+.endif
.include bsd.subdir.mk
CVS commit: src/gnu/usr.bin/groff
Module Name:src
Committed By: joerg
Date: Fri Aug 10 12:12:22 UTC 2012
Modified Files:
src/gnu/usr.bin/groff: Makefile.inc
src/gnu/usr.bin/groff/src/devices: Makefile.inc
src/gnu/usr.bin/groff/src/devices/grodvi: Makefile
src/gnu/usr.bin/groff/src/devices/grohtml: Makefile
src/gnu/usr.bin/groff/src/devices/grolbp: Makefile
src/gnu/usr.bin/groff/src/devices/grolj4: Makefile
src/gnu/usr.bin/groff/src/devices/grops: Makefile
src/gnu/usr.bin/groff/src/devices/grotty: Makefile
src/gnu/usr.bin/groff/src/preproc: Makefile.inc
src/gnu/usr.bin/groff/src/preproc/eqn: Makefile
src/gnu/usr.bin/groff/src/preproc/grn: Makefile
src/gnu/usr.bin/groff/src/preproc/html: Makefile
src/gnu/usr.bin/groff/src/preproc/pic: Makefile
src/gnu/usr.bin/groff/src/preproc/refer: Makefile
src/gnu/usr.bin/groff/src/preproc/soelim: Makefile
src/gnu/usr.bin/groff/src/preproc/tbl: Makefile
src/gnu/usr.bin/groff/src/roff: Makefile.inc
src/gnu/usr.bin/groff/src/roff/groff: Makefile
src/gnu/usr.bin/groff/src/roff/troff: Makefile
src/gnu/usr.bin/groff/src/utils: Makefile.inc
src/gnu/usr.bin/groff/src/utils/addftinfo: Makefile
src/gnu/usr.bin/groff/src/utils/hpftodit: Makefile
src/gnu/usr.bin/groff/src/utils/indxbib: Makefile
src/gnu/usr.bin/groff/src/utils/lkbib: Makefile
src/gnu/usr.bin/groff/src/utils/lookbib: Makefile
src/gnu/usr.bin/groff/src/utils/tfmtodit: Makefile
Log Message:
Don't link explicitly against libsupc++, just use the normal C++
linkage.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/gnu/usr.bin/groff/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/devices/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/devices/grodvi/Makefile
cvs rdiff -u -r1.7 -r1.8 src/gnu/usr.bin/groff/src/devices/grohtml/Makefile
cvs rdiff -u -r1.6 -r1.7 src/gnu/usr.bin/groff/src/devices/grolbp/Makefile
cvs rdiff -u -r1.6 -r1.7 src/gnu/usr.bin/groff/src/devices/grolj4/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/devices/grops/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/devices/grotty/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/preproc/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/gnu/usr.bin/groff/src/preproc/eqn/Makefile
cvs rdiff -u -r1.6 -r1.7 src/gnu/usr.bin/groff/src/preproc/grn/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/preproc/html/Makefile
cvs rdiff -u -r1.10 -r1.11 src/gnu/usr.bin/groff/src/preproc/pic/Makefile
cvs rdiff -u -r1.10 -r1.11 src/gnu/usr.bin/groff/src/preproc/refer/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/preproc/soelim/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/preproc/tbl/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/roff/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/roff/groff/Makefile
cvs rdiff -u -r1.12 -r1.13 src/gnu/usr.bin/groff/src/roff/troff/Makefile
cvs rdiff -u -r1.4 -r1.5 src/gnu/usr.bin/groff/src/utils/Makefile.inc
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/utils/addftinfo/Makefile
cvs rdiff -u -r1.7 -r1.8 src/gnu/usr.bin/groff/src/utils/hpftodit/Makefile
cvs rdiff -u -r1.7 -r1.8 src/gnu/usr.bin/groff/src/utils/indxbib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/utils/lkbib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/utils/lookbib/Makefile
cvs rdiff -u -r1.5 -r1.6 src/gnu/usr.bin/groff/src/utils/tfmtodit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/groff/Makefile.inc
diff -u src/gnu/usr.bin/groff/Makefile.inc:1.20 src/gnu/usr.bin/groff/Makefile.inc:1.21
--- src/gnu/usr.bin/groff/Makefile.inc:1.20 Thu May 26 12:56:29 2011
+++ src/gnu/usr.bin/groff/Makefile.inc Fri Aug 10 12:12:18 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.20 2011/05/26 12:56:29 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.21 2012/08/10 12:12:18 joerg Exp $
# $FreeBSD: src/gnu/usr.bin/groff/Makefile.inc,v 2.7 2003/05/01 13:22:18 ru Exp $
@@ -90,9 +90,6 @@ CFLAGS+= -DHAVE_CONFIG_H
CFLAGS+= -I${GROFF_DIST}/src/include -I${NETBSDSRCDIR}/gnu/usr.bin/groff/src/include
CXXFLAGS+= -fno-rtti -fno-exceptions
-# We only need -lsupc++
-USE_LIBSTDCXX= no
-
CWARNFLAGS.clang+= -Wno-unused-value
Index: src/gnu/usr.bin/groff/src/devices/Makefile.inc
diff -u src/gnu/usr.bin/groff/src/devices/Makefile.inc:1.4 src/gnu/usr.bin/groff/src/devices/Makefile.inc:1.5
--- src/gnu/usr.bin/groff/src/devices/Makefile.inc:1.4 Thu Dec 16 22:54:18 2010
+++ src/gnu/usr.bin/groff/src/devices/Makefile.inc Fri Aug 10 12:12:18 2012
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.inc,v 1.4 2010/12/16 22:54:18 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2012/08/10 12:12:18 joerg Exp $
# $FreeBSD:
CVS commit: [netbsd-6] src/sys/arch/arm
Module Name:src
Committed By: jdc
Date: Fri Aug 10 12:15:52 UTC 2012
Modified Files:
src/sys/arch/arm/gemini [netbsd-6]: files.gemini
src/sys/arch/arm/mpcore [netbsd-6]: files.mpcore
src/sys/arch/arm/omap [netbsd-6]: files.omap files.omap2
src/sys/arch/arm/xscale [netbsd-6]: files.pxa2x0
Added Files:
src/sys/arch/arm/arm [netbsd-6]: bus_space_a2x.S bus_space_a4x.S
Removed Files:
src/sys/arch/arm/mpcore [netbsd-6]: mpcore_a2x_io.S mpcore_a4x_io.S
src/sys/arch/arm/omap [netbsd-6]: omap_a2x_io.S
src/sys/arch/arm/xscale [netbsd-6]: pxa2x0_a4x_io.S
Log Message:
Pull up revisions:
src/sys/arch/arm/arm/bus_space_a2x.S revision 1.1
src/sys/arch/arm/arm/bus_space_a4x.S revision 1.1
src/sys/arch/arm/gemini/files.gemini revision 1.12
src/sys/arch/arm/mpcore/files.mpcore revision 1.2
src/sys/arch/arm/mpcore/mpcore_a2x_io.S delete
src/sys/arch/arm/mpcore/mpcore_a4x_io.S delete
src/sys/arch/arm/omap/files.omap revision 1.6
src/sys/arch/arm/omap/files.omap2 revision 1.9
src/sys/arch/arm/omap/omap_a2x_io.S delete
src/sys/arch/arm/xscale/files.pxa2x0 revision 1.18
src/sys/arch/arm/xscale/pxa2x0_a4x_io.S delete
(requested by skrll to fix ticket #454).
Provide generic a[24]x bus_space methods (aNx is normal access, offset
multipled by N).
Use the generic method and delete the other versions.
Discussed with matt@
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.2.2.2 src/sys/arch/arm/arm/bus_space_a2x.S \
src/sys/arch/arm/arm/bus_space_a4x.S
cvs rdiff -u -r1.11 -r1.11.10.1 src/sys/arch/arm/gemini/files.gemini
cvs rdiff -u -r1.1 -r1.1.14.1 src/sys/arch/arm/mpcore/files.mpcore
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/mpcore/mpcore_a2x_io.S \
src/sys/arch/arm/mpcore/mpcore_a4x_io.S
cvs rdiff -u -r1.5 -r1.5.58.1 src/sys/arch/arm/omap/files.omap
cvs rdiff -u -r1.8 -r1.8.10.1 src/sys/arch/arm/omap/files.omap2
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/omap/omap_a2x_io.S
cvs rdiff -u -r1.17 -r1.17.10.1 src/sys/arch/arm/xscale/files.pxa2x0
cvs rdiff -u -r1.1 -r0 src/sys/arch/arm/xscale/pxa2x0_a4x_io.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/arm/gemini/files.gemini
diff -u src/sys/arch/arm/gemini/files.gemini:1.11 src/sys/arch/arm/gemini/files.gemini:1.11.10.1
--- src/sys/arch/arm/gemini/files.gemini:1.11 Fri Mar 11 03:16:13 2011
+++ src/sys/arch/arm/gemini/files.gemini Fri Aug 10 12:15:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.gemini,v 1.11 2011/03/11 03:16:13 bsh Exp $
+# $NetBSD: files.gemini,v 1.11.10.1 2012/08/10 12:15:51 jdc Exp $
#
# Configuration info for GEMINI CPU support
# Based on omap/files.omap2
@@ -29,7 +29,7 @@ file arch/arm/gemini/gemini_space.c obi
##file arch/arm/gemini/gemini_a2x_space.c obio
##file arch/arm/gemini/gemini_a2x_io.S obio
file arch/arm/gemini/gemini_a4x_space.c obio
-file arch/arm/xscale/pxa2x0_a4x_io.S obio
+file arch/arm/arm/bus_space_a4x.S obio
file arch/arm/gemini/gemini_dma.c
# these bus space methods are not bus-specific ...
Index: src/sys/arch/arm/mpcore/files.mpcore
diff -u src/sys/arch/arm/mpcore/files.mpcore:1.1 src/sys/arch/arm/mpcore/files.mpcore:1.1.14.1
--- src/sys/arch/arm/mpcore/files.mpcore:1.1 Thu Mar 10 07:47:15 2011
+++ src/sys/arch/arm/mpcore/files.mpcore Fri Aug 10 12:15:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.mpcore,v 1.1 2011/03/10 07:47:15 bsh Exp $
+# $NetBSD: files.mpcore,v 1.1.14.1 2012/08/10 12:15:51 jdc Exp $
#
# Configuration info for the ARM11 MPCore
#
@@ -10,9 +10,9 @@ define bus_space_a4x
file arch/arm/mpcore/mpcore_space.c
#file arch/arm/imx/imx_dma.c bus_dma_generic needs-flag
file arch/arm/mpcore/mpcore_a2x_space.c bus_space_a2x needs-flag
-file arch/arm/mpcore/mpcore_a2x_io.S bus_space_a2x
+file arch/arm/arm/bus_space_a2x.S bus_space_a2x
file arch/arm/mpcore/mpcore_a4x_space.c bus_space_a4x needs-flag
-file arch/arm/mpcore/mpcore_a4x_io.S bus_space_a4x
+file arch/arm/arm/bus_space_a4x.S bus_space_a4x
# AXI/AHB bus interface and SoC domains
device axi { [addr=-1], [size=0], [irq=-1], [irqbase=-1]} : bus_space_generic
Index: src/sys/arch/arm/omap/files.omap
diff -u src/sys/arch/arm/omap/files.omap:1.5 src/sys/arch/arm/omap/files.omap:1.5.58.1
--- src/sys/arch/arm/omap/files.omap:1.5 Mon Dec 3 15:33:19 2007
+++ src/sys/arch/arm/omap/files.omap Fri Aug 10 12:15:51 2012
@@ -1,4 +1,4 @@
-# $NetBSD: files.omap,v 1.5 2007/12/03 15:33:19 ad Exp $
+# $NetBSD: files.omap,v 1.5.58.1 2012/08/10 12:15:51 jdc Exp $
#
# Configuration info for Texas Instruments OMAP CPU support
# Based on xscale/files.pxa2x0
@@ -96,9 +96,9 @@ file arch/arm/omap/omap_ocp.c ocp
# TIPB/EMIFS/OCP common files
file arch/arm/omap/omap_space.c tipb | emifs | ocp
file arch/arm/omap/omap_a2x_space.c tipb | emifs | ocp
-file arch/arm/omap/omap_a2x_io.S tipb | emifs | ocp
+file arch/arm/arm/bus_space_a2x.S tipb | emifs | ocp
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: jdc Date: Fri Aug 10 12:16:14 UTC 2012 Modified Files: src/doc [netbsd-6]: CHANGES-6.0 Log Message: Update list for ticket 454. To generate a diff of this commit: cvs rdiff -u -r1.1.2.174 -r1.1.2.175 src/doc/CHANGES-6.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-6.0 diff -u src/doc/CHANGES-6.0:1.1.2.174 src/doc/CHANGES-6.0:1.1.2.175 --- src/doc/CHANGES-6.0:1.1.2.174 Thu Aug 9 17:13:30 2012 +++ src/doc/CHANGES-6.0 Fri Aug 10 12:16:13 2012 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0,v 1.1.2.174 2012/08/09 17:13:30 jdc Exp $ +# $NetBSD: CHANGES-6.0,v 1.1.2.175 2012/08/10 12:16:13 jdc Exp $ A complete list of changes from the initial NetBSD 6.0 branch on 15 Feb 2012 until the 6.0 release: @@ -6898,6 +6898,17 @@ sys/arch/evbarm/rpi/rpi.h 1.1 sys/arch/evbarm/rpi/rpi_machdep.c 1.1 sys/arch/evbarm/rpi/rpi_start.S 1.1,1.2 etc/etc.evbarm/Makefile.inc 1.28 +sys/arch/arm/arm/bus_space_a2x.S 1.1 +sys/arch/arm/arm/bus_space_a4x.S 1.1 +sys/arch/arm/gemini/files.gemini 1.12 +sys/arch/arm/mpcore/files.mpcore 1.2 +sys/arch/arm/mpcore/mpcore_a2x_io.S delete +sys/arch/arm/mpcore/mpcore_a4x_io.S delete +sys/arch/arm/omap/files.omap 1.6 +sys/arch/arm/omap/files.omap2 1.9 +sys/arch/arm/omap/omap_a2x_io.S delete +sys/arch/arm/xscale/files.pxa2x0 1.18 +sys/arch/arm/xscale/pxa2x0_a4x_io.S delete Add initial support for the RaspberryPI (www.raspberrypi.org). This is enough for serial console via the gpio header pins and to get to multiuser.
CVS commit: src/sys/arch/news68k/news68k
Module Name:src Committed By: tsutsui Date: Fri Aug 10 12:17:51 UTC 2012 Modified Files: src/sys/arch/news68k/news68k: machdep.c Log Message: Appease gcc -fno-common: - remove initialzation of physmem since it's properly initialized before pmap_bootstrap() using a value passed from bootloader and sanity possible maximum value is not necessary - remove cn_tab = NULL initialization because no worth to patch it Tested on NWS-1750. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/arch/news68k/news68k/machdep.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/arch/news68k/news68k/machdep.c diff -u src/sys/arch/news68k/news68k/machdep.c:1.99 src/sys/arch/news68k/news68k/machdep.c:1.100 --- src/sys/arch/news68k/news68k/machdep.c:1.99 Fri Jul 27 05:36:11 2012 +++ src/sys/arch/news68k/news68k/machdep.c Fri Aug 10 12:17:51 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.99 2012/07/27 05:36:11 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.100 2012/08/10 12:17:51 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.99 2012/07/27 05:36:11 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.100 2012/08/10 12:17:51 tsutsui Exp $); #include opt_ddb.h #include opt_compat_netbsd.h @@ -111,7 +111,6 @@ struct cpu_info cpu_info_store; struct vm_map *phys_map = NULL; int maxmem; /* max memory per process */ -int physmem = MAXMEM; /* max supported memory, changes to actual */ extern paddr_t avail_start, avail_end; extern int end, *esym; @@ -968,7 +967,6 @@ intrhand_lev4(void) #define SW_FBPOP2 0x03 #define SW_AUTOSEL 0x07 -struct consdev *cn_tab = NULL; extern struct consdev consdev_rom, consdev_zs; int tty00_is_console = 0;
CVS commit: src/sys/arch/i386/stand
Module Name:src
Committed By: joerg
Date: Fri Aug 10 12:18:15 UTC 2012
Modified Files:
src/sys/arch/i386/stand: Makefile.booters
src/sys/arch/i386/stand/boot: Makefile.boot
src/sys/arch/i386/stand/bootxx: Makefile.bootxx
src/sys/arch/i386/stand/lib: Makefile
src/sys/arch/i386/stand/netboot/ne2000_isa: Makefile
Log Message:
Don't depend on HAVE_GCC being always present.
To generate a diff of this commit:
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/i386/stand/Makefile.booters
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/i386/stand/boot/Makefile.boot
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/stand/bootxx/Makefile.bootxx
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/i386/stand/lib/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/i386/stand/netboot/ne2000_isa/Makefile
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/i386/stand/Makefile.booters
diff -u src/sys/arch/i386/stand/Makefile.booters:1.85 src/sys/arch/i386/stand/Makefile.booters:1.86
--- src/sys/arch/i386/stand/Makefile.booters:1.85 Mon Jun 20 06:52:37 2011
+++ src/sys/arch/i386/stand/Makefile.booters Fri Aug 10 12:18:14 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.85 2011/06/20 06:52:37 mrg Exp $
+# $NetBSD: Makefile.booters,v 1.86 2012/08/10 12:18:14 joerg Exp $
.include bsd.own.mk
@@ -12,13 +12,11 @@ LIBC= # nothing
# Make sure we override any optimization options specified by the
# user.
-.if defined(HAVE_GCC)
.if ${MACHINE_ARCH} == x86_64
CPUFLAGS= -m32
.else
CPUFLAGS= -march=i386 -mtune=i386
.endif
-.endif
COPTS= ${OPT_SIZE.${ACTIVE_CC}}
I386_STAND_DIR?= $S/arch/i386/stand
Index: src/sys/arch/i386/stand/boot/Makefile.boot
diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.57 src/sys/arch/i386/stand/boot/Makefile.boot:1.58
--- src/sys/arch/i386/stand/boot/Makefile.boot:1.57 Mon Jan 16 18:46:20 2012
+++ src/sys/arch/i386/stand/boot/Makefile.boot Fri Aug 10 12:18:15 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.boot,v 1.57 2012/01/16 18:46:20 christos Exp $
+# $NetBSD: Makefile.boot,v 1.58 2012/08/10 12:18:15 joerg Exp $
S= ${.CURDIR}/../../../../..
@@ -39,7 +39,6 @@ CPPFLAGS+= -I ${.OBJDIR}
# Make sure we override any optimization options specified by the user
COPTS= -Os
-.if defined(HAVE_GCC)
.if ${MACHINE_ARCH} == x86_64
LDFLAGS+= -Wl,-m,elf_i386
AFLAGS+= -m32
@@ -49,7 +48,6 @@ KERNMISCMAKEFLAGS=LIBKERN_ARCH=i386
.else
CPUFLAGS= -march=i386 -mtune=i386
.endif
-.endif
CFLAGS+= -mno-sse -mno-sse2 -mno-sse3
@@ -87,9 +85,7 @@ SAMISCCPPFLAGS+= -DLIBSA_PRINTF_LONGLONG
SAMISCMAKEFLAGS+= SA_USE_CREAD=yes # Read compressed kernels
SAMISCMAKEFLAGS+= SA_INCLUDE_NET=no # Netboot via TFTP, NFS
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
CPPFLAGS+= -Wno-pointer-sign
-.endif
# CPPFLAGS+= -DBOOTXX_RAID1_SUPPORT
Index: src/sys/arch/i386/stand/bootxx/Makefile.bootxx
diff -u src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.42 src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.43
--- src/sys/arch/i386/stand/bootxx/Makefile.bootxx:1.42 Mon Jun 20 06:52:38 2011
+++ src/sys/arch/i386/stand/bootxx/Makefile.bootxx Fri Aug 10 12:18:15 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.42 2011/06/20 06:52:38 mrg Exp $
+# $NetBSD: Makefile.bootxx,v 1.43 2012/08/10 12:18:15 joerg Exp $
S= ${.CURDIR}/../../../../..
@@ -59,7 +59,6 @@ DBG=
CPPFLAGS+= -DNO_LBA_CHECK
-.if defined(HAVE_GCC)
.if ${MACHINE_ARCH} == x86_64
LDFLAGS+= -Wl,-m,elf_i386
AFLAGS+= -m32
@@ -70,7 +69,6 @@ KERNMISCMAKEFLAGS=LIBKERN_ARCH=i386
CPPFLAGS+= -DEPIA_HACK
CPUFLAGS= -march=i386 -mtune=i386
.endif
-.endif
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes
CPPFLAGS+= -nostdinc -D_STANDALONE
Index: src/sys/arch/i386/stand/lib/Makefile
diff -u src/sys/arch/i386/stand/lib/Makefile:1.35 src/sys/arch/i386/stand/lib/Makefile:1.36
--- src/sys/arch/i386/stand/lib/Makefile:1.35 Wed Jun 22 02:49:44 2011
+++ src/sys/arch/i386/stand/lib/Makefile Fri Aug 10 12:18:15 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2011/06/22 02:49:44 mrg Exp $
+# $NetBSD: Makefile,v 1.36 2012/08/10 12:18:15 joerg Exp $
S?= ${.CURDIR}/../../../..
@@ -75,6 +75,6 @@ lib${LIB}.o:: ${OBJS}
@${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort`
# XXX
-.if ${HAVE_GCC} == 45
+.if ${HAVE_GCC:U} == 45
COPTS.biosdisk.c+= -fno-strict-aliasing
.endif
Index: src/sys/arch/i386/stand/netboot/ne2000_isa/Makefile
diff -u src/sys/arch/i386/stand/netboot/ne2000_isa/Makefile:1.3 src/sys/arch/i386/stand/netboot/ne2000_isa/Makefile:1.4
--- src/sys/arch/i386/stand/netboot/ne2000_isa/Makefile:1.3 Mon Jun 20 08:46:28 2011
+++ src/sys/arch/i386/stand/netboot/ne2000_isa/Makefile Fri Aug 10 12:18:15 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/06/20 08:46:28 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2012/08/10 12:18:15 joerg Exp $
USE_NETIF= ne2000_isa
@@ -6,7 +6,5 @@ CPPFLAGS+= -DBASEREG=0x300
.include
CVS commit: src
Module Name:src
Committed By: joerg
Date: Fri Aug 10 12:20:12 UTC 2012
Modified Files:
src/crypto/external/bsd/openssh/bin/sftp: Makefile
src/crypto/external/bsd/openssh/bin/ssh: Makefile
src/crypto/external/bsd/openssh/bin/ssh-keygen: Makefile
src/crypto/external/bsd/openssh/bin/sshd: Makefile
src/crypto/external/bsd/openssh/lib: Makefile
src/lib/libc/rpc: Makefile.inc
src/lib/libedit: Makefile
src/lib/libtelnet: Makefile
src/sbin/dump: Makefile
src/sbin/fsck_ffs: Makefile
src/sbin/fsdb: Makefile
src/sbin/mount_smbfs: Makefile.inc
src/sbin/newfs: Makefile
src/sbin/newfs_v7fs: Makefile
Log Message:
Don't depend on HAVE_GCC being always defined.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/bin/sftp/Makefile
cvs rdiff -u -r1.7 -r1.8 src/crypto/external/bsd/openssh/bin/ssh/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
cvs rdiff -u -r1.8 -r1.9 src/crypto/external/bsd/openssh/bin/sshd/Makefile
cvs rdiff -u -r1.10 -r1.11 src/crypto/external/bsd/openssh/lib/Makefile
cvs rdiff -u -r1.20 -r1.21 src/lib/libc/rpc/Makefile.inc
cvs rdiff -u -r1.50 -r1.51 src/lib/libedit/Makefile
cvs rdiff -u -r1.35 -r1.36 src/lib/libtelnet/Makefile
cvs rdiff -u -r1.38 -r1.39 src/sbin/dump/Makefile
cvs rdiff -u -r1.43 -r1.44 src/sbin/fsck_ffs/Makefile
cvs rdiff -u -r1.33 -r1.34 src/sbin/fsdb/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sbin/mount_smbfs/Makefile.inc
cvs rdiff -u -r1.38 -r1.39 src/sbin/newfs/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sbin/newfs_v7fs/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/bin/sftp/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.4 src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.5
--- src/crypto/external/bsd/openssh/bin/sftp/Makefile:1.4 Mon Jun 20 07:43:56 2011
+++ src/crypto/external/bsd/openssh/bin/sftp/Makefile Fri Aug 10 12:20:11 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/06/20 07:43:56 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2012/08/10 12:20:11 joerg Exp $
BINDIR= /usr/bin
@@ -9,9 +9,7 @@ MAN= sftp.1
LDADD+= -ledit -lterminfo
DPADD+= ${LIBEDIT} ${LIBTERMINFO}
-.include bsd.prog.mk
-
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.sftp.c+= -Wno-pointer-sign
COPTS.sftp-client.c+= -Wno-pointer-sign
-.endif
+
+.include bsd.prog.mk
Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.7 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.8
--- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.7 Wed Aug 17 05:32:09 2011
+++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Fri Aug 10 12:20:12 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2011/08/17 05:32:09 christos Exp $
+# $NetBSD: Makefile,v 1.8 2012/08/10 12:20:12 joerg Exp $
.include bsd.own.mk
@@ -10,10 +10,8 @@ SRCS= ssh.c readconf.c clientloop.c ssht
roaming_common.c roaming_client.c
COPTS.sshconnect1.c= -fno-strict-aliasing
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.mux.c= -Wno-pointer-sign
COPTS.sshconnect2.c= -Wno-pointer-sign
-.endif
LINKS= ${BINDIR}/ssh ${BINDIR}/slogin
MAN= ssh.1 ssh_config.5
Index: src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile
diff -u src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.3 src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.4
--- src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile:1.3 Mon Jun 20 07:43:56 2011
+++ src/crypto/external/bsd/openssh/bin/ssh-keygen/Makefile Fri Aug 10 12:20:12 2012
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2011/06/20 07:43:56 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2012/08/10 12:20:12 joerg Exp $
BINDIR= /usr/bin
PROG= ssh-keygen
SRCS= ssh-keygen.c moduli.c
-.include bsd.prog.mk
-
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.ssh-keygen.c= -Wno-pointer-sign
-.endif
+
+.include bsd.prog.mk
Index: src/crypto/external/bsd/openssh/bin/sshd/Makefile
diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.8 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.9
--- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.8 Wed Sep 7 17:49:19 2011
+++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Fri Aug 10 12:20:12 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/09/07 17:49:19 christos Exp $
+# $NetBSD: Makefile,v 1.9 2012/08/10 12:20:12 joerg Exp $
.include bsd.own.mk
@@ -18,9 +18,7 @@ SRCS= sshd.c auth-rhosts.c auth-passwd.c
auth2-jpake.c \
roaming_common.c roaming_serv.c sandbox-rlimit.c
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.auth-options.c= -Wno-pointer-sign
-.endif
COPTS.ldapauth.c= -Wno-format-nonliteral # XXX: should fix
.if (${USE_PAM} != no)
Index: src/crypto/external/bsd/openssh/lib/Makefile
diff -u
CVS commit: src/sys/arch/hp300/hp300
Module Name:src Committed By: tsutsui Date: Fri Aug 10 12:29:59 UTC 2012 Modified Files: src/sys/arch/hp300/hp300: machdep.c Log Message: Appease gcc -fno-common: - remove initialzation of physmem since it's properly initialized before pmap_bootstrap() using a value passed from bootloader and sanity possible maximum value is not necessary Tested on HP382. To generate a diff of this commit: cvs rdiff -u -r1.225 -r1.226 src/sys/arch/hp300/hp300/machdep.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/arch/hp300/hp300/machdep.c diff -u src/sys/arch/hp300/hp300/machdep.c:1.225 src/sys/arch/hp300/hp300/machdep.c:1.226 --- src/sys/arch/hp300/hp300/machdep.c:1.225 Fri Jul 27 05:36:10 2012 +++ src/sys/arch/hp300/hp300/machdep.c Fri Aug 10 12:29:59 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.225 2012/07/27 05:36:10 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.226 2012/08/10 12:29:59 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.225 2012/07/27 05:36:10 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.226 2012/08/10 12:29:59 tsutsui Exp $); #include opt_ddb.h #include opt_compat_netbsd.h @@ -129,7 +129,6 @@ paddr_t bootinfo_pa; vaddr_t bootinfo_va; int maxmem; /* max memory per process */ -int physmem = MAXMEM; /* max supported memory, changes to actual */ extern u_int lowram; extern short exframesize[];
CVS commit: src/lib/csu/sparc_elf
Module Name:src
Committed By: martin
Date: Fri Aug 10 12:37:39 UTC 2012
Modified Files:
src/lib/csu/sparc_elf: Makefile crt0.c
Log Message:
Make this position independend (for -pie executables)
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/csu/sparc_elf/Makefile
cvs rdiff -u -r1.14 -r1.15 src/lib/csu/sparc_elf/crt0.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/csu/sparc_elf/Makefile
diff -u src/lib/csu/sparc_elf/Makefile:1.6 src/lib/csu/sparc_elf/Makefile:1.7
--- src/lib/csu/sparc_elf/Makefile:1.6 Fri May 19 19:11:12 2006
+++ src/lib/csu/sparc_elf/Makefile Fri Aug 10 12:37:39 2012
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2006/05/19 19:11:12 christos Exp $
+# $NetBSD: Makefile,v 1.7 2012/08/10 12:37:39 martin Exp $
-#Uncomment the next line to enable the new .init fallthru
CPPFLAGS+= -I${.CURDIR}
+CFLAGS+= -fPIC
.include ${.CURDIR}/../common_elf/Makefile.inc
Index: src/lib/csu/sparc_elf/crt0.c
diff -u src/lib/csu/sparc_elf/crt0.c:1.14 src/lib/csu/sparc_elf/crt0.c:1.15
--- src/lib/csu/sparc_elf/crt0.c:1.14 Mon Mar 7 05:09:11 2011
+++ src/lib/csu/sparc_elf/crt0.c Fri Aug 10 12:37:39 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0.c,v 1.14 2011/03/07 05:09:11 joerg Exp $ */
+/* $NetBSD: crt0.c,v 1.15 2012/08/10 12:37:39 martin Exp $ */
/*
* Copyright (c) 1998 Christos Zoulas
@@ -56,7 +56,7 @@ _start:\n\
sub %sp, 24, %sp ! expand to standard stack frame size\n\
mov %g3, %o3\n\
mov %g2, %o4\n\
- call ___start\n\
+ ba ___start\n\
mov %g1, %o5\n\
);
@@ -100,7 +100,7 @@ ___start(int argc, char **argv, char **e
* NOTE: Leave the RCS ID _after_ __start(), in case it gets placed in .text.
*/
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: crt0.c,v 1.14 2011/03/07 05:09:11 joerg Exp $);
+__RCSID($NetBSD: crt0.c,v 1.15 2012/08/10 12:37:39 martin Exp $);
#endif /* LIBC_SCCS and not lint */
#include common.c
CVS commit: src/sys/arch/luna68k/luna68k
Module Name:src
Committed By: tsutsui
Date: Fri Aug 10 12:48:14 UTC 2012
Modified Files:
src/sys/arch/luna68k/luna68k: machdep.c
Log Message:
Appease gcc -fno-common:
- initialize cn_tab at runtime in pre-main luna68k_init()
Tested on LUNA.
To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/luna68k/luna68k/machdep.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/arch/luna68k/luna68k/machdep.c
diff -u src/sys/arch/luna68k/luna68k/machdep.c:1.92 src/sys/arch/luna68k/luna68k/machdep.c:1.93
--- src/sys/arch/luna68k/luna68k/machdep.c:1.92 Sat Jul 28 19:08:24 2012
+++ src/sys/arch/luna68k/luna68k/machdep.c Fri Aug 10 12:48:14 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.92 2012/07/28 19:08:24 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.93 2012/08/10 12:48:14 tsutsui Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.92 2012/07/28 19:08:24 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.93 2012/08/10 12:48:14 tsutsui Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -154,6 +154,13 @@ luna68k_init(void)
extern paddr_t avail_start, avail_end;
+ /* initialize cn_tab for early console */
+#if 1
+ cn_tab = syscons;
+#else
+ cn_tab = romcons;
+#endif
+
/*
* Tell the VM system about available physical memory. The
* luna68k only has one segment.
@@ -772,12 +779,7 @@ module_init_md(void)
}
#endif
-#if 1
-
-struct consdev *cn_tab = syscons;
-
-#else
-
+#ifdef notyet
/*
* romcons is useful until m68k TC register is initialized.
*/
@@ -793,7 +795,6 @@ struct consdev romcons = {
makedev(7, 0), /* XXX */
CN_DEAD,
};
-struct consdev *cn_tab = romcons;
#define __ ((int **)0x4100)
#define GETC() (*(int (*)())__[6])()
CVS commit: src/doc
Module Name:src Committed By: tron Date: Fri Aug 10 14:23:05 UTC 2012 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note update of Postfix to version 2.8.12. To generate a diff of this commit: cvs rdiff -u -r1.956 -r1.957 src/doc/3RDPARTY cvs rdiff -u -r1.1730 -r1.1731 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.956 src/doc/3RDPARTY:1.957 --- src/doc/3RDPARTY:1.956 Thu Aug 9 12:39:56 2012 +++ src/doc/3RDPARTY Fri Aug 10 14:23:05 2012 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.956 2012/08/09 12:39:56 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.957 2012/08/10 14:23:05 tron Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -974,8 +974,8 @@ formatting in man pages, disallowing flo and more. Package: Postfix -Version: 2.8.11 -Current Vers: 2.8.11/2.9.3 +Version: 2.8.12 +Current Vers: 2.8.12/2.9.4 Maintainer: Wietse Venema wie...@porcupine.org Archive Site: ftp://postfix.cloud9.net/official/ Home Page: http://www.postfix.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1730 src/doc/CHANGES:1.1731 --- src/doc/CHANGES:1.1730 Tue Aug 7 01:19:05 2012 +++ src/doc/CHANGES Fri Aug 10 14:23:05 2012 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1730 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1731 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -102,3 +102,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: can be loaded. [jnemeth 20120803] modstat(8): Add -A, -a, and -e options for testing module loadability. [jnemeth 20120803] + postfix(1): Import version 2.8.12 [tron 20120810]
CVS commit: src/sys/arch/sun3
Module Name:src
Committed By: tsutsui
Date: Fri Aug 10 14:33:35 UTC 2012
Modified Files:
src/sys/arch/sun3/dev: zs.c
src/sys/arch/sun3/sun3: locore2.c
src/sys/arch/sun3/sun3x: locore2.c
Log Message:
Appease gcc -fno-common:
- initialize cn_tab in locore2.c:_bootstrap() for early printf calls
Tested on sun3 (3/160 on TME) and sun3x (real 3/80).
XXX: sun3 with 16MB RAM gets panic: ubc_init: failed to map ubc_object
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/sun3/dev/zs.c
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/sun3/sun3/locore2.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/sun3/sun3x/locore2.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/arch/sun3/dev/zs.c
diff -u src/sys/arch/sun3/dev/zs.c:1.87 src/sys/arch/sun3/dev/zs.c:1.88
--- src/sys/arch/sun3/dev/zs.c:1.87 Sun Jul 29 00:07:53 2012
+++ src/sys/arch/sun3/dev/zs.c Fri Aug 10 14:33:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.87 2012/07/29 00:07:53 matt Exp $ */
+/* $NetBSD: zs.c,v 1.88 2012/08/10 14:33:35 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: zs.c,v 1.87 2012/07/29 00:07:53 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: zs.c,v 1.88 2012/08/10 14:33:35 tsutsui Exp $);
#include opt_kgdb.h
@@ -674,13 +674,6 @@ struct consdev consdev_prom = {
nullcnpollc,
};
-/*
- * The console table pointer is statically initialized
- * to point to the PROM (output only) table, so that
- * early calls to printf will work.
- */
-struct consdev *cn_tab = consdev_prom;
-
void
nullcnprobe(struct consdev *cn)
{
Index: src/sys/arch/sun3/sun3/locore2.c
diff -u src/sys/arch/sun3/sun3/locore2.c:1.99 src/sys/arch/sun3/sun3/locore2.c:1.100
--- src/sys/arch/sun3/sun3/locore2.c:1.99 Fri Oct 15 15:55:53 2010
+++ src/sys/arch/sun3/sun3/locore2.c Fri Aug 10 14:33:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore2.c,v 1.99 2010/10/15 15:55:53 tsutsui Exp $ */
+/* $NetBSD: locore2.c,v 1.100 2012/08/10 14:33:35 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: locore2.c,v 1.99 2010/10/15 15:55:53 tsutsui Exp $);
+__KERNEL_RCSID(0, $NetBSD: locore2.c,v 1.100 2012/08/10 14:33:35 tsutsui Exp $);
#include opt_ddb.h
#include opt_modular.h
@@ -44,6 +44,8 @@ __KERNEL_RCSID(0, $NetBSD: locore2.c,v
#include uvm/uvm_extern.h
+#include dev/cons.h
+
#include machine/cpu.h
#include machine/db_machdep.h
#include machine/dvma.h
@@ -304,6 +306,7 @@ _verify_hardware(void)
void
_bootstrap(void)
{
+ extern struct consdev consdev_prom; /* XXX */
/* First, Clear BSS. */
memset(edata, 0, end - edata);
@@ -311,6 +314,12 @@ _bootstrap(void)
/* Set v_handler, get boothowto. */
sunmon_init();
+ /*
+ * Initialize console to point to the PROM (output only) table
+ * for early printf calls.
+ */
+ cn_tab = consdev_prom;
+
/* Copy the IDPROM from control space. */
idprom_init();
Index: src/sys/arch/sun3/sun3x/locore2.c
diff -u src/sys/arch/sun3/sun3x/locore2.c:1.38 src/sys/arch/sun3/sun3x/locore2.c:1.39
--- src/sys/arch/sun3/sun3x/locore2.c:1.38 Mon Nov 30 16:09:14 2009
+++ src/sys/arch/sun3/sun3x/locore2.c Fri Aug 10 14:33:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore2.c,v 1.38 2009/11/30 16:09:14 he Exp $ */
+/* $NetBSD: locore2.c,v 1.39 2012/08/10 14:33:35 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: locore2.c,v 1.38 2009/11/30 16:09:14 he Exp $);
+__KERNEL_RCSID(0, $NetBSD: locore2.c,v 1.39 2012/08/10 14:33:35 tsutsui Exp $);
#include opt_ddb.h
@@ -43,6 +43,8 @@ __KERNEL_RCSID(0, $NetBSD: locore2.c,v
#include uvm/uvm_extern.h
+#include dev/cons.h
+
#include machine/cpu.h
#include machine/db_machdep.h
#include machine/dvma.h
@@ -192,6 +194,7 @@ _vm_init(void)
void
_bootstrap(void)
{
+ extern struct consdev consdev_prom; /* XXX */
/* First, Clear BSS. */
memset(edata, 0, end - edata);
@@ -199,6 +202,12 @@ _bootstrap(void)
/* Set v_handler, get boothowto. */
sunmon_init();
+ /*
+ * Initialize console to point to the PROM (output only) table
+ * for early printf calls.
+ */
+ cn_tab = consdev_prom;
+
/* Handle kernel mapping, pmap_bootstrap(), etc. */
_vm_init();
CVS commit: src/sys/arch/sun2
Module Name:src
Committed By: tsutsui
Date: Fri Aug 10 14:52:26 UTC 2012
Modified Files:
src/sys/arch/sun2/dev: consinit.c
src/sys/arch/sun2/sun2: locore2.c machdep.c
Log Message:
Move cn_tab initialization from late cpu_startup(9) to
early _bootstrap() in locore2.c.
Tested on TME emulating 2/120.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sun2/dev/consinit.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/sun2/sun2/locore2.c
cvs rdiff -u -r1.75 -r1.76 src/sys/arch/sun2/sun2/machdep.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/arch/sun2/dev/consinit.c
diff -u src/sys/arch/sun2/dev/consinit.c:1.8 src/sys/arch/sun2/dev/consinit.c:1.9
--- src/sys/arch/sun2/dev/consinit.c:1.8 Mon Jul 30 17:27:20 2012
+++ src/sys/arch/sun2/dev/consinit.c Fri Aug 10 14:52:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: consinit.c,v 1.8 2012/07/30 17:27:20 christos Exp $ */
+/* $NetBSD: consinit.c,v 1.9 2012/08/10 14:52:26 tsutsui Exp $ */
/*-
* Copyright (c) 2001 Matthew Fredette
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.8 2012/07/30 17:27:20 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: consinit.c,v 1.9 2012/08/10 14:52:26 tsutsui Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -95,16 +95,6 @@ struct consdev consdev_prom = {
NULL,
};
-/*
- * The console table pointer is statically initialized
- * to point to the PROM (output only) table, so that
- * early calls to printf will work. This has been moved
- * to cpu_startup()
- */
-#if 0
-struct consdev *cn_tab = consdev_prom;
-#endif
-
void
prom_cnprobe(struct consdev *cd)
{
Index: src/sys/arch/sun2/sun2/locore2.c
diff -u src/sys/arch/sun2/sun2/locore2.c:1.25 src/sys/arch/sun2/sun2/locore2.c:1.26
--- src/sys/arch/sun2/sun2/locore2.c:1.25 Sun Jul 17 20:54:48 2011
+++ src/sys/arch/sun2/sun2/locore2.c Fri Aug 10 14:52:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: locore2.c,v 1.25 2011/07/17 20:54:48 joerg Exp $ */
+/* $NetBSD: locore2.c,v 1.26 2012/08/10 14:52:26 tsutsui Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: locore2.c,v 1.25 2011/07/17 20:54:48 joerg Exp $);
+__KERNEL_RCSID(0, $NetBSD: locore2.c,v 1.26 2012/08/10 14:52:26 tsutsui Exp $);
#include opt_ddb.h
#include opt_modular.h
@@ -44,6 +44,8 @@ __KERNEL_RCSID(0, $NetBSD: locore2.c,v
#include uvm/uvm_extern.h
+#include dev/cons.h
+
#include machine/cpu.h
#include machine/db_machdep.h
#include machine/dvma.h
@@ -255,6 +257,7 @@ _verify_hardware(void)
void
_bootstrap(void)
{
+ extern struct consdev consdev_prom; /* XXX */
vaddr_t va;
/* First, Clear BSS. */
@@ -263,6 +266,12 @@ _bootstrap(void)
/* Initialize the PROM. */
prom_init();
+ /*
+ * Initialize console to point to the PROM (output only) table
+ * for early printf calls.
+ */
+ cn_tab = consdev_prom;
+
/* Copy the IDPROM from control space. */
idprom_init();
Index: src/sys/arch/sun2/sun2/machdep.c
diff -u src/sys/arch/sun2/sun2/machdep.c:1.75 src/sys/arch/sun2/sun2/machdep.c:1.76
--- src/sys/arch/sun2/sun2/machdep.c:1.75 Mon Jul 30 17:27:20 2012
+++ src/sys/arch/sun2/sun2/machdep.c Fri Aug 10 14:52:26 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.75 2012/07/30 17:27:20 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.76 2012/08/10 14:52:26 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1986, 1990, 1993
@@ -149,7 +149,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.75 2012/07/30 17:27:20 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.76 2012/08/10 14:52:26 tsutsui Exp $);
#include opt_ddb.h
#include opt_kgdb.h
@@ -258,7 +258,6 @@ static vaddr_t dumppage;
static void identifycpu(void);
static void initcpu(void);
-extern struct consdev *cn_tab, consdev_prom;
/*
* cpu_startup: allocate memory for variable-sized tables,
@@ -275,7 +274,6 @@ cpu_startup(void)
vaddr_t minaddr, maxaddr;
char pbuf[9];
- cn_tab = consdev_prom;
/*
* Initialize message buffer (for kernel printf).
* This is put in physical pages four through seven
CVS commit: src/sys/fs/puffs
Module Name:src Committed By: manu Date: Fri Aug 10 14:52:57 UTC 2012 Modified Files: src/sys/fs/puffs: puffs_vnops.c Log Message: Missing bit in previous commit (prevent race between create|mknod|mkdir|symlink and reclaim) To generate a diff of this commit: cvs rdiff -u -r1.172 -r1.173 src/sys/fs/puffs/puffs_vnops.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/fs/puffs/puffs_vnops.c diff -u src/sys/fs/puffs/puffs_vnops.c:1.172 src/sys/fs/puffs/puffs_vnops.c:1.173 --- src/sys/fs/puffs/puffs_vnops.c:1.172 Fri Aug 10 08:42:11 2012 +++ src/sys/fs/puffs/puffs_vnops.c Fri Aug 10 14:52:56 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: puffs_vnops.c,v 1.172 2012/08/10 08:42:11 manu Exp $ */ +/* $NetBSD: puffs_vnops.c,v 1.173 2012/08/10 14:52:56 manu Exp $ */ /* * Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved. @@ -30,7 +30,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.172 2012/08/10 08:42:11 manu Exp $); +__KERNEL_RCSID(0, $NetBSD: puffs_vnops.c,v 1.173 2012/08/10 14:52:56 manu Exp $); #include sys/param.h #include sys/buf.h @@ -761,6 +761,8 @@ puffs_vnop_create(void *v) va_ttl, cn_ttl, SETATTR_CHSIZE); } + VPTOPP(*ap-a_vpp)-pn_nlookup++; + out: vput(dvp); @@ -818,6 +820,8 @@ puffs_vnop_mknod(void *v) va_ttl, cn_ttl, SETATTR_CHSIZE); } + VPTOPP(*ap-a_vpp)-pn_nlookup++; + out: vput(dvp); PUFFS_MSG_RELEASE(mknod); @@ -1791,6 +1795,8 @@ puffs_vnop_mkdir(void *v) va_ttl, cn_ttl, SETATTR_CHSIZE); } + VPTOPP(*ap-a_vpp)-pn_nlookup++; + out: vput(dvp); PUFFS_MSG_RELEASE(mkdir); @@ -1955,6 +1961,8 @@ puffs_vnop_symlink(void *v) va_ttl, cn_ttl, SETATTR_CHSIZE); } + VPTOPP(*ap-a_vpp)-pn_nlookup++; + out: vput(dvp); PUFFS_MSG_RELEASE(symlink);
CVS commit: src/regress/usr.bin/rtld/testlib
Module Name:src
Committed By: joerg
Date: Fri Aug 10 16:04:28 UTC 2012
Modified Files:
src/regress/usr.bin/rtld/testlib: Makefile
Log Message:
Use LIBISCXX.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/regress/usr.bin/rtld/testlib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/regress/usr.bin/rtld/testlib/Makefile
diff -u src/regress/usr.bin/rtld/testlib/Makefile:1.9 src/regress/usr.bin/rtld/testlib/Makefile:1.10
--- src/regress/usr.bin/rtld/testlib/Makefile:1.9 Sun Mar 2 16:01:14 2008
+++ src/regress/usr.bin/rtld/testlib/Makefile Fri Aug 10 16:04:28 2012
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.9 2008/03/02 16:01:14 jwise Exp $
+# $NetBSD: Makefile,v 1.10 2012/08/10 16:04:28 joerg Exp $
NOPROFILE= yes
SRCS= ccexc.cc construct.cc virt.cc
LIB= test
+LIBISCXX= yes
TESTLIB= testlib.so
CLEANFILES+= ${TESTLIB}
SHLIB_MAJOR= 1
SHLIB_MINOR= 0
#CXXFLAGS+= -fno-rtti
-LDADD+= -lstdc++ -lm -lgcc_s
.if ${MACHINE_ARCH} == i386 ${MKPIC} != no
all realall: ${TESTLIB}
CVS commit: src
Module Name:src
Committed By: joerg
Date: Fri Aug 10 16:05:27 UTC 2012
Modified Files:
src/external/gpl3: Makefile
src/external/historical/nawk/bin: Makefile
src/external/lgpl3/gmp/lib/libgmp: Makefile
src/sys/conf: Makefile.kern.inc
src/sys/lib/libkern: Makefile.inc
src/sys/lib/libsa: Makefile
src/sys/rump: Makefile.rump
Log Message:
Deal with optional HAVE_GCC.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/historical/nawk/bin/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/lgpl3/gmp/lib/libgmp/Makefile
cvs rdiff -u -r1.157 -r1.158 src/sys/conf/Makefile.kern.inc
cvs rdiff -u -r1.40 -r1.41 src/sys/lib/libkern/Makefile.inc
cvs rdiff -u -r1.77 -r1.78 src/sys/lib/libsa/Makefile
cvs rdiff -u -r1.62 -r1.63 src/sys/rump/Makefile.rump
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/Makefile
diff -u src/external/gpl3/Makefile:1.6 src/external/gpl3/Makefile:1.7
--- src/external/gpl3/Makefile:1.6 Mon Oct 31 08:14:44 2011
+++ src/external/gpl3/Makefile Fri Aug 10 16:05:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/10/31 08:14:44 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2012/08/10 16:05:26 joerg Exp $
.include bsd.own.mk
@@ -6,11 +6,13 @@
SUBDIR+= binutils
.endif
+.if ${MKGCC} != no
.if ${HAVE_GCC} == 45
.if ${MKGCCCMDS} != no
SUBDIR+= gcc
.endif
.endif
+.endif
.if ${MKGDB} != no
.if ${HAVE_GDB} == 7
Index: src/external/historical/nawk/bin/Makefile
diff -u src/external/historical/nawk/bin/Makefile:1.8 src/external/historical/nawk/bin/Makefile:1.9
--- src/external/historical/nawk/bin/Makefile:1.8 Tue Aug 16 10:45:37 2011
+++ src/external/historical/nawk/bin/Makefile Fri Aug 10 16:05:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/08/16 10:45:37 christos Exp $
+# $NetBSD: Makefile,v 1.9 2012/08/10 16:05:26 joerg Exp $
WARNS?= 4
CWARNFLAGS.clang+= -Wno-self-assign
@@ -17,9 +17,7 @@ LDADD+= -lm
DPADD+= ${LIBM}
.endif
YHEADER= yes
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS+= -Wno-pointer-sign
-.endif
COPTS.run.c += -Wno-format-nonliteral
COPTS.tran.c += -Wno-format-nonliteral
Index: src/external/lgpl3/gmp/lib/libgmp/Makefile
diff -u src/external/lgpl3/gmp/lib/libgmp/Makefile:1.12 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.13
--- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.12 Wed Sep 21 02:06:42 2011
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile Fri Aug 10 16:05:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/09/21 02:06:42 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2012/08/10 16:05:26 joerg Exp $
.include bsd.init.mk
@@ -191,8 +191,6 @@ CLEANFILES+= ${DPSRCS} gen-fac_ui gen-fi
# Don't warn about functions which cannot be stack smash protected as
# there are a lot of them.
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS += -Wno-stack-protector
-.endif
CWARNFLAGS.clang+= -Wno-unused-value -Wno-tautological-compare
Index: src/sys/conf/Makefile.kern.inc
diff -u src/sys/conf/Makefile.kern.inc:1.157 src/sys/conf/Makefile.kern.inc:1.158
--- src/sys/conf/Makefile.kern.inc:1.157 Fri Jul 27 05:40:51 2012
+++ src/sys/conf/Makefile.kern.inc Fri Aug 10 16:05:26 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kern.inc,v 1.157 2012/07/27 05:40:51 matt Exp $
+# $NetBSD: Makefile.kern.inc,v 1.158 2012/08/10 16:05:26 joerg Exp $
#
# This file contains common `MI' targets and definitions and it is included
# at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -70,7 +70,6 @@ CWARNFLAGS+= -Wold-style-definition
CWARNFLAGS+= -Wswitch -Wshadow
CWARNFLAGS+= -Wcast-qual -Wwrite-strings
CWARNFLAGS+= -Wno-unreachable-code
-. if defined(HAVE_GCC) || defined(HAVE_PCC)
CWARNFLAGS+= -Wno-pointer-sign -Wno-attributes
. if ${MACHINE} == i386 || ${MACHINE_ARCH} == x86_64 || \
${MACHINE_ARCH} == sparc64 || ${MACHINE} == prep
@@ -79,7 +78,6 @@ CWARNFLAGS+= -Wextra -Wno-unused-paramet
. if ${MACHINE} == i386 || ${MACHINE_ARCH} == x86_64
CWARNFLAGS+= -Wold-style-definition
. endif
-. endif
# Add -Wno-sign-compare. -Wsign-compare is included in -Wall as of GCC 3.3,
# but our sources aren't up for it yet.
CWARNFLAGS+= -Wno-sign-compare
@@ -96,7 +94,7 @@ CFLAGS+= ${DEBUG} ${COPTS}
AFLAGS+= -D_LOCORE -Wa,--fatal-warnings
# XXX
-.if defined(HAVE_GCC)
+.if defined(HAVE_GCC) || defined(HAVE_LLVM)
CFLAGS+= -fno-strict-aliasing
CFLAGS+= -fno-common
.endif
@@ -566,11 +564,9 @@ VARSTACK=kern/uipc_socket.c miscfs/genfs
uvm/uvm_pager.c dev/ic/aic7xxx.c dev/ic/aic79xx.c arch/xen/i386/gdt.c \
dev/ofw/ofw_subr.c
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for __varstack in ${VARSTACK}
COPTS.${__varstack:T} += -Wno-stack-protector
.endfor
-.endif
AFLAGS+= ${AOPTS.${.IMPSRC:T}}
CFLAGS+= ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}}
Index: src/sys/lib/libkern/Makefile.inc
diff -u
CVS commit: src/external
Module Name:src
Committed By: joerg
Date: Fri Aug 10 16:10:29 UTC 2012
Modified Files:
src/external/bsd/am-utils/lib/libamu: Makefile
src/external/bsd/bind/bin/named: Makefile
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
Log Message:
Decouple Clang from HAVE_GCC.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/am-utils/lib/libamu/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/bind/bin/named/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/lgpl3/mpfr/lib/libmpfr/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/bsd/am-utils/lib/libamu/Makefile
diff -u src/external/bsd/am-utils/lib/libamu/Makefile:1.3 src/external/bsd/am-utils/lib/libamu/Makefile:1.4
--- src/external/bsd/am-utils/lib/libamu/Makefile:1.3 Mon Jun 20 07:43:57 2011
+++ src/external/bsd/am-utils/lib/libamu/Makefile Fri Aug 10 16:10:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2011/06/20 07:43:57 mrg Exp $
+# $NetBSD: Makefile,v 1.4 2012/08/10 16:10:29 joerg Exp $
NOLINKLIB= # defined
@@ -18,7 +18,7 @@ SRCS= hasmntopt.c misc_rpc.c mount_fs.c
wire.c xdr_func.c xutil.c
# XXX
-.if defined(HAVE_GCC)
+.if defined(HAVE_GCC) || defined(HAVE_LLVM)
COPTS.xdr_func.c+= -fno-strict-aliasing
.endif
Index: src/external/bsd/bind/bin/named/Makefile
diff -u src/external/bsd/bind/bin/named/Makefile:1.4 src/external/bsd/bind/bin/named/Makefile:1.5
--- src/external/bsd/bind/bin/named/Makefile:1.4 Sun Sep 11 18:55:24 2011
+++ src/external/bsd/bind/bin/named/Makefile Fri Aug 10 16:10:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/09/11 18:55:24 christos Exp $
+# $NetBSD: Makefile,v 1.5 2012/08/10 16:10:29 joerg Exp $
.include bsd.own.mk
@@ -13,7 +13,7 @@ DIST=${IDIST}/bin/named
CPPFLAGS+=-I${DIST}/include -I${DIST}/unix/include -DCONFIGARGS=\defaults\
CPPFLAGS+=-DNO_VERSION_DATE
-.if defined(HAVE_GCC)
+.if defined(HAVE_GCC) || defined(HAVE_LLVM)
.for f in client
COPTS.${f}.c+= -fno-strict-aliasing
.endfor
Index: src/external/lgpl3/mpfr/lib/libmpfr/Makefile
diff -u src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.9 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.10
--- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.9 Wed Sep 21 02:06:42 2011
+++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Fri Aug 10 16:10:29 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/09/21 02:06:42 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2012/08/10 16:10:29 joerg Exp $
.include bsd.init.mk
@@ -520,6 +520,4 @@ COPTS.set_ld.c+= -Wno-error
# Don't warn about functions which cannot be stack smash protected as
# there are a lot of them.
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS += -Wno-stack-protector
-.endif
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Fri Aug 10 16:11:44 UTC 2012
Modified Files:
src/share/mk: bsd.sys.mk
Log Message:
Make linker warnings fatal by default for Clang, even if not building
GCC.
To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/share/mk/bsd.sys.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.216 src/share/mk/bsd.sys.mk:1.217
--- src/share/mk/bsd.sys.mk:1.216 Mon Jun 25 16:48:55 2012
+++ src/share/mk/bsd.sys.mk Fri Aug 10 16:11:43 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.216 2012/06/25 16:48:55 abs Exp $
+# $NetBSD: bsd.sys.mk,v 1.217 2012/08/10 16:11:43 joerg Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -40,7 +40,7 @@ CFLAGS+= -Wa,--fatal-warnings
.if (!defined(MKPIC) || ${MKPIC} != no) \
(!defined(LDSTATIC) || ${LDSTATIC} != -static)
# XXX there are some strange problems not yet resolved
-. if !defined(HAVE_GCC)
+. if !defined(HAVE_GCC) || defined(HAVE_LLVM)
LDFLAGS+= -Wl,--fatal-warnings
. endif
.endif
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Fri Aug 10 16:12:21 UTC 2012
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Don't set HAVE_GCC by default, if MKGCC is disabled.
To generate a diff of this commit:
cvs rdiff -u -r1.704 -r1.705 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.704 src/share/mk/bsd.own.mk:1.705
--- src/share/mk/bsd.own.mk:1.704 Fri Aug 10 02:53:09 2012
+++ src/share/mk/bsd.own.mk Fri Aug 10 16:12:20 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.704 2012/08/10 02:53:09 matt Exp $
+# $NetBSD: bsd.own.mk,v 1.705 2012/08/10 16:12:20 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -49,12 +49,14 @@ TOOLCHAIN_MISSING?= no
#
# Platforms still using GCC 4.1
#
+.if ${MKGCC:Uyes} != no
.if ${MACHINE_CPU} == vax
HAVE_GCC?=4
.else
# Otherwise, default to GCC4.5
HAVE_GCC?=45
.endif
+.endif
.if \
${MACHINE_ARCH} == i386 || \
CVS commit: src/tools
Module Name:src
Committed By: joerg
Date: Fri Aug 10 16:13:36 UTC 2012
Modified Files:
src/tools: Makefile
Log Message:
Decouple binutils build from HAVE_GCC. Merge common fragments of
HAVE_GCC and HAVE_PCC.
To generate a diff of this commit:
cvs rdiff -u -r1.155 -r1.156 src/tools/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/Makefile
diff -u src/tools/Makefile:1.155 src/tools/Makefile:1.156
--- src/tools/Makefile:1.155 Thu Nov 3 07:42:56 2011
+++ src/tools/Makefile Fri Aug 10 16:13:36 2012
@@ -1,35 +1,45 @@
-# $NetBSD: Makefile,v 1.155 2011/11/03 07:42:56 joerg Exp $
+# $NetBSD: Makefile,v 1.156 2012/08/10 16:13:36 joerg Exp $
.include bsd.own.mk
-.if defined(HAVE_GCC)
+.if defined(HAVE_GCC) || defined(HAVE_PCC)
TOOLCHAIN_BITS= gmake .WAIT
+.endif
+
.if ${TOOLCHAIN_MISSING} == no
+.if defined(HAVE_GCC)
.if ${HAVE_GCC} = 45
TOOLCHAIN_BITS+= gmp .WAIT
TOOLCHAIN_BITS+= mpfr .WAIT
TOOLCHAIN_BITS+= mpc .WAIT
.endif
+.endif
+.endif
+
+.if ${TOOLCHAIN_MISSING} == no
TOOLCHAIN_BITS+= binutils .WAIT
+.endif
+
+.if defined(HAVE_GCC)
+.if ${TOOLCHAIN_MISSING} == no
TOOLCHAIN_BITS+= gcc
. if ${MKCROSSGDB:Uno} != no
TOOLCHAIN_BITS+= gdb
. endif
-TOOLCHAIN_BITS+= .WAIT dbsym mdsetimage
+TOOLCHAIN_BITS+= .WAIT
# XXX Eventually, we want to be able to build dbsym and mdsetimage
# XXX if EXTERNAL_TOOLCHAIN is set.
.endif
.endif
.if defined(HAVE_PCC)
-TOOLCHAIN_BITS= gmake .WAIT
.if ${TOOLCHAIN_MISSING} == no
-TOOLCHAIN_BITS+= binutils .WAIT
TOOLCHAIN_BITS+= pcc
.endif
-TOOLCHAIN_BITS+= .WAIT dbsym mdsetimage
.endif
+TOOLCHAIN_BITS+= dbsym mdsetimage
+
DTRACE_BITS=
.if ${MKDTRACE} != no
DTRACE_BITS+= .WAIT libelf
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: joerg Date: Fri Aug 10 16:18:53 UTC 2012 Modified Files: src/distrib/sets/lists/comp: ad.mips64el mi src/distrib/sets/lists/tests: mi Log Message: No need to check for MKRUMP twice. To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/comp/ad.mips64el cvs rdiff -u -r1.1774 -r1.1775 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.483 -r1.484 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/comp/ad.mips64el diff -u src/distrib/sets/lists/comp/ad.mips64el:1.88 src/distrib/sets/lists/comp/ad.mips64el:1.89 --- src/distrib/sets/lists/comp/ad.mips64el:1.88 Wed Aug 8 14:08:02 2012 +++ src/distrib/sets/lists/comp/ad.mips64el Fri Aug 10 16:18:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.88 2012/08/08 14:08:02 christos Exp $ +# $NetBSD: ad.mips64el,v 1.89 2012/08/10 16:18:51 joerg Exp $ ./usr/bin/elf2aoutcomp-obsolete obsolete ./usr/bin/elf2ecoffcomp-sysutil-bin ./usr/include/gcc-4.5/loongson.h comp-c-include gcccmds,gcc=45 @@ -635,10 +635,10 @@ ./usr/lib/64/libtre.sobase-sys-shlib compat,pic ./usr/lib/64/libtre_p.acomp-c-proflib compat,profile ./usr/lib/64/libtre_pic.a comp-c-piclib compat,pic -./usr/lib/64/libukfs.acomp-c-lib compat,rump,rump -./usr/lib/64/libukfs.sobase-sys-shlib compat,pic,rump,rump -./usr/lib/64/libukfs_p.a comp-c-proflib compat,profile,rump,rump -./usr/lib/64/libukfs_pic.a comp-c-piclib compat,pic,rump,rump +./usr/lib/64/libukfs.acomp-c-lib compat,rump +./usr/lib/64/libukfs.sobase-sys-shlib compat,pic,rump +./usr/lib/64/libukfs_p.a comp-c-proflib compat,profile,rump +./usr/lib/64/libukfs_pic.a comp-c-piclib compat,pic,rump ./usr/lib/64/libusbhid.a comp-c-lib compat ./usr/lib/64/libusbhid.so base-sys-shlib compat,pic ./usr/lib/64/libusbhid_p.a comp-c-proflib compat,profile Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1774 src/distrib/sets/lists/comp/mi:1.1775 --- src/distrib/sets/lists/comp/mi:1.1774 Wed Aug 8 14:08:02 2012 +++ src/distrib/sets/lists/comp/mi Fri Aug 10 16:18:51 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1774 2012/08/08 14:08:02 christos Exp $ +# $NetBSD: mi,v 1.1775 2012/08/10 16:18:51 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3082,7 +3082,7 @@ ./usr/lib/librumpdev_fss.a comp-c-lib rump ./usr/lib/librumpdev_fss_g.a -unknown- debuglib,rump ./usr/lib/librumpdev_fss_p.a comp-c-proflib profile,rump -./usr/lib/librumpdev_g.a -unknown- debuglib,rump,rump +./usr/lib/librumpdev_g.a -unknown- debuglib,rump ./usr/lib/librumpdev_md.a comp-c-lib rump ./usr/lib/librumpdev_md_g.a -unknown- debuglib,rump ./usr/lib/librumpdev_md_p.a comp-c-proflib profile,rump @@ -3090,7 +3090,7 @@ ./usr/lib/librumpdev_netsmb_g.a -unknown- debuglib,rump ./usr/lib/librumpdev_netsmb_p.a comp-c-proflib profile,rump ./usr/lib/librumpdev_p.a comp-c-proflib profile,rump -./usr/lib/librumpdev_pad.a comp-c-lib rump,rump,rump +./usr/lib/librumpdev_pad.a comp-c-lib rump ./usr/lib/librumpdev_pad_g.a -unknown- debuglib,rump ./usr/lib/librumpdev_pad_p.a comp-c-proflib profile,rump ./usr/lib/librumpdev_pud.a comp-c-lib rump @@ -4440,7 +4440,7 @@ ./usr/libdata/lint/llib-lroken.ln comp-krb5-lintlib lint,kerberos ./usr/libdata/lint/llib-lrpcsvc.ln comp-c-lintlib lint ./usr/libdata/lint/llib-lrt.ln comp-c-lintlib lint -./usr/libdata/lint/llib-lrumpclient.ln comp-c-lintlib lint,rump,rump +./usr/libdata/lint/llib-lrumpclient.ln comp-c-lintlib lint,rump ./usr/libdata/lint/llib-lrumphijack.ln comp-c-lintlib lint,rump ./usr/libdata/lint/llib-lrumpuser.ln comp-c-lintlib lint,rump ./usr/libdata/lint/llib-lsaslc.ln comp-c-lintlib lint,crypto Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.483 src/distrib/sets/lists/tests/mi:1.484 --- src/distrib/sets/lists/tests/mi:1.483 Wed Aug 8 16:23:31 2012 +++ src/distrib/sets/lists/tests/mi Fri Aug 10 16:18:52 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.483 2012/08/08 16:23:31 christos Exp $ +# $NetBSD: mi,v 1.484 2012/08/10 16:18:52 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -254,7 +254,7 @@ ./usr/libdata/debug/usr/tests/fs/nfs tests-fs-debug,rump ./usr/libdata/debug/usr/tests/fs/nfs/t_mountd.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/fs/nfs/nfsservice tests-fs-debug,rump -./usr/libdata/debug/usr/tests/fs/nfs/nfsservice/rumpnfsd.debug tests-fs-debug debug,atf,rump,rump +./usr/libdata/debug/usr/tests/fs/nfs/nfsservice/rumpnfsd.debug tests-fs-debug debug,atf,rump ./usr/libdata/debug/usr/tests/fs/nullfs tests-fs-debug,rump ./usr/libdata/debug/usr/tests/fs/nullfs/t_basic.debug
CVS commit: src/sys/dev/pci
Module Name:src Committed By: bouyer Date: Fri Aug 10 16:24:17 UTC 2012 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some PCI AHCI controllers, from linux To generate a diff of this commit: cvs rdiff -u -r1.1131 -r1.1132 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1131 src/sys/dev/pci/pcidevs:1.1132 --- src/sys/dev/pci/pcidevs:1.1131 Tue Aug 7 19:26:36 2012 +++ src/sys/dev/pci/pcidevs Fri Aug 10 16:24:17 2012 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1131 2012/08/07 19:26:36 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1132 2012/08/10 16:24:17 bouyer Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -1220,6 +1220,7 @@ product ATI SB700_SATA_AHCI 0x4391 SB700 product ATI SB700_SATA_RAID 0x4392 SB700/SB800 RAID SATA Controller product ATI SB700_SATA_RAID5 0x4393 SB700/SB800 RAID5 SATA Controller product ATI SB700_SATA_FC 0x4394 SB700/SB800 FC SATA Controller +product ATI SB700_SATA_AHCI2 0x4395 SB700/SB800 SATA Controller (AHCI mode) product ATI SB700_USB_EHCI 0x4396 SB700/SB800 USB EHCI Controller product ATI SB800_SATA 0x4395 SB800 SATA Controller product ATI SB700_USB_OHCI0 0x4397 SB700/SB800 USB OHCI Controller @@ -4100,6 +4101,18 @@ product NVIDIA MCP77_AHCI_9 0x0ad8 nForc product NVIDIA MCP77_AHCI_10 0x0ad9 nForce MCP77 AHCI Controller product NVIDIA MCP77_AHCI_11 0x0ada nForce MCP77 AHCI Controller product NVIDIA MCP77_AHCI_12 0x0adb nForce MCP77 AHCI Controller +product NVIDIA MCP79_AHCI_1 0x0ab4 nForce MCP79 AHCI Controller +product NVIDIA MCP79_AHCI_2 0x0ab5 nForce MCP79 AHCI Controller +product NVIDIA MCP79_AHCI_3 0x0ab6 nForce MCP79 AHCI Controller +product NVIDIA MCP79_AHCI_4 0x0ab7 nForce MCP79 AHCI Controller +product NVIDIA MCP79_AHCI_5 0x0ab8 nForce MCP79 AHCI Controller +product NVIDIA MCP79_AHCI_6 0x0ab9 nForce MCP79 AHCI Controller +product NVIDIA MCP79_AHCI_7 0x0aba nForce MCP79 AHCI Controller +product NVIDIA MCP79_AHCI_8 0x0abb nForce MCP79 AHCI Controller +product NVIDIA MCP79_AHCI_9 0x0abc nForce MCP79 AHCI Controller +product NVIDIA MCP79_AHCI_10 0x0abd nForce MCP79 AHCI Controller +product NVIDIA MCP79_AHCI_11 0x0abe nForce MCP79 AHCI Controller +product NVIDIA MCP79_AHCI_12 0x0abf nForce MCP79 AHCI Controller product NVIDIA GF116 0x1244 GeForce GTX 550 Ti /* Nvidia SGS-Thomson Microelectronics */ @@ -4994,6 +5007,7 @@ product VIATECH VT8237A_SATA_2 0x5337 VT product VIATECH VT3351_IOAPIC 0x5351 VT3351 I/O APIC Interrupt Controller product VIATECH VT8237S_SATA 0x5372 VT8237S Integrated SATA Controller product VIATECH VT86C100A 0x6100 VT86C100A (Rhine-II) 10/100 Ethernet +product VIATECH VT8251_SATA 0x6287 VT8251 Integrated SATA Controller product VIATECH VT8378_IG 0x7205 VT8378 KM400 UniChrome Integrated Graphics product VIATECH KT880_5 0x7269 KT880 CPU to PCI Bridge product VIATECH VT3351_HB_7351 0x7351 VT3351 Host Bridge
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Fri Aug 10 16:24:45 UTC 2012
Modified Files:
src/sys/dev/pci: pcidevs.h pcidevs_data.h
Log Message:
Regen: add some PCI AHCI controllers.
To generate a diff of this commit:
cvs rdiff -u -r1.1124 -r1.1125 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.1123 -r1.1124 src/sys/dev/pci/pcidevs_data.h
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/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.1124 src/sys/dev/pci/pcidevs.h:1.1125
--- src/sys/dev/pci/pcidevs.h:1.1124 Tue Aug 7 19:27:33 2012
+++ src/sys/dev/pci/pcidevs.h Fri Aug 10 16:24:43 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.1124 2012/08/07 19:27:33 msaitoh Exp $ */
+/* $NetBSD: pcidevs.h,v 1.1125 2012/08/10 16:24:43 bouyer Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1131 2012/08/07 19:26:36 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1132 2012/08/10 16:24:17 bouyer Exp
*/
/*
@@ -1227,6 +1227,7 @@
#define PCI_PRODUCT_ATI_SB700_SATA_RAID 0x4392 /* SB700/SB800 RAID SATA Controller */
#define PCI_PRODUCT_ATI_SB700_SATA_RAID5 0x4393 /* SB700/SB800 RAID5 SATA Controller */
#define PCI_PRODUCT_ATI_SB700_SATA_FC 0x4394 /* SB700/SB800 FC SATA Controller */
+#define PCI_PRODUCT_ATI_SB700_SATA_AHCI2 0x4395 /* SB700/SB800 SATA Controller (AHCI mode) */
#define PCI_PRODUCT_ATI_SB700_USB_EHCI 0x4396 /* SB700/SB800 USB EHCI Controller */
#define PCI_PRODUCT_ATI_SB800_SATA 0x4395 /* SB800 SATA Controller */
#define PCI_PRODUCT_ATI_SB700_USB_OHCI0 0x4397 /* SB700/SB800 USB OHCI Controller */
@@ -4107,6 +4108,18 @@
#define PCI_PRODUCT_NVIDIA_MCP77_AHCI_10 0x0ad9 /* nForce MCP77 AHCI Controller */
#define PCI_PRODUCT_NVIDIA_MCP77_AHCI_11 0x0ada /* nForce MCP77 AHCI Controller */
#define PCI_PRODUCT_NVIDIA_MCP77_AHCI_12 0x0adb /* nForce MCP77 AHCI Controller */
+#define PCI_PRODUCT_NVIDIA_MCP79_AHCI_1 0x0ab4 /* nForce MCP79 AHCI Controller */
+#define PCI_PRODUCT_NVIDIA_MCP79_AHCI_2 0x0ab5 /* nForce MCP79 AHCI Controller */
+#define PCI_PRODUCT_NVIDIA_MCP79_AHCI_3 0x0ab6 /* nForce MCP79 AHCI Controller */
+#define PCI_PRODUCT_NVIDIA_MCP79_AHCI_4 0x0ab7 /* nForce MCP79 AHCI Controller */
+#define PCI_PRODUCT_NVIDIA_MCP79_AHCI_5 0x0ab8 /* nForce MCP79 AHCI Controller */
+#define PCI_PRODUCT_NVIDIA_MCP79_AHCI_6 0x0ab9 /* nForce MCP79 AHCI Controller */
+#define PCI_PRODUCT_NVIDIA_MCP79_AHCI_7 0x0aba /* nForce MCP79 AHCI Controller */
+#define PCI_PRODUCT_NVIDIA_MCP79_AHCI_8 0x0abb /* nForce MCP79 AHCI Controller */
+#define PCI_PRODUCT_NVIDIA_MCP79_AHCI_9 0x0abc /* nForce MCP79 AHCI Controller */
+#define PCI_PRODUCT_NVIDIA_MCP79_AHCI_10 0x0abd /* nForce MCP79 AHCI Controller */
+#define PCI_PRODUCT_NVIDIA_MCP79_AHCI_11 0x0abe /* nForce MCP79 AHCI Controller */
+#define PCI_PRODUCT_NVIDIA_MCP79_AHCI_12 0x0abf /* nForce MCP79 AHCI Controller */
#define PCI_PRODUCT_NVIDIA_GF116 0x1244 /* GeForce GTX 550 Ti */
/* Nvidia SGS-Thomson Microelectronics */
@@ -5001,6 +5014,7 @@
#define PCI_PRODUCT_VIATECH_VT3351_IOAPIC 0x5351 /* VT3351 I/O APIC Interrupt Controller */
#define PCI_PRODUCT_VIATECH_VT8237S_SATA 0x5372 /* VT8237S Integrated SATA Controller */
#define PCI_PRODUCT_VIATECH_VT86C100A 0x6100 /* VT86C100A (Rhine-II) 10/100 Ethernet */
+#define PCI_PRODUCT_VIATECH_VT8251_SATA 0x6287 /* VT8251 Integrated SATA Controller */
#define PCI_PRODUCT_VIATECH_VT8378_IG 0x7205 /* VT8378 KM400 UniChrome Integrated Graphics */
#define PCI_PRODUCT_VIATECH_KT880_5 0x7269 /* KT880 CPU to PCI Bridge */
#define PCI_PRODUCT_VIATECH_VT3351_HB_7351 0x7351 /* VT3351 Host Bridge */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.1123 src/sys/dev/pci/pcidevs_data.h:1.1124
--- src/sys/dev/pci/pcidevs_data.h:1.1123 Tue Aug 7 19:27:19 2012
+++ src/sys/dev/pci/pcidevs_data.h Fri Aug 10 16:24:43 2012
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.1123 2012/08/07 19:27:19 msaitoh Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.1124 2012/08/10 16:24:43 bouyer Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.1131 2012/08/07 19:26:36 msaitoh Exp
+ * NetBSD: pcidevs,v 1.1132 2012/08/10 16:24:17 bouyer Exp
*/
/*
@@ -1623,6 +1623,8 @@ static const uint16_t pci_products[] = {
9084, 9113, 8116, 6173, 0,
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_FC,
9084, 7464, 8116, 6173, 0,
+ PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_SATA_AHCI2,
+ 9084, 8116, 6173, 9107, 9101, 0,
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB700_USB_EHCI,
9084, 6663, 7891, 6173, 0,
PCI_VENDOR_ATI, PCI_PRODUCT_ATI_SB800_SATA,
@@ -6769,6 +6771,30 @@ static const uint16_t pci_products[] = {
22112, 22469, 8121, 6173, 0,
PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP77_AHCI_12,
22112, 22469, 8121, 6173, 0,
+
CVS commit: src/external/bsd/bind/lib/libdns
Module Name:src
Committed By: joerg
Date: Fri Aug 10 16:33:41 UTC 2012
Modified Files:
src/external/bsd/bind/lib/libdns: Makefile
Log Message:
Apply options for all compilers.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/lib/libdns/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/bsd/bind/lib/libdns/Makefile
diff -u src/external/bsd/bind/lib/libdns/Makefile:1.6 src/external/bsd/bind/lib/libdns/Makefile:1.7
--- src/external/bsd/bind/lib/libdns/Makefile:1.6 Tue Jun 5 00:43:13 2012
+++ src/external/bsd/bind/lib/libdns/Makefile Fri Aug 10 16:33:41 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2012/06/05 00:43:13 christos Exp $
+# $NetBSD: Makefile,v 1.7 2012/08/10 16:33:41 joerg Exp $
LIB=dns
@@ -12,11 +12,9 @@ DIST= ${IDIST}/lib/dns
.PATH.c: ${DIST}/unix ${DIST}/sec/dst ${DIST}
CPPFLAGS+= -I${BIND_SRCDIR}/include/dns -I${DIST}
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
.for f in lookup byaddr request sdb validator
COPTS.${f}.c+= -Wno-pointer-sign -fno-strict-aliasing
.endfor
-.endif
DNSSEC_SRCS= dst_api.c dst_lib.c dst_parse.c dst_result.c \
gssapi_link.c gssapictx.c hmac_link.c key.c openssl_link.c \
CVS commit: src/share/mk
Module Name:src
Committed By: joerg
Date: Fri Aug 10 16:34:23 UTC 2012
Modified Files:
src/share/mk: bsd.kmodule.mk
Log Message:
Remove effectively tautological condition.
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/share/mk/bsd.kmodule.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.36 src/share/mk/bsd.kmodule.mk:1.37
--- src/share/mk/bsd.kmodule.mk:1.36 Thu Mar 15 02:00:52 2012
+++ src/share/mk/bsd.kmodule.mk Fri Aug 10 16:34:23 2012
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.36 2012/03/15 02:00:52 joerg Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.37 2012/08/10 16:34:23 joerg Exp $
# We are not building this with PIE
MKPIE=no
@@ -18,9 +18,7 @@ CPPFLAGS+= -isystem ${S}/../common/inclu
CPPFLAGS+= -D_KERNEL -D_LKM -D_MODULE -DSYSCTL_INCLUDE_DESCR
# XXX until the kernel is fixed again...
-.if defined(HAVE_GCC) || defined(HAVE_PCC) || defined(HAVE_LLVM)
CFLAGS+= -fno-strict-aliasing -Wno-pointer-sign
-.endif
# XXX This is a workaround for platforms that have relative relocations
# that, when relocated by the module loader, result in addresses that
CVS commit: src/sys/dev
Module Name:src
Committed By: bouyer
Date: Fri Aug 10 16:35:00 UTC 2012
Modified Files:
src/sys/dev/ic: ahcisata_core.c ahcisatavar.h
src/sys/dev/pci: ahcisata_pci.c
Log Message:
Work around some SATA PMP issues in some AHCI controllers by either
disabling PMP entirely, or special handling in the reset function.
Controller list from linux and FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.41 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/ahcisatavar.h
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/ahcisata_pci.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/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.40 src/sys/dev/ic/ahcisata_core.c:1.41
--- src/sys/dev/ic/ahcisata_core.c:1.40 Tue Jul 31 15:50:34 2012
+++ src/sys/dev/ic/ahcisata_core.c Fri Aug 10 16:35:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.40 2012/07/31 15:50:34 bouyer Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.41 2012/08/10 16:35:00 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ahcisata_core.c,v 1.40 2012/07/31 15:50:34 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: ahcisata_core.c,v 1.41 2012/08/10 16:35:00 bouyer Exp $);
#include sys/types.h
#include sys/malloc.h
@@ -225,6 +225,11 @@ ahci_attach(struct ahci_softc *sc)
return;
sc-sc_ahci_cap = AHCI_READ(sc, AHCI_CAP);
+ if (sc-sc_achi_quirks AHCI_QUIRK_BADPMP) {
+ aprint_verbose_dev(sc-sc_atac.atac_dev,
+ ignoring broken port multiplier support\n);
+ sc-sc_ahci_cap = ~AHCI_CAP_SPM;
+ }
sc-sc_atac.atac_nchannels = (sc-sc_ahci_cap AHCI_CAP_NPMASK) + 1;
sc-sc_ncmds = ((sc-sc_ahci_cap AHCI_CAP_NCS) 8) + 1;
ahci_rev = AHCI_READ(sc, AHCI_VS);
@@ -655,6 +660,7 @@ ahci_do_reset_drive(struct ata_channel *
if (drive 0) {
KASSERT(sc-sc_ahci_cap AHCI_CAP_SPM);
}
+again:
/* polled command, assume interrupts are disabled */
/* use slot 0 to send reset, the channel is idle */
cmd_h = achp-ahcic_cmdh[0];
@@ -687,6 +693,16 @@ ahci_do_reset_drive(struct ata_channel *
switch(ahci_exec_fis(chp, 31, flags)) {
case ERR_DF:
case TIMEOUT:
+ if ((sc-sc_achi_quirks AHCI_QUIRK_BADPMPRESET) != 0
+ drive == PMP_PORT_CTL) {
+ /*
+ * some controllers fails to reset when
+ * targeting a PMP but a single drive is attached.
+ * try again with port 0
+ */
+ drive = 0;
+ goto again;
+ }
aprint_error(%s channel %d: clearing WDCTL_RST failed
for drive %d\n, AHCINAME(sc), chp-ch_channel, drive);
if (sigp)
Index: src/sys/dev/ic/ahcisatavar.h
diff -u src/sys/dev/ic/ahcisatavar.h:1.10 src/sys/dev/ic/ahcisatavar.h:1.11
--- src/sys/dev/ic/ahcisatavar.h:1.10 Tue Jul 31 15:50:34 2012
+++ src/sys/dev/ic/ahcisatavar.h Fri Aug 10 16:35:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisatavar.h,v 1.10 2012/07/31 15:50:34 bouyer Exp $ */
+/* $NetBSD: ahcisatavar.h,v 1.11 2012/08/10 16:35:00 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -54,6 +54,11 @@ struct ahci_softc {
bus_dma_segment_t sc_cmd_hdr_seg;
int sc_cmd_hdr_nseg;
int sc_atac_capflags;
+ int sc_achi_quirks;
+#define AHCI_PCI_QUIRK_FORCE __BIT(0) /* force attach */
+#define AHCI_PCI_QUIRK_BAD64 __BIT(1) /* broken 64-bit DMA */
+#define AHCI_QUIRK_BADPMP __BIT(2) /* broken PMP support, ignore */
+#define AHCI_QUIRK_BADPMPRESET __BIT(2) /* broken PMP support for reset */
int32_t sc_ahci_cap; /* copy of AHCI_CAP */
int sc_ncmds; /* number of command slots */
Index: src/sys/dev/pci/ahcisata_pci.c
diff -u src/sys/dev/pci/ahcisata_pci.c:1.27 src/sys/dev/pci/ahcisata_pci.c:1.28
--- src/sys/dev/pci/ahcisata_pci.c:1.27 Mon Jan 30 19:41:18 2012
+++ src/sys/dev/pci/ahcisata_pci.c Fri Aug 10 16:35:00 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_pci.c,v 1.27 2012/01/30 19:41:18 drochner Exp $ */
+/* $NetBSD: ahcisata_pci.c,v 1.28 2012/08/10 16:35:00 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ahcisata_pci.c,v 1.27 2012/01/30 19:41:18 drochner Exp $);
+__KERNEL_RCSID(0, $NetBSD: ahcisata_pci.c,v 1.28 2012/08/10 16:35:00 bouyer Exp $);
#include sys/types.h
#include sys/malloc.h
@@ -45,58 +45,147 @@ __KERNEL_RCSID(0, $NetBSD: ahcisata_pci
struct ahci_pci_quirk {
pci_vendor_id_t vendor; /* Vendor ID */
pci_product_id_t product; /* Product ID */
- int quirks; /* quirks; see below */
+ int quirks; /* quirks; same as sc_achi_quirks */
};
-#define AHCI_PCI_QUIRK_FORCE __BIT(0) /* force attach */
-#define AHCI_PCI_QUIRK_BAD64 __BIT(1) /* broken 64-bit DMA */
-
static const struct ahci_pci_quirk ahci_pci_quirks[] = {
{ PCI_VENDOR_NVIDIA, PCI_PRODUCT_NVIDIA_MCP65_SATA,
- AHCI_PCI_QUIRK_FORCE },
+ AHCI_PCI_QUIRK_FORCE | AHCI_QUIRK_BADPMP },
{ PCI_VENDOR_NVIDIA,
CVS commit: src/lib/csu/sparc64
Module Name:src
Committed By: martin
Date: Fri Aug 10 16:37:31 UTC 2012
Modified Files:
src/lib/csu/sparc64: Makefile crt0.c
Log Message:
Slightly simplify and make position independend.
Part of fixing PR port-sparc64/46724.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/lib/csu/sparc64/Makefile
cvs rdiff -u -r1.26 -r1.27 src/lib/csu/sparc64/crt0.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/csu/sparc64/Makefile
diff -u src/lib/csu/sparc64/Makefile:1.8 src/lib/csu/sparc64/Makefile:1.9
--- src/lib/csu/sparc64/Makefile:1.8 Sat Jul 16 23:07:50 2011
+++ src/lib/csu/sparc64/Makefile Fri Aug 10 16:37:31 2012
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2011/07/16 23:07:50 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2012/08/10 16:37:31 martin Exp $
-#Uncomment the next line to enable the new .init fallthru
CPPFLAGS+= -I${.CURDIR}/../sparc_elf
+CFLAGS+= -fPIC
ELFSIZE=64
Index: src/lib/csu/sparc64/crt0.c
diff -u src/lib/csu/sparc64/crt0.c:1.26 src/lib/csu/sparc64/crt0.c:1.27
--- src/lib/csu/sparc64/crt0.c:1.26 Mon Mar 7 05:09:11 2011
+++ src/lib/csu/sparc64/crt0.c Fri Aug 10 16:37:31 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0.c,v 1.26 2011/03/07 05:09:11 joerg Exp $ */
+/* $NetBSD: crt0.c,v 1.27 2012/08/10 16:37:31 martin Exp $ */
/*
* Copyright (c) 1995 Christopher G. Demetriou
@@ -45,8 +45,6 @@
*/
__asm(\n\
- .data\n\
-__data_start: ! Start of data section\n\
.text\n\
.align 4\n\
.global _start\n\
@@ -55,11 +53,9 @@ __data_start: ! Start of data sectio
.register %g2,#scratch\n\
_start:\n\
__start:\n\
- setx __data_start, %o0, %g4 ! Point %g4 to start of data section\n\
- clr %g4! egcs thinks this is zero. XXX\n\
+ clr %g4! XXX depends on memory model used \n\
clr %fp\n\
add %sp, 8*16 + 0x7ff, %o0 ! start of stack\n\
- mov %g1, %o1 ! Cleanup routine\n\
mov %g3, %o1 ! our rtld uses %g3\n\
mov %g2, %o2 ! obj from rtld.\n\
ba,pt %icc, ___start ! jump over the retl egcs 2.96 inserts\n\
@@ -115,7 +111,7 @@ ___start(char **sp,
* NOTE: Leave the RCS ID _after_ _start(), in case it gets placed in .text.
*/
#if defined(LIBC_SCCS) !defined(lint)
-__RCSID($NetBSD: crt0.c,v 1.26 2011/03/07 05:09:11 joerg Exp $);
+__RCSID($NetBSD: crt0.c,v 1.27 2012/08/10 16:37:31 martin Exp $);
#endif /* LIBC_SCCS and not lint */
#include common.c
CVS commit: src/sys/dev/pci
Module Name:src Committed By: bouyer Date: Fri Aug 10 16:40:40 UTC 2012 Modified Files: src/sys/dev/pci: ahcisata_pci.c Log Message: Remove leftover comment. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/pci/ahcisata_pci.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/ahcisata_pci.c diff -u src/sys/dev/pci/ahcisata_pci.c:1.28 src/sys/dev/pci/ahcisata_pci.c:1.29 --- src/sys/dev/pci/ahcisata_pci.c:1.28 Fri Aug 10 16:35:00 2012 +++ src/sys/dev/pci/ahcisata_pci.c Fri Aug 10 16:40:40 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: ahcisata_pci.c,v 1.28 2012/08/10 16:35:00 bouyer Exp $ */ +/* $NetBSD: ahcisata_pci.c,v 1.29 2012/08/10 16:40:40 bouyer Exp $ */ /* * Copyright (c) 2006 Manuel Bouyer. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ahcisata_pci.c,v 1.28 2012/08/10 16:35:00 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: ahcisata_pci.c,v 1.29 2012/08/10 16:40:40 bouyer Exp $); #include sys/types.h #include sys/malloc.h @@ -294,7 +294,6 @@ ahci_pci_attach(device_t parent, device_ sc-sc_achi_quirks = ahci_pci_has_quirk(PCI_VENDOR(pa-pa_id), PCI_PRODUCT(pa-pa_id)); - /* from FreeBSD: marvell controllers have broken PMP support */ ahci_cap_64bit = (AHCI_READ(sc, AHCI_CAP) AHCI_CAP_64BIT) != 0; ahci_bad_64bit = ((sc-sc_achi_quirks AHCI_PCI_QUIRK_BAD64) != 0);
CVS commit: src
Module Name:src
Committed By: manu
Date: Fri Aug 10 16:49:36 UTC 2012
Modified Files:
src/lib/libperfuse: perfuse.c
src/lib/libpuffs: puffs.3
src/sys/fs/puffs: puffs_msgif.h puffs_vnops.c
Log Message:
Add PUFFS_KFLAG_CACHE_DOTDOT so that vnodes hold a reference on their
parent, keeping them active, and allowing to lookup .. without sending
a request to the filesystem.
Enable the featuure for perfused, as this is how FUSE works.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libperfuse/perfuse.c
cvs rdiff -u -r1.53 -r1.54 src/lib/libpuffs/puffs.3
cvs rdiff -u -r1.79 -r1.80 src/sys/fs/puffs/puffs_msgif.h
cvs rdiff -u -r1.173 -r1.174 src/sys/fs/puffs/puffs_vnops.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/libperfuse/perfuse.c
diff -u src/lib/libperfuse/perfuse.c:1.29 src/lib/libperfuse/perfuse.c:1.30
--- src/lib/libperfuse/perfuse.c:1.29 Sat Jul 21 05:49:42 2012
+++ src/lib/libperfuse/perfuse.c Fri Aug 10 16:49:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: perfuse.c,v 1.29 2012/07/21 05:49:42 manu Exp $ */
+/* $NetBSD: perfuse.c,v 1.30 2012/08/10 16:49:36 manu Exp $ */
/*-
* Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -515,6 +515,14 @@ perfuse_init(struct perfuse_callbacks *p
#else
puffs_flags = PUFFS_KFLAG_NOCACHE_NAME;
#endif
+
+ /*
+ * Do not lookuo ..
+ * That means we keep all parent vnode active
+ */
+#ifdef PUFFS_KFLAG_CACHE_DOTDOT
+ puffs_flags |= PUFFS_KFLAG_CACHE_DOTDOT;
+#endif
/*
* It would be nice to avoid useless inactive, and only
Index: src/lib/libpuffs/puffs.3
diff -u src/lib/libpuffs/puffs.3:1.53 src/lib/libpuffs/puffs.3:1.54
--- src/lib/libpuffs/puffs.3:1.53 Wed Apr 18 14:24:26 2012
+++ src/lib/libpuffs/puffs.3 Fri Aug 10 16:49:36 2012
@@ -1,4 +1,4 @@
-.\ $NetBSD: puffs.3,v 1.53 2012/04/18 14:24:26 wiz Exp $
+.\ $NetBSD: puffs.3,v 1.54 2012/08/10 16:49:36 manu Exp $
.\
.\ Copyright (c) 2006, 2007, 2008 Antti Kantee. All rights reserved.
.\
@@ -252,6 +252,9 @@ will be called instead of
.Fn puffs_node_getattr
and
.Fn puffs_node_setattr .
+.It Dv PUFFS_KFLAG_CACHE_DOTDOT
+Never send lookups for .. to the filesystem. Parent vnodes are all
+kept active until their children are reclaimed.
.It Dv PUFFS_FLAG_OPDUMP
This option makes the framework dump a textual representation of
each operation before executing it.
Index: src/sys/fs/puffs/puffs_msgif.h
diff -u src/sys/fs/puffs/puffs_msgif.h:1.79 src/sys/fs/puffs/puffs_msgif.h:1.80
--- src/sys/fs/puffs/puffs_msgif.h:1.79 Sat Jul 21 05:17:10 2012
+++ src/sys/fs/puffs/puffs_msgif.h Fri Aug 10 16:49:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_msgif.h,v 1.79 2012/07/21 05:17:10 manu Exp $ */
+/* $NetBSD: puffs_msgif.h,v 1.80 2012/08/10 16:49:35 manu Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -152,16 +152,17 @@ struct puffs_kargs {
};
#define pa_root_rdev devunion.dev
-#define PUFFS_KFLAG_NOCACHE_NAME 0x01 /* don't use name cache */
-#define PUFFS_KFLAG_NOCACHE_PAGE 0x02 /* don't use page cache */
-#define PUFFS_KFLAG_NOCACHE 0x03 /* no cache whatsoever */
-#define PUFFS_KFLAG_ALLOPS 0x04 /* ignore pa_vnopmask */
-#define PUFFS_KFLAG_WTCACHE 0x08 /* write-through page cache */
-#define PUFFS_KFLAG_IAONDEMAND 0x10 /* inactive only on demand */
-#define PUFFS_KFLAG_LOOKUP_FULLPNBUF 0x20 /* full pnbuf in lookup */
-#define PUFFS_KFLAG_NOCACHE_ATTR 0x40 /* no attrib cache (unused) */
-#define PUFFS_KFLAG_CACHE_FS_TTL 0x80 /* cache use TTL from FS*/
-#define PUFFS_KFLAG_MASK 0xbf
+#define PUFFS_KFLAG_NOCACHE_NAME 0x001 /* don't use name cache */
+#define PUFFS_KFLAG_NOCACHE_PAGE 0x002 /* don't use page cache */
+#define PUFFS_KFLAG_NOCACHE 0x003 /* no cache whatsoever */
+#define PUFFS_KFLAG_ALLOPS 0x004 /* ignore pa_vnopmask */
+#define PUFFS_KFLAG_WTCACHE 0x008 /* write-through page cache */
+#define PUFFS_KFLAG_IAONDEMAND 0x010 /* inactive only on demand */
+#define PUFFS_KFLAG_LOOKUP_FULLPNBUF 0x020 /* full pnbuf in lookup */
+#define PUFFS_KFLAG_NOCACHE_ATTR 0x040 /* no attrib cache (unused) */
+#define PUFFS_KFLAG_CACHE_FS_TTL 0x080 /* cache use TTL from FS*/
+#define PUFFS_KFLAG_CACHE_DOTDOT 0x100 /* don't send lookup for .. */
+#define PUFFS_KFLAG_MASK 0x1bf
#define PUFFS_FHFLAG_DYNAMIC 0x01
#define PUFFS_FHFLAG_NFSV2 0x02
Index: src/sys/fs/puffs/puffs_vnops.c
diff -u src/sys/fs/puffs/puffs_vnops.c:1.173 src/sys/fs/puffs/puffs_vnops.c:1.174
--- src/sys/fs/puffs/puffs_vnops.c:1.173 Fri Aug 10 14:52:56 2012
+++ src/sys/fs/puffs/puffs_vnops.c Fri Aug 10 16:49:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_vnops.c,v 1.173 2012/08/10 14:52:56 manu Exp $ */
+/* $NetBSD: puffs_vnops.c,v 1.174 2012/08/10 16:49:35 manu Exp $ */
/*
* Copyright (c) 2005, 2006, 2007 Antti Kantee. All Rights Reserved.
@@ -30,7 +30,7 @@
*/
CVS commit: src/external/bsd/atf/tests/atf/atf-c/detail
Module Name:src
Committed By: joerg
Date: Fri Aug 10 17:12:12 UTC 2012
Modified Files:
src/external/bsd/atf/tests/atf/atf-c/detail: Makefile
Log Message:
Clang supports -Wno-stack-protector.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/tests/atf/atf-c/detail/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/bsd/atf/tests/atf/atf-c/detail/Makefile
diff -u src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.2 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.3
--- src/external/bsd/atf/tests/atf/atf-c/detail/Makefile:1.2 Mon Jul 18 19:30:49 2011
+++ src/external/bsd/atf/tests/atf/atf-c/detail/Makefile Fri Aug 10 17:12:11 2012
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2011/07/18 19:30:49 tron Exp $
+# $NetBSD: Makefile,v 1.3 2012/08/10 17:12:11 joerg Exp $
.include bsd.own.mk
@@ -34,8 +34,6 @@ SRCS.${test}= ${test}.c test_helpers.c
# Don't warn about functions which cannot be stack smash protected as
# there are a lot of them.
-.if defined(HAVE_GCC) || defined(HAVE_PCC)
COPTS.dynstr_test.c= -Wno-stack-protector
-.endif
.include bsd.test.mk
CVS commit: src/sys/arch/atari
Module Name:src Committed By: tsutsui Date: Fri Aug 10 17:43:32 UTC 2012 Modified Files: src/sys/arch/atari/atari: atari_init.c machdep.c src/sys/arch/atari/include: iomap.h Log Message: Appease gcc -fno-common: - remove physmem from machdep.c since it's initialized in atari_init.c - declare I/O address space variables properly Compile test only. (currenty my TT030 is busy on pkgsrc builds) To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/arch/atari/atari/atari_init.c cvs rdiff -u -r1.174 -r1.175 src/sys/arch/atari/atari/machdep.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/atari/include/iomap.h 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/atari/atari/atari_init.c diff -u src/sys/arch/atari/atari/atari_init.c:1.99 src/sys/arch/atari/atari/atari_init.c:1.100 --- src/sys/arch/atari/atari/atari_init.c:1.99 Tue Feb 21 12:09:50 2012 +++ src/sys/arch/atari/atari/atari_init.c Fri Aug 10 17:43:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: atari_init.c,v 1.99 2012/02/21 12:09:50 tsutsui Exp $ */ +/* $NetBSD: atari_init.c,v 1.100 2012/08/10 17:43:32 tsutsui Exp $ */ /* * Copyright (c) 1995 Leo Weppelman @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: atari_init.c,v 1.99 2012/02/21 12:09:50 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: atari_init.c,v 1.100 2012/08/10 17:43:32 tsutsui Exp $); #include opt_ddb.h #include opt_mbtype.h @@ -141,6 +141,13 @@ vaddr_t page_zero; u_long st_pool_size = ST_POOL_SIZE * PAGE_SIZE; /* Patchable */ u_long st_pool_virt, st_pool_phys; +/* I/O address space variables */ +vaddr_t stio_addr; /* Where the st io-area is mapped */ +vaddr_t pci_conf_addr; /* KVA base of PCI config space */ +vaddr_t pci_io_addr; /* KVA base of PCI io-space */ +vaddr_t pci_mem_addr; /* KVA base of PCI mem-space */ +vaddr_t pci_mem_uncached; /* KVA base of an uncached PCI mem-page */ + /* * Are we relocating the kernel to TT-Ram if possible? It is faster, but * it is also reported not to work on all TT's. So the default is NO. Index: src/sys/arch/atari/atari/machdep.c diff -u src/sys/arch/atari/atari/machdep.c:1.174 src/sys/arch/atari/atari/machdep.c:1.175 --- src/sys/arch/atari/atari/machdep.c:1.174 Fri Jul 27 05:36:10 2012 +++ src/sys/arch/atari/atari/machdep.c Fri Aug 10 17:43:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.174 2012/07/27 05:36:10 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.175 2012/08/10 17:43:32 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -39,7 +39,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.174 2012/07/27 05:36:10 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.175 2012/08/10 17:43:32 tsutsui Exp $); #include opt_ddb.h #include opt_compat_netbsd.h @@ -112,7 +112,6 @@ struct vm_map *phys_map = NULL; void * msgbufaddr; vaddr_t msgbufpa; -int physmem = MAXMEM; /* max supported memory, changes to actual */ extern int freebufspace; extern u_int lowram; Index: src/sys/arch/atari/include/iomap.h diff -u src/sys/arch/atari/include/iomap.h:1.14 src/sys/arch/atari/include/iomap.h:1.15 --- src/sys/arch/atari/include/iomap.h:1.14 Tue Oct 20 19:10:11 2009 +++ src/sys/arch/atari/include/iomap.h Fri Aug 10 17:43:32 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: iomap.h,v 1.14 2009/10/20 19:10:11 snj Exp $ */ +/* $NetBSD: iomap.h,v 1.15 2012/08/10 17:43:32 tsutsui Exp $ */ /* * Copyright (c) 1995 Leo Weppelman. @@ -36,7 +36,7 @@ * I/O Address maps */ #ifdef _KERNEL -vaddr_t stio_addr; /* Where the st io-area is mapped */ +extern vaddr_t stio_addr; /* Where the st io-area is mapped */ #define AD_STIO (stio_addr) /* .. see atari_init.c */ /* @@ -48,10 +48,10 @@ vaddr_t stio_addr; /* Where the st io-a * with the PLX. Also, the Milan uses the first page of 'pci_io_addr' for * access to some of it's ISA I/O devices (RTC, Interrupt controller, etc.) */ -vaddr_t pci_conf_addr; /* KVA base of PCI config space */ -vaddr_t pci_io_addr; /* KVA base of PCI io-space */ -vaddr_t pci_mem_addr; /* KVA base of PCI mem-space */ -vaddr_t pci_mem_uncached; /* KVA base of an uncached PCI mem-page */ +extern vaddr_t pci_conf_addr; /* KVA base of PCI config space */ +extern vaddr_t pci_io_addr; /* KVA base of PCI io-space */ +extern vaddr_t pci_mem_addr; /* KVA base of PCI mem-space */ +extern vaddr_t pci_mem_uncached; /* KVA base of an uncached PCI mem-page */ #endif /* _KERNEL */ #define PCI_CONFB_PHYS (0xA000L)
CVS commit: src/distrib/evbarm/instkernel/ramdisk
Module Name:src Committed By: matt Date: Fri Aug 10 20:17:09 UTC 2012 Modified Files: src/distrib/evbarm/instkernel/ramdisk: list Log Message: Add mount_tmpfs To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/distrib/evbarm/instkernel/ramdisk/list Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/evbarm/instkernel/ramdisk/list diff -u src/distrib/evbarm/instkernel/ramdisk/list:1.22 src/distrib/evbarm/instkernel/ramdisk/list:1.23 --- src/distrib/evbarm/instkernel/ramdisk/list:1.22 Fri Aug 10 05:21:14 2012 +++ src/distrib/evbarm/instkernel/ramdisk/list Fri Aug 10 20:17:09 2012 @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.22 2012/08/10 05:21:14 matt Exp $ +# $NetBSD: list,v 1.23 2012/08/10 20:17:09 matt Exp $ SRCDIRS bin sbin external/bsd/less/bin usr.bin usr.sbin @@ -36,6 +36,7 @@ PROG sbin/mount_ffs PROG sbin/mount_kernfs PROG sbin/mount_msdos PROG sbin/mount_nfs +PROG sbin/mount_tmpfs PROG sbin/newfs sbin/mount_mfs PROG sbin/ping PROG sbin/reboot sbin/halt
CVS commit: src/lib/libpuffs
Module Name:src Committed By: wiz Date: Fri Aug 10 21:00:45 UTC 2012 Modified Files: src/lib/libpuffs: puffs.3 Log Message: Use more markup. New sentence, new line. Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/lib/libpuffs/puffs.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libpuffs/puffs.3 diff -u src/lib/libpuffs/puffs.3:1.54 src/lib/libpuffs/puffs.3:1.55 --- src/lib/libpuffs/puffs.3:1.54 Fri Aug 10 16:49:36 2012 +++ src/lib/libpuffs/puffs.3 Fri Aug 10 21:00:45 2012 @@ -1,4 +1,4 @@ -.\ $NetBSD: puffs.3,v 1.54 2012/08/10 16:49:36 manu Exp $ +.\ $NetBSD: puffs.3,v 1.55 2012/08/10 21:00:45 wiz Exp $ .\ .\ Copyright (c) 2006, 2007, 2008 Antti Kantee. All rights reserved. .\ @@ -23,7 +23,7 @@ .\ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\ SUCH DAMAGE. .\ -.Dd April 18, 2012 +.Dd August 10, 2012 .Dt PUFFS 3 .Os .Sh NAME @@ -253,8 +253,10 @@ will be called instead of and .Fn puffs_node_setattr . .It Dv PUFFS_KFLAG_CACHE_DOTDOT -Never send lookups for .. to the filesystem. Parent vnodes are all -kept active until their children are reclaimed. +Never send lookups for +.Dq .. +to the filesystem. +Parent vnodes are all kept active until their children are reclaimed. .It Dv PUFFS_FLAG_OPDUMP This option makes the framework dump a textual representation of each operation before executing it.
CVS commit: src/sys/fs/puffs
Module Name:src
Committed By: manu
Date: Sat Aug 11 01:10:11 UTC 2012
Modified Files:
src/sys/fs/puffs: puffs_sys.h
Log Message:
Missing bit in previous commit (PUFFS_KFLAG_CACHE_DOTDOT option to avoid
looking up ..)
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/sys/fs/puffs/puffs_sys.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/puffs/puffs_sys.h
diff -u src/sys/fs/puffs/puffs_sys.h:1.81 src/sys/fs/puffs/puffs_sys.h:1.82
--- src/sys/fs/puffs/puffs_sys.h:1.81 Fri Jul 27 07:38:44 2012
+++ src/sys/fs/puffs/puffs_sys.h Sat Aug 11 01:10:11 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: puffs_sys.h,v 1.81 2012/07/27 07:38:44 manu Exp $ */
+/* $NetBSD: puffs_sys.h,v 1.82 2012/08/11 01:10:11 manu Exp $ */
/*
* Copyright (c) 2005, 2006 Antti Kantee. All Rights Reserved.
@@ -92,6 +92,8 @@ extern int puffsdebug; /* puffs_subr.c *
((pmp)-pmp_flags PUFFS_KFLAG_LOOKUP_FULLPNBUF)
#define PUFFS_USE_FS_TTL(pmp) \
((pmp)-pmp_flags PUFFS_KFLAG_CACHE_FS_TTL)
+#define PUFFS_USE_DOTDOTCACHE(pmp) \
+((pmp)-pmp_flags PUFFS_KFLAG_CACHE_DOTDOT)
#define PUFFS_WCACHEINFO(pmp) 0
@@ -228,6 +230,7 @@ struct puffs_node {
int pn_cn_grace; /* grace time before reclaim */
int pn_va_timeout; /* attribute cache */
struct vattr * pn_va_cache; /* attribute cache */
+ struct vnode * pn_parent; /* parent cache */
LIST_ENTRY(puffs_node) pn_hashent;
};
CVS commit: src/sys/arch/next68k/next68k
Module Name:src Committed By: tsutsui Date: Sat Aug 11 01:21:05 UTC 2012 Modified Files: src/sys/arch/next68k/next68k: machdep.c nextrom.c Log Message: Sprinkle extern to appease gcc -fno-common. To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/sys/arch/next68k/next68k/machdep.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/next68k/next68k/nextrom.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/arch/next68k/next68k/machdep.c diff -u src/sys/arch/next68k/next68k/machdep.c:1.108 src/sys/arch/next68k/next68k/machdep.c:1.109 --- src/sys/arch/next68k/next68k/machdep.c:1.108 Sat Jul 28 19:08:24 2012 +++ src/sys/arch/next68k/next68k/machdep.c Sat Aug 11 01:21:04 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.108 2012/07/28 19:08:24 matt Exp $ */ +/* $NetBSD: machdep.c,v 1.109 2012/08/11 01:21:04 tsutsui Exp $ */ /* * Copyright (c) 1998 Darrin B. Jewell @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.108 2012/07/28 19:08:24 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.109 2012/08/11 01:21:04 tsutsui Exp $); #include opt_ddb.h #include opt_kgdb.h @@ -115,7 +115,8 @@ __KERNEL_RCSID(0, $NetBSD: machdep.c,v #include ksyms.h int nsym; -char *ssym, *esym; +char *ssym; +extern char *esym; #define MAXMEM 64*1024 /* XXX - from cmap.h */ Index: src/sys/arch/next68k/next68k/nextrom.c diff -u src/sys/arch/next68k/next68k/nextrom.c:1.24 src/sys/arch/next68k/next68k/nextrom.c:1.25 --- src/sys/arch/next68k/next68k/nextrom.c:1.24 Sun Dec 18 04:29:32 2011 +++ src/sys/arch/next68k/next68k/nextrom.c Sat Aug 11 01:21:04 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: nextrom.c,v 1.24 2011/12/18 04:29:32 tsutsui Exp $ */ +/* $NetBSD: nextrom.c,v 1.25 2012/08/11 01:21:04 tsutsui Exp $ */ /* * Copyright (c) 1998 Darrin B. Jewell * All rights reserved. @@ -25,7 +25,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: nextrom.c,v 1.24 2011/12/18 04:29:32 tsutsui Exp $); +__KERNEL_RCSID(0, $NetBSD: nextrom.c,v 1.25 2012/08/11 01:21:04 tsutsui Exp $); #include opt_ddb.h #include opt_serial.h @@ -50,8 +50,8 @@ int mon_getc(void); int mon_putc(int); extern char etext[], edata[], end[]; -int nsym; -char *ssym, *esym; +extern int nsym; +extern char *ssym, *esym; volatile struct mon_global *mg;
CVS commit: src/lib/csu/arch/arm
Module Name:src
Committed By: matt
Date: Sat Aug 11 01:33:36 UTC 2012
Modified Files:
src/lib/csu/arch/arm: crt0.S crti.S crtn.S
Added Files:
src/lib/csu/arch/arm: crtbegin.S crtend.S
Log Message:
USE_COMPILERCRTSTUFF=no support for arm
This passes all the lib/csu atf tests.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/lib/csu/arch/arm/crt0.S \
src/lib/csu/arch/arm/crti.S src/lib/csu/arch/arm/crtn.S
cvs rdiff -u -r0 -r1.1 src/lib/csu/arch/arm/crtbegin.S \
src/lib/csu/arch/arm/crtend.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/csu/arch/arm/crt0.S
diff -u src/lib/csu/arch/arm/crt0.S:1.1 src/lib/csu/arch/arm/crt0.S:1.2
--- src/lib/csu/arch/arm/crt0.S:1.1 Sat Aug 7 18:01:33 2010
+++ src/lib/csu/arch/arm/crt0.S Sat Aug 11 01:33:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0.S,v 1.1 2010/08/07 18:01:33 joerg Exp $ */
+/* $NetBSD: crt0.S,v 1.2 2012/08/11 01:33:36 matt Exp $ */
/*
* Copyright (C) 1997 Mark Brinicombe
@@ -33,24 +33,25 @@
*/
#include machine/asm.h
-RCSID($NetBSD: crt0.S,v 1.1 2010/08/07 18:01:33 joerg Exp $)
+RCSID($NetBSD: crt0.S,v 1.2 2012/08/11 01:33:36 matt Exp $)
STRONG_ALIAS(_start,__start)
_ENTRY(__start)
- mov r5, r2 /* cleanup */
- mov r4, r1 /* obj_main */
- mov r3, r0 /* ps_strings */
- /* Get argc, argv, and envp from stack */
- ldr r0, [sp, #0x]
- add r1, sp, #0x0004
- add r2, r1, r0, lsl #2
- add r2, r2, #0x0004
+ /*
+ * We need to swap ps_strings and cleanup
+ */
+ mov ip, r0 /* ps_strings - tmp */
+ mov r0, r2 /* cleanup - ps_strings */
+ mov r2, ip /* tmp - ps_strings */
/* Ensure the stack is properly aligned before calling C code. */
bic sp, sp, #7
- sub sp, sp, #8
- str r5, [sp, #4]
- str r4, [sp, #0]
+
+ /*
+ * void ___start(void (*cleanup)(void),
+ *const Obj_Entry *obj,
+ *struct ps_strings *ps_strings);
+ */
b ___start
Index: src/lib/csu/arch/arm/crti.S
diff -u src/lib/csu/arch/arm/crti.S:1.1 src/lib/csu/arch/arm/crti.S:1.2
--- src/lib/csu/arch/arm/crti.S:1.1 Sat Aug 7 18:01:33 2010
+++ src/lib/csu/arch/arm/crti.S Sat Aug 11 01:33:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: crti.S,v 1.1 2010/08/07 18:01:33 joerg Exp $ */
+/* $NetBSD: crti.S,v 1.2 2012/08/11 01:33:36 matt Exp $ */
/*-
* Copyright (c) 2001 Ross Harvey
@@ -35,21 +35,23 @@
#include machine/asm.h
-RCSID($NetBSD: crti.S,v 1.1 2010/08/07 18:01:33 joerg Exp $)
+RCSID($NetBSD: crti.S,v 1.2 2012/08/11 01:33:36 matt Exp $)
#include sysident.S
- .section .init, ax, @progbits
+ .section .init, ax, %progbits
.align 0
.globl _init
+ .type _init,%function
_init:
mov ip, sp
stmfd sp!, {fp, ip, lr, pc}
sub fp, ip, #4
- .section .fini, ax, @progbits
+ .section .fini, ax, %progbits
.align 0
.globl _fini
+ .type _fini,%function
_fini:
mov ip, sp
stmfd sp!, {fp, ip, lr, pc}
Index: src/lib/csu/arch/arm/crtn.S
diff -u src/lib/csu/arch/arm/crtn.S:1.1 src/lib/csu/arch/arm/crtn.S:1.2
--- src/lib/csu/arch/arm/crtn.S:1.1 Sat Aug 7 18:01:33 2010
+++ src/lib/csu/arch/arm/crtn.S Sat Aug 11 01:33:36 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: crtn.S,v 1.1 2010/08/07 18:01:33 joerg Exp $ */
+/* $NetBSD: crtn.S,v 1.2 2012/08/11 01:33:36 matt Exp $ */
/*-
* Copyright (c) 2001 Ross Harvey
@@ -35,10 +35,10 @@
#include machine/asm.h
-RCSID($NetBSD: crtn.S,v 1.1 2010/08/07 18:01:33 joerg Exp $)
+RCSID($NetBSD: crtn.S,v 1.2 2012/08/11 01:33:36 matt Exp $)
- .section .init, ax, @progbits
+ .section .init, ax, %progbits
ldmea fp, {fp, sp, pc}
- .section .fini, ax, @progbits
+ .section .fini, ax, %progbits
ldmea fp, {fp, sp, pc}
Added files:
Index: src/lib/csu/arch/arm/crtbegin.S
diff -u /dev/null src/lib/csu/arch/arm/crtbegin.S:1.1
--- /dev/null Sat Aug 11 01:33:36 2012
+++ src/lib/csu/arch/arm/crtbegin.S Sat Aug 11 01:33:36 2012
@@ -0,0 +1,295 @@
+/* $NetBSD: crtbegin.S,v 1.1 2012/08/11 01:33:36 matt Exp $ */
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * 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
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: nakayama Date: Sat Aug 11 03:19:49 UTC 2012 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Fix MKRUMP=no build. To generate a diff of this commit: cvs rdiff -u -r1.485 -r1.486 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.485 src/distrib/sets/lists/tests/mi:1.486 --- src/distrib/sets/lists/tests/mi:1.485 Fri Aug 10 16:22:34 2012 +++ src/distrib/sets/lists/tests/mi Sat Aug 11 03:19:48 2012 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.485 2012/08/10 16:22:34 joerg Exp $ +# $NetBSD: mi,v 1.486 2012/08/11 03:19:48 nakayama Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -1483,8 +1483,8 @@ ./usr/tests/examples/Atffile tests-asm-tests atf ./usr/tests/examples/t_asm tests-asm-tests atf ./usr/tests/fs tests-fs-tests -./usr/tests/fs/Atffiletests-fs-tests atf -./usr/tests/fs/h_funcs.subr tests-fs-tests atf +./usr/tests/fs/Atffiletests-fs-tests atf,rump +./usr/tests/fs/h_funcs.subr tests-fs-tests atf,rump ./usr/tests/fs/ffstests-fs-tests ./usr/tests/fs/ffs/Atffile tests-fs-tests atf,rump ./usr/tests/fs/ffs/h_ffs_server tests-fs-tests atf,rump @@ -2711,14 +2711,14 @@ ./usr/tests/lib/librt/Atffile tests-lib-tests atf ./usr/tests/lib/librt/t_sched tests-lib-tests atf ./usr/tests/lib/librt/t_sem tests-lib-tests atf -./usr/tests/lib/librumpclienttests-lib-tests atf,rump +./usr/tests/lib/librumpclienttests-lib-tests atf ./usr/tests/lib/librumpclient/Atffile tests-lib-tests atf,rump ./usr/tests/lib/librumpclient/h_exec tests-lib-tests atf,rump ./usr/tests/lib/librumpclient/h_execthr tests-lib-tests atf,rump ./usr/tests/lib/librumpclient/h_ution tests-obsolete obsolete ./usr/tests/lib/librumpclient/t_exec tests-lib-tests atf,rump ./usr/tests/lib/librumpclient/t_fd tests-lib-tests atf,rump -./usr/tests/lib/librumphijack tests-lib-tests atf,rump +./usr/tests/lib/librumphijack tests-lib-tests atf ./usr/tests/lib/librumphijack/Atffile tests-lib-tests atf,rump ./usr/tests/lib/librumphijack/h_client tests-lib-tests atf,rump ./usr/tests/lib/librumphijack/h_cwd tests-lib-tests atf,rump
