CVS commit: src/sys/kern
Module Name:src
Committed By: riz
Date: Mon Feb 1 05:05:44 UTC 2016
Modified Files:
src/sys/kern: subr_devsw.c vfs_bio.c
Log Message:
Implement the 'io' provider for DTrace. From riastradh@, with
fixes from me.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/kern/subr_devsw.c
cvs rdiff -u -r1.258 -r1.259 src/sys/kern/vfs_bio.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/kern/subr_devsw.c
diff -u src/sys/kern/subr_devsw.c:1.33 src/sys/kern/subr_devsw.c:1.34
--- src/sys/kern/subr_devsw.c:1.33 Fri Sep 5 05:57:21 2014
+++ src/sys/kern/subr_devsw.c Mon Feb 1 05:05:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_devsw.c,v 1.33 2014/09/05 05:57:21 matt Exp $ */
+/* $NetBSD: subr_devsw.c,v 1.34 2016/02/01 05:05:43 riz Exp $ */
/*-
* Copyright (c) 2001, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.33 2014/09/05 05:57:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_devsw.c,v 1.34 2016/02/01 05:05:43 riz Exp $");
+
+#ifdef _KERNEL_OPT
+#include "opt_dtrace.h"
+#endif
#include
#include
@@ -80,6 +84,7 @@ __KERNEL_RCSID(0, "$NetBSD: subr_devsw.c
#include
#include
#include
+#include
#ifdef DEVSW_DEBUG
#define DPRINTF(x) printf x
@@ -730,12 +735,17 @@ bdev_close(dev_t dev, int flag, int devt
return rv;
}
+SDT_PROVIDER_DECLARE(io);
+SDT_PROBE_DEFINE1(io, kernel, , start, "struct buf *"/*bp*/);
+
void
bdev_strategy(struct buf *bp)
{
const struct bdevsw *d;
int mpflag;
+ SDT_PROBE1(io, kernel, , start, bp);
+
if ((d = bdevsw_lookup(bp->b_dev)) == NULL) {
bp->b_error = ENXIO;
bp->b_resid = bp->b_bcount;
Index: src/sys/kern/vfs_bio.c
diff -u src/sys/kern/vfs_bio.c:1.258 src/sys/kern/vfs_bio.c:1.259
--- src/sys/kern/vfs_bio.c:1.258 Mon Jan 11 01:22:36 2016
+++ src/sys/kern/vfs_bio.c Mon Feb 1 05:05:43 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_bio.c,v 1.258 2016/01/11 01:22:36 dholland Exp $ */
+/* $NetBSD: vfs_bio.c,v 1.259 2016/02/01 05:05:43 riz Exp $ */
/*-
* Copyright (c) 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -123,10 +123,11 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.258 2016/01/11 01:22:36 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v 1.259 2016/02/01 05:05:43 riz Exp $");
#ifdef _KERNEL_OPT
#include "opt_bufcache.h"
+#include "opt_dtrace.h"
#endif
#include
@@ -146,6 +147,7 @@ __KERNEL_RCSID(0, "$NetBSD: vfs_bio.c,v
#include
#include
#include
+#include
#include /* extern struct uvm uvm */
@@ -1474,6 +1476,11 @@ buf_drain(int n)
return size;
}
+SDT_PROVIDER_DEFINE(io);
+
+SDT_PROBE_DEFINE1(io, kernel, , wait__start, "struct buf *"/*bp*/);
+SDT_PROBE_DEFINE1(io, kernel, , wait__done, "struct buf *"/*bp*/);
+
/*
* Wait for operations on the buffer to complete.
* When they do, extract and return the I/O's error value.
@@ -1485,11 +1492,15 @@ biowait(buf_t *bp)
KASSERT(ISSET(bp->b_cflags, BC_BUSY));
KASSERT(bp->b_refcnt > 0);
+ SDT_PROBE1(io, kernel, , wait__start, bp);
+
mutex_enter(bp->b_objlock);
while (!ISSET(bp->b_oflags, BO_DONE | BO_DELWRI))
cv_wait(&bp->b_done, bp->b_objlock);
mutex_exit(bp->b_objlock);
+ SDT_PROBE1(io, kernel, , wait__done, bp);
+
return bp->b_error;
}
@@ -1528,11 +1539,15 @@ biodone(buf_t *bp)
}
}
+SDT_PROBE_DEFINE1(io, kernel, , done, "struct buf *"/*bp*/);
+
static void
biodone2(buf_t *bp)
{
void (*callout)(buf_t *);
+ SDT_PROBE1(io, kernel, ,done, bp);
+
mutex_enter(bp->b_objlock);
/* Note that the transfer is done. */
if (ISSET(bp->b_oflags, BO_DONE))
CVS commit: src/sys/fs/msdosfs
Module Name:src
Committed By: christos
Date: Mon Feb 1 02:59:33 UTC 2016
Modified Files:
src/sys/fs/msdosfs: direntry.h msdosfs_conv.c msdosfs_vnops.c
Log Message:
We can't depend on dp->d_namlen existing for the parts that are used in
makefs(8).
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/fs/msdosfs/direntry.h
cvs rdiff -u -r1.11 -r1.12 src/sys/fs/msdosfs/msdosfs_conv.c
cvs rdiff -u -r1.94 -r1.95 src/sys/fs/msdosfs/msdosfs_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/msdosfs/direntry.h
diff -u src/sys/fs/msdosfs/direntry.h:1.10 src/sys/fs/msdosfs/direntry.h:1.11
--- src/sys/fs/msdosfs/direntry.h:1.10 Sat Jan 30 04:59:27 2016
+++ src/sys/fs/msdosfs/direntry.h Sun Jan 31 21:59:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: direntry.h,v 1.10 2016/01/30 09:59:27 mlelstv Exp $ */
+/* $NetBSD: direntry.h,v 1.11 2016/02/01 02:59:33 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -140,7 +140,7 @@ int unix2winfn(const unsigned char *un,
int winChkName(const unsigned char *un, int unlen, struct winentry *wep,
int chksum, int utf8);
int win2unixfn(struct winentry *wep, struct dirent *dp, int chksum,
- int utf8);
+ uint16_t *namlen, int utf8);
uint8_t winChksum(uint8_t *name);
int winSlotCnt(const unsigned char *un, int unlen, int utf8);
#endif /* _KERNEL || MAKEFS */
Index: src/sys/fs/msdosfs/msdosfs_conv.c
diff -u src/sys/fs/msdosfs/msdosfs_conv.c:1.11 src/sys/fs/msdosfs/msdosfs_conv.c:1.12
--- src/sys/fs/msdosfs/msdosfs_conv.c:1.11 Sat Jan 30 04:59:27 2016
+++ src/sys/fs/msdosfs/msdosfs_conv.c Sun Jan 31 21:59:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_conv.c,v 1.11 2016/01/30 09:59:27 mlelstv Exp $ */
+/* $NetBSD: msdosfs_conv.c,v 1.12 2016/02/01 02:59:33 christos Exp $ */
/*-
* Copyright (C) 1995, 1997 Wolfgang Solfrank.
@@ -62,7 +62,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_conv.c,v 1.11 2016/01/30 09:59:27 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_conv.c,v 1.12 2016/02/01 02:59:33 christos Exp $");
/*
* System include files.
@@ -1549,7 +1549,8 @@ winChkName(const u_char *un, int unlen,
* Returns the checksum or -1 if impossible
*/
int
-win2unixfn(struct winentry *wep, struct dirent *dp, int chksum, int utf8)
+win2unixfn(struct winentry *wep, struct dirent *dp, int chksum,
+uint16_t *namlen, int utf8)
{
u_int16_t wn[WIN_CHARS], *p;
u_int8_t buf[WIN_CHARS*3];
@@ -1564,7 +1565,7 @@ win2unixfn(struct winentry *wep, struct
*/
if (wep->weCnt & WIN_LAST) {
chksum = wep->weChksum;
- dp->d_namlen = 0;
+ *namlen = 0;
} else if (chksum != wep->weChksum)
chksum = -1;
if (chksum == -1)
@@ -1591,6 +1592,9 @@ win2unixfn(struct winentry *wep, struct
*/
len = utf8 ? ucs2utf8str(wn, WIN_CHARS, buf, sizeof(buf)) : ucs2char8str(wn, WIN_CHARS, buf, sizeof(buf));
+ if (len > sizeof(dp->d_name) - 1)
+ return -1;
+
/*
* Prepend name segment to directory entry
*
@@ -1602,12 +1606,16 @@ win2unixfn(struct winentry *wep, struct
* are silently discarded. This could also end in multiple
* files using the same (truncated) name.
*/
- dp->d_namlen += len;
- if (dp->d_namlen > sizeof(dp->d_name)-1)
- dp->d_namlen = sizeof(dp->d_name)-1;
- memmove(&dp->d_name[len], &dp->d_name[0], dp->d_namlen - len);
+ *namlen += len;
+ if (*namlen > sizeof(dp->d_name) - 1)
+ *namlen = sizeof(dp->d_name) - 1;
+ memmove(&dp->d_name[len], &dp->d_name[0], *namlen - len);
memcpy(dp->d_name, buf, len);
+#ifdef __NetBSD__
+ dp->d_namlen = *namlen;
+#endif
+
return chksum;
}
Index: src/sys/fs/msdosfs/msdosfs_vnops.c
diff -u src/sys/fs/msdosfs/msdosfs_vnops.c:1.94 src/sys/fs/msdosfs/msdosfs_vnops.c:1.95
--- src/sys/fs/msdosfs/msdosfs_vnops.c:1.94 Sat Jan 30 04:59:27 2016
+++ src/sys/fs/msdosfs/msdosfs_vnops.c Sun Jan 31 21:59:33 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vnops.c,v 1.94 2016/01/30 09:59:27 mlelstv Exp $ */
+/* $NetBSD: msdosfs_vnops.c,v 1.95 2016/02/01 02:59:33 christos Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.94 2016/01/30 09:59:27 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: msdosfs_vnops.c,v 1.95 2016/02/01 02:59:33 christos Exp $");
#include
#include
@@ -1394,6 +1394,7 @@ msdosfs_readdir(void *v)
int ncookies = 0, nc = 0;
off_t offset, uio_off;
int chksum = -1;
+ uint16_t namlen;
#ifdef MSDOSFS_DEBUG
printf("msdosfs_readdir(): vp %p, uio %p, cred %p, eofflagp %p\n",
@@ -1541,7 +1542,8 @@ msdosfs_readdir(void *v)
if (pmp->pm_flags & MSDOSFSMNT_SHORTNAME)
continue;
chksum = win2unixfn((struct winentry *)dentp,
-dirbuf, chksum, pmp->pm_flags & MSDOSFSMNT_UTF8);
+dirbuf, chksum, &namlen,
+pmp->pm_flags & MSDOSFSMNT_UTF8);
continue;
}
@@ -1584,6 +1586,
CVS commit: src/external/bsd/elftoolchain/dist/libelf
Module Name:src Committed By: christos Date: Mon Feb 1 02:16:48 UTC 2016 Modified Files: src/external/bsd/elftoolchain/dist/libelf: _libelf_config.h Log Message: For the tools version we determine our own arch, we don't need to figure it out at runtime in the linux case. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h diff -u src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h:1.3 src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h:1.4 --- src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h:1.3 Tue Sep 29 15:43:39 2015 +++ src/external/bsd/elftoolchain/dist/libelf/_libelf_config.h Sun Jan 31 21:16:48 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: _libelf_config.h,v 1.3 2015/09/29 19:43:39 christos Exp $ */ +/* $NetBSD: _libelf_config.h,v 1.4 2016/02/01 02:16:48 christos Exp $ */ /*- * Copyright (c) 2008-2011 Joseph Koshy @@ -156,6 +156,7 @@ * kernel such as GNU/kFreeBSD. */ +#ifndef HAVE_NBTOOL_CONFIG_H #if defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) #if defined(__linux__) @@ -177,3 +178,4 @@ #endif #endif /* defined(__linux__) || defined(__GNU__) || defined(__GLIBC__) */ +#endif /* HAVE_NBTOOL_CONFIG_H */
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src
Committed By: christos
Date: Mon Feb 1 02:12:55 UTC 2016
Modified Files:
src/external/cddl/osnet/sys/sys: sysmacros.h types.h
Added Files:
src/external/cddl/osnet/sys/sys: opentypes.h
Log Message:
Split the opensolaris types into opentypes.h because linux includes
sysmacros.h from types.h and we can't interpose ourselves to define
the needed types otherwise.
Disable unused macros, get rid of __APPLE__
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/cddl/osnet/sys/sys/opentypes.h
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/sys/sys/sysmacros.h
cvs rdiff -u -r1.16 -r1.17 src/external/cddl/osnet/sys/sys/types.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/sys/sys/sysmacros.h
diff -u src/external/cddl/osnet/sys/sys/sysmacros.h:1.6 src/external/cddl/osnet/sys/sys/sysmacros.h:1.7
--- src/external/cddl/osnet/sys/sys/sysmacros.h:1.6 Sun Dec 27 16:40:21 2015
+++ src/external/cddl/osnet/sys/sys/sysmacros.h Sun Jan 31 21:12:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: sysmacros.h,v 1.6 2015/12/27 21:40:21 christos Exp $ */
+/* $NetBSD: sysmacros.h,v 1.7 2016/02/01 02:12:55 christos Exp $ */
/*
* CDDL HEADER START
@@ -33,6 +33,7 @@
#define _SYS_SYSMACROS_H
#include
+#include
#ifdef __cplusplus
extern "C" {
@@ -348,7 +349,7 @@ extern unsigned char bcd_to_byte[256];
* because if a field crosses a byte boundary it's not likely to be meaningful
* without reassembly in its nonnative endianness.
*/
-#if !defined(__NetBSD__) && !defined(__APPLE__)
+#ifdef notdef
#if defined(_BIT_FIELDS_LTOH)
#define DECL_BITFIELD2(_a, _b)\
uint8_t _a, _b
Index: src/external/cddl/osnet/sys/sys/types.h
diff -u src/external/cddl/osnet/sys/sys/types.h:1.16 src/external/cddl/osnet/sys/sys/types.h:1.17
--- src/external/cddl/osnet/sys/sys/types.h:1.16 Sun Jan 31 01:15:39 2016
+++ src/external/cddl/osnet/sys/sys/types.h Sun Jan 31 21:12:55 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.16 2016/01/31 06:15:39 christos Exp $ */
+/* $NetBSD: types.h,v 1.17 2016/02/01 02:12:55 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -63,11 +63,12 @@
/*
* This is a bag of dirty hacks to keep things compiling.
*/
-#ifdef __APPLE__
+#ifndef _KERNEL
#include
#else
#include
#endif
+#ifndef HAVE_NBTOOLS_CONFIG_H
#ifdef _NETBSD_SOURCE
#include_next
#include_next
@@ -77,6 +78,7 @@
#include_next
#undef _NETBSD_SOURCE
#endif
+#endif
#ifndef _KERNEL
#include
@@ -84,76 +86,6 @@
#include
#endif
-#define MAXNAMELEN 256
-#define FMNAMESZ 8
-
-#ifdef __APPLE__
-typedef int64_t longlong_t;
-typedef uint64_t u_longlong_t;
-typedef unsigned long vsize_t;
-#endif
-
-typedef unsigned int size32_t;
-typedef unsigned int caddr32_t;
-
-typedef struct timespec timestruc_t;
-typedef u_int uint_t;
-typedef u_char uchar_t;
-typedef u_short ushort_t;
-typedef u_long ulong_t;
-typedef off_t off64_t;
-typedef id_t taskid_t;
-typedef id_t projid_t;
-typedef id_t poolid_t;
-typedef id_t zoneid_t;
-typedef id_t ctid_t;
-
-#define B_FALSE 0
-#define B_TRUE 1
-typedef int boolean_t;
-
-typedef longlong_t hrtime_t;
-typedef int32_t t_scalar_t;
-typedef uint32_t t_uscalar_t;
-#if defined(_KERNEL) || defined(_KERNTYPES)
-typedef vsize_t pgcnt_t;
-#endif
-typedef u_longlong_t len_t;
-typedef int major_t;
-typedef int minor_t;
-typedef int o_uid_t;
-typedef int o_gid_t;
-typedef struct kauth_cred cred_t;
-typedef uintptr_t pc_t;
-typedef struct vm_page page_t;
-typedef ushort_t o_mode_t; /* old file attribute type */
-typedef u_longlong_t diskaddr_t;
-typedef void *zone_t;
-typedef struct vfsops vfsops_t;
-
-#ifdef _KERNEL
-
-typedef short index_t;
-typedef off_t offset_t;
-typedef int64_t rlim64_t;
-typedef __caddr_t caddr_t; /* core address */
-
-#else
-
-typedef longlong_t offset_t;
-typedef u_longlong_t u_offset_t;
-typedef uint64_t upad64_t;
-typedef struct timespec timespec_t;
-typedef int32_t daddr32_t;
-typedef int32_t time32_t;
-
-#endif /* !_KERNEL */
-
-#define MAXOFFSET_T 0x7fffLL
-#define seg_rw uio_rw
-#define S_READ UIO_READ
-#define S_WRITE UIO_WRITE
-struct aio_req;
-typedef void *dev_info_t;
+#include
#endif /* !_OPENSOLARIS_SYS_TYPES_H_ */
Added files:
Index: src/external/cddl/osnet/sys/sys/opentypes.h
diff -u /dev/null src/external/cddl/osnet/sys/sys/opentypes.h:1.1
--- /dev/null Sun Jan 31 21:12:55 2016
+++ src/external/cddl/osnet/sys/sys/opentypes.h Sun Jan 31 21:12:55 2016
@@ -0,0 +1,76 @@
+#ifndef _OPENSOLARIS_SYS_OPENTYPES_H_
+#define _OPENSOLARIS_SYS_OPENTYPES_H_
+
+#define MAXNAMELEN 256
+#define FMNAMESZ 8
+
+#if defined(__APPLE__) || defined(HAVE_NBTOOL_CONFIG_H)
+typedef int64_t longlong_t;
+typedef uint64_t u_longlong_t;
+typedef unsigned long vsize_t;
+#endif
+
+typedef unsigned int size32_t;
+typedef unsigned int caddr32_t;
+
+typedef struct times
CVS commit: src/external/cddl/osnet/sys/sys
Module Name:src Committed By: christos Date: Mon Feb 1 02:09:54 UTC 2016 Modified Files: src/external/cddl/osnet/sys/sys: errno.h Log Message: prevent re-defines To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/external/cddl/osnet/sys/sys/errno.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/sys/sys/errno.h diff -u src/external/cddl/osnet/sys/sys/errno.h:1.1 src/external/cddl/osnet/sys/sys/errno.h:1.2 --- src/external/cddl/osnet/sys/sys/errno.h:1.1 Fri Aug 7 16:57:57 2009 +++ src/external/cddl/osnet/sys/sys/errno.h Sun Jan 31 21:09:54 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: errno.h,v 1.1 2009/08/07 20:57:57 haad Exp $ */ +/* $NetBSD: errno.h,v 1.2 2016/02/01 02:09:54 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -29,7 +29,11 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifndef EBADE #define EBADE ENOSR +#endif +#ifndef EBADR #define EBADR ENOSTR +#endif #include_next
CVS commit: src/lib/libc/gen
Module Name:src
Committed By: christos
Date: Sun Jan 31 23:41:38 UTC 2016
Modified Files:
src/lib/libc/gen: getpass.c
Log Message:
PR/50695: coypu: ctrl-c in su password input breaks shell (bash, csh)
Always restore the tty settings.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/lib/libc/gen/getpass.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/gen/getpass.c
diff -u src/lib/libc/gen/getpass.c:1.29 src/lib/libc/gen/getpass.c:1.30
--- src/lib/libc/gen/getpass.c:1.29 Thu Sep 18 09:58:20 2014
+++ src/lib/libc/gen/getpass.c Sun Jan 31 18:41:38 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: getpass.c,v 1.29 2014/09/18 13:58:20 christos Exp $ */
+/* $NetBSD: getpass.c,v 1.30 2016/01/31 23:41:38 christos Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getpass.c,v 1.29 2014/09/18 13:58:20 christos Exp $");
+__RCSID("$NetBSD: getpass.c,v 1.30 2016/01/31 23:41:38 christos Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -288,12 +288,12 @@ add:
good = true;
restore:
+out:
if (havetty) {
c = errno;
(void)tcsetattr(fd[0], TCSAFLUSH|TCSASOFT, >);
errno = c;
}
-out:
if (good && (flags & GETPASS_ECHO_NL))
(void)write(fd[1], "\n", 1);
CVS commit: src
Module Name:src
Committed By: pooka
Date: Sun Jan 31 23:14:34 UTC 2016
Modified Files:
src/distrib/sets/lists/comp: mi
src/sys/rump/include/rump: Makefile rump.h
Added Files:
src/sys/rump/include/rump: rump_syscallshotgun.h
Log Message:
Move "shotgun approach to rump syscalls" from rump.h to a separate header,
sort of as a hint that relying on those macros is not necessarily the
way you want to do things in 2016. Include things from rump.h for compat
for the time being, though.
To generate a diff of this commit:
cvs rdiff -u -r1.2015 -r1.2016 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.8 -r1.9 src/sys/rump/include/rump/Makefile
cvs rdiff -u -r1.67 -r1.68 src/sys/rump/include/rump/rump.h
cvs rdiff -u -r0 -r1.1 src/sys/rump/include/rump/rump_syscallshotgun.h
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/mi
diff -u src/distrib/sets/lists/comp/mi:1.2015 src/distrib/sets/lists/comp/mi:1.2016
--- src/distrib/sets/lists/comp/mi:1.2015 Sun Jan 24 17:14:10 2016
+++ src/distrib/sets/lists/comp/mi Sun Jan 31 23:14:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2015 2016/01/24 17:14:10 christos Exp $
+# $NetBSD: mi,v 1.2016 2016/01/31 23:14:34 pooka Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.compcomp-sys-root
@@ -2661,6 +2661,7 @@
./usr/include/rump/rump_namei.h comp-c-include rump
./usr/include/rump/rump_syscalls.h comp-c-include rump
./usr/include/rump/rump_syscalls_compat.h comp-c-include rump
+./usr/include/rump/rump_syscallshotgun.h comp-c-include rump
./usr/include/rump/rumpclient.h comp-c-include rump
./usr/include/rump/rumpdefs.h comp-c-include rump
./usr/include/rump/rumperr.h comp-c-include rump
Index: src/sys/rump/include/rump/Makefile
diff -u src/sys/rump/include/rump/Makefile:1.8 src/sys/rump/include/rump/Makefile:1.9
--- src/sys/rump/include/rump/Makefile:1.8 Tue Sep 15 14:57:34 2015
+++ src/sys/rump/include/rump/Makefile Sun Jan 31 23:14:34 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2015/09/15 14:57:34 pooka Exp $
+# $NetBSD: Makefile,v 1.9 2016/01/31 23:14:34 pooka Exp $
.include
@@ -6,6 +6,7 @@ INCSDIR= /usr/include/rump
.if (${MKRUMP} != "no")
INCS= rump.h rump_namei.h rump_syscalls.h rump_syscalls_compat.h
+INCS+= rump_syscallshotgun.h
INCS+= rumpdefs.h rumperr.h rumperrno2host.h rumpuser.h rumpvnode_if.h
INCS+= rumpkern_if_pub.h rumpvfs_if_pub.h rumpnet_if_pub.h
Index: src/sys/rump/include/rump/rump.h
diff -u src/sys/rump/include/rump/rump.h:1.67 src/sys/rump/include/rump/rump.h:1.68
--- src/sys/rump/include/rump/rump.h:1.67 Fri Jan 29 20:35:48 2016
+++ src/sys/rump/include/rump/rump.h Sun Jan 31 23:14:34 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.h,v 1.67 2016/01/29 20:35:48 christos Exp $ */
+/* $NetBSD: rump.h,v 1.68 2016/01/31 23:14:34 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -132,89 +132,10 @@ _END_DECLS
#endif
/*
- * Begin rump syscall conditionals. Yes, something a little better
- * is required here.
+ * Include macros prehistorically provided by this header.
+ * The inclusion might go away some year. Include the header directly
+ * if you want it to keep working for you.
*/
-#ifdef RUMP_SYS_NETWORKING
-#include
-#define socket(a,b,c) rump_sys_socket(a,b,c)
-#define accept(a,b,c) rump_sys_accept(a,b,c)
-#define bind(a,b,c) rump_sys_bind(a,b,c)
-#define connect(a,b,c) rump_sys_connect(a,b,c)
-#define getpeername(a,b,c) rump_sys_getpeername(a,b,c)
-#define getsockname(a,b,c) rump_sys_getsockname(a,b,c)
-#define listen(a,b) rump_sys_listen(a,b)
-#define recvfrom(a,b,c,d,e,f) rump_sys_recvfrom(a,b,c,d,e,f)
-#define recvmsg(a,b,c) rump_sys_recvmsg(a,b,c)
-#define sendto(a,b,c,d,e,f) rump_sys_sendto(a,b,c,d,e,f)
-#define sendmsg(a,b,c) rump_sys_sendmsg(a,b,c)
-#define getsockopt(a,b,c,d,e) rump_sys_getsockopt(a,b,c,d,e)
-#define setsockopt(a,b,c,d,e) rump_sys_setsockopt(a,b,c,d,e)
-#define shutdown(a,b) rump_sys_shutdown(a,b)
-#endif /* RUMP_SYS_NETWORKING */
-
-#ifdef RUMP_SYS_IOCTL
-#include
-#define ioctl(...) rump_sys_ioctl(__VA_ARGS__)
-#define fcntl(...) rump_sys_fcntl(__VA_ARGS__)
-#endif /* RUMP_SYS_IOCTL */
-
-#ifdef RUMP_SYS_CLOSE
-#include
-#define close(a) rump_sys_close(a)
-#endif /* RUMP_SYS_CLOSE */
-
-#ifdef RUMP_SYS_OPEN
-#include
-#define open(...) rump_sys_open(__VA_ARGS__)
-#endif /* RUMP_SYS_OPEN */
-
-#ifdef RUMP_SYS_READWRITE
-#include
-#define read(a,b,c) rump_sys_read(a,b,c)
-#define readv(a,b,c) rump_sys_readv(a,b,c)
-#define pread(a,b,c,d) rump_sys_pread(a,b,c,d)
-#define preadv(a,b,c,d) rump_sys_preadv(a,b,c,d)
-#define write(a,b,c) rump_sys_write(a,b,c)
-#define writev(a,b,c) rump_sys_writev(a,b,c)
-#define pwrite(a,b,c,d) rump_sys_pwrite(a,b,c,d)
-#define pwritev(a,b,c,d) rump_sys_pwritev(a,b,c,d)
-#endif /* RUMP_SYS_READWRITE */
-
-#ifdef RUMP_SYS_FIL
CVS commit: src/sbin/disklabel
Module Name:src
Committed By: christos
Date: Sun Jan 31 23:11:49 UTC 2016
Modified Files:
src/sbin/disklabel: Makefile
Log Message:
fix broken patch
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sbin/disklabel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/disklabel/Makefile
diff -u src/sbin/disklabel/Makefile:1.71 src/sbin/disklabel/Makefile:1.72
--- src/sbin/disklabel/Makefile:1.71 Sun Jan 31 13:57:29 2016
+++ src/sbin/disklabel/Makefile Sun Jan 31 18:11:49 2016
@@ -1,44 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2016/01/31 18:57:29 christos Exp $
-# Build a small disklabel (for tiny boot media)
-
-SRCDIR= ${.CURDIR}/../../../sbin/disklabel
-
-PROG= disklabel
-SRCS= main.c dkcksum.c printlabel.c
-#SRCS+= interact.c
-NOMAN= # defined
-
-CPPFLAGS+= -DNO_INTERACT
-CPPFLAGS+= -DNATIVELABEL_ONLY
-
-DPADD+= ${LIBUTIL}
-LDADD+= -lutil
-
-# these have additional requirements on the alignment of a partition
-.if (${MACHINE} == "sparc") || (${MACHINE} == "sparc64") \
- || (${MACHINE} == "sun3")
-CPPFLAGS+= -DSTRICT_CYLINDER_ALIGNMENT
-.endif
-
-.if (${MACHINE} == "acorn32" || ${MACHINE} == "acorn26")
-# Support FileCore boot block
-CPPFLAGS+= -DUSE_ACORN
-.endif
-
-.if (${MACHINE_ARCH} == "alpha")
-# alpha requires boot block checksum
-CPPFLAGS+= -DALPHA_BOOTBLOCK_CKSUM
-.endif
-
-.if (${MACHINE_ARCH} == "vax")
-# vax requires labels in alternative sectors on SMD disk
-CPPFLAGS+= -DVAX_ALTLABELS
-.endif
-
-.include
-
-.PATH: ${SRCDIR}
-# $NetBSD: Makefile,v 1.71 2016/01/31 18:57:29 christos Exp $
+# $NetBSD: Makefile,v 1.72 2016/01/31 23:11:49 christos Exp $
# @(#)Makefile 8.2 (Berkeley) 3/17/94
PROG= disklabel
CVS commit: othersrc/usr.bin/tnftp/libedit
Module Name:othersrc Committed By: lukem Date: Sun Jan 31 22:28:58 UTC 2016 Removed Files: othersrc/usr.bin/tnftp/libedit: makelist.in Log Message: remove now-unused makelist.in To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 othersrc/usr.bin/tnftp/libedit/makelist.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc
Committed By: lukem
Date: Sun Jan 31 22:25:37 UTC 2016
Modified Files:
othersrc/usr.bin/tnftp: Makefile.in configure tnftp_config.h.in
othersrc/usr.bin/tnftp/libedit: Makefile.in
othersrc/usr.bin/tnftp/libnetbsd: Makefile.in
othersrc/usr.bin/tnftp/src: Makefile.in
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/Makefile.in
cvs rdiff -u -r1.47 -r1.48 othersrc/usr.bin/tnftp/configure
cvs rdiff -u -r1.5 -r1.6 othersrc/usr.bin/tnftp/tnftp_config.h.in
cvs rdiff -u -r1.9 -r1.10 othersrc/usr.bin/tnftp/libedit/Makefile.in
cvs rdiff -u -r1.10 -r1.11 othersrc/usr.bin/tnftp/libnetbsd/Makefile.in
cvs rdiff -u -r1.13 -r1.14 othersrc/usr.bin/tnftp/src/Makefile.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/Makefile.in
diff -u othersrc/usr.bin/tnftp/Makefile.in:1.9 othersrc/usr.bin/tnftp/Makefile.in:1.10
--- othersrc/usr.bin/tnftp/Makefile.in:1.9 Sun May 5 13:21:06 2013
+++ othersrc/usr.bin/tnftp/Makefile.in Sun Jan 31 22:25:36 2016
@@ -116,7 +116,6 @@ GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-ALLOCA = @ALLOCA@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
AR = @AR@
Index: othersrc/usr.bin/tnftp/configure
diff -u othersrc/usr.bin/tnftp/configure:1.47 othersrc/usr.bin/tnftp/configure:1.48
--- othersrc/usr.bin/tnftp/configure:1.47 Sun Jan 31 06:10:20 2016
+++ othersrc/usr.bin/tnftp/configure Sun Jan 31 22:25:36 2016
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 1.31 .
+# From configure.ac Revision: 1.34 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for tnftp 20151004.
#
@@ -645,7 +645,6 @@ LTLIBOBJS
USE_LIBEDIT_FALSE
USE_LIBEDIT_TRUE
LIBOBJS
-ALLOCA
WITH_SSL_FALSE
WITH_SSL_TRUE
OPENSSL_LDFLAGS
@@ -13141,39 +13140,6 @@ _ACEOF
fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
-$as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include
-#include
-
-int
-main ()
-{
-return *(signal (0, 0)) (0) == 1;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
- ac_cv_type_signal=int
-else
- ac_cv_type_signal=void
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
-$as_echo "$ac_cv_type_signal" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define RETSIGTYPE $ac_cv_type_signal
-_ACEOF
-
-
ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
if test "x$ac_cv_type_size_t" = xyes; then :
@@ -13557,193 +13523,6 @@ fi
#
# Checks for library functions.
#
-#XXXremove alloca use
-# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
-# for constant arguments. Useless!
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
-$as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#include
-int
-main ()
-{
-char *p = (char *) alloca (2 * sizeof (int));
- if (p) return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_working_alloca_h=yes
-else
- ac_cv_working_alloca_h=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_working_alloca_h" >&5
-$as_echo "$ac_cv_working_alloca_h" >&6; }
-if test $ac_cv_working_alloca_h = yes; then
-
-$as_echo "#define HAVE_ALLOCA_H 1" >>confdefs.h
-
-fi
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
-$as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-#ifdef __GNUC__
-# define alloca __builtin_alloca
-#else
-# ifdef _MSC_VER
-# include
-# define alloca _alloca
-# else
-# ifdef HAVE_ALLOCA_H
-# include
-# else
-# ifdef _AIX
- #pragma alloca
-# else
-#ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
-#endif
-# endif
-# endif
-# endif
-#endif
-
-int
-main ()
-{
-char *p = (char *) alloca (1);
-if (p) return 0;
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- ac_cv_func_alloca_works=yes
-else
- ac_cv_func_alloca_works=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_c
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Sun Jan 31 22:23:59 UTC 2016 Modified Files: othersrc/usr.bin/tnftp: configure.ac Log Message: configure.ac: remove alloca and RETSIGTYPE alloca() isn't used by libedit any more - remove AC_FUNC_ALLOCA() don't use RETSIGTYPE - remove obsolete and unused AC_TYPE_SIGNAL() To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 othersrc/usr.bin/tnftp/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/configure.ac diff -u othersrc/usr.bin/tnftp/configure.ac:1.33 othersrc/usr.bin/tnftp/configure.ac:1.34 --- othersrc/usr.bin/tnftp/configure.ac:1.33 Sun Jan 31 22:18:35 2016 +++ othersrc/usr.bin/tnftp/configure.ac Sun Jan 31 22:23:59 2016 @@ -1,4 +1,4 @@ -# $NetBSD: configure.ac,v 1.33 2016/01/31 22:18:35 lukem Exp $ +# $NetBSD: configure.ac,v 1.34 2016/01/31 22:23:59 lukem Exp $ # # Process this file with autoconf to produce a configure script. @@ -9,7 +9,7 @@ AC_COPYRIGHT([ Copyright (c) 1999-2016 The NetBSD Foundation, Inc. All rights reserved. ]) -AC_REVISION([$Revision: 1.33 $]) +AC_REVISION([$Revision: 1.34 $]) AS_SHELL_SANITIZE() @@ -262,7 +262,6 @@ AC_TYPE_LONG_LONG_INT() AC_TYPE_UINT32_T() AC_TYPE_OFF_T() AC_TYPE_PID_T() -AC_TYPE_SIGNAL() AC_TYPE_SIZE_T() AC_STRUCT_TM() AC_CHECK_MEMBERS([struct sockaddr.sa_len, struct sockaddr_in.sin_len, @@ -293,8 +292,6 @@ AS_IF([test "$opt_ipv6" = yes], # # Checks for library functions. # -#XXXremove alloca use -AC_FUNC_ALLOCA() AC_FUNC_CLOSEDIR_VOID() AC_FUNC_FORK() AC_FUNC_FSEEKO()
CVS commit: othersrc/usr.bin/tnftp
Module Name:othersrc Committed By: lukem Date: Sun Jan 31 22:18:35 UTC 2016 Modified Files: othersrc/usr.bin/tnftp: configure.ac othersrc/usr.bin/tnftp/libedit: Makefile.am Log Message: libedit: adapt back to upstream makelist Simplify syncing with upstream by adapting to the upstream makelist (and previous config.h change to use tnftp.h). Take advantage of automake's silent-rules. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 othersrc/usr.bin/tnftp/configure.ac cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/libedit/Makefile.am Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/configure.ac diff -u othersrc/usr.bin/tnftp/configure.ac:1.32 othersrc/usr.bin/tnftp/configure.ac:1.33 --- othersrc/usr.bin/tnftp/configure.ac:1.32 Sun Jan 31 06:10:20 2016 +++ othersrc/usr.bin/tnftp/configure.ac Sun Jan 31 22:18:35 2016 @@ -1,4 +1,4 @@ -# $NetBSD: configure.ac,v 1.32 2016/01/31 06:10:20 lukem Exp $ +# $NetBSD: configure.ac,v 1.33 2016/01/31 22:18:35 lukem Exp $ # # Process this file with autoconf to produce a configure script. @@ -9,7 +9,7 @@ AC_COPYRIGHT([ Copyright (c) 1999-2016 The NetBSD Foundation, Inc. All rights reserved. ]) -AC_REVISION([$Revision: 1.32 $]) +AC_REVISION([$Revision: 1.33 $]) AS_SHELL_SANITIZE() @@ -450,7 +450,6 @@ AM_CONDITIONAL([USE_LIBEDIT], [test "$op AC_CONFIG_FILES([ Makefile libedit/Makefile -libedit/makelist libnetbsd/Makefile src/Makefile ]) Index: othersrc/usr.bin/tnftp/libedit/Makefile.am diff -u othersrc/usr.bin/tnftp/libedit/Makefile.am:1.3 othersrc/usr.bin/tnftp/libedit/Makefile.am:1.4 --- othersrc/usr.bin/tnftp/libedit/Makefile.am:1.3 Tue Jan 5 07:15:58 2010 +++ othersrc/usr.bin/tnftp/libedit/Makefile.am Sun Jan 31 22:18:35 2016 @@ -1,15 +1,16 @@ -## $NetBSD: Makefile.am,v 1.3 2010/01/05 07:15:58 lukem Exp $ +## $NetBSD: Makefile.am,v 1.4 2016/01/31 22:18:35 lukem Exp $ noinst_LTLIBRARIES = libedit.la libedit_la_SOURCES = \ chared.c \ + chartype.c \ common.c \ el.c \ emacs.c \ hist.c \ history.c \ - key.c \ + keymacro.c \ map.c \ parse.c \ prompt.c \ @@ -17,7 +18,7 @@ libedit_la_SOURCES = \ refresh.c \ search.c \ sig.c \ - term.c \ + terminal.c \ tokenizer.c \ tty.c \ vi.c @@ -50,38 +51,33 @@ BUILT_SOURCES = \ CLEANFILES = \ $(generated_files) +MAKELIST=AWK=$(AWK) $(SHELL) $(srcdir)/makelist vi.h: vi.c - @echo "Create $@" - $(SHELL) ./makelist -h $(srcdir)/vi.c > $@ + $(AM_V_GEN)$(MAKELIST) -h $(srcdir)/vi.c > $@ emacs.h: emacs.c - @echo "Create $@" - $(SHELL) ./makelist -h $(srcdir)/emacs.c > $@ + $(AM_V_GEN)$(MAKELIST) -h $(srcdir)/emacs.c > $@ common.h: common.c - @echo "Create $@" - $(SHELL) ./makelist -h $(srcdir)/common.c > $@ + $(AM_V_GEN)$(MAKELIST) -h $(srcdir)/common.c > $@ fcns.h: vi.h emacs.h common.h - @echo "Create $@" - $(SHELL) ./makelist -fh vi.h emacs.h common.h > $@ + $(AM_V_GEN)$(MAKELIST) -fh vi.h emacs.h common.h > $@ -fcns.c: vi.h emacs.h common.h fcns.h - @echo "Create $@" - $(SHELL) ./makelist -fc vi.h emacs.h common.h > $@ +fcns.c: vi.h emacs.h common.h fcns.h help.h + $(AM_V_GEN)$(MAKELIST) -fc vi.h emacs.h common.h > $@ help.c: vi.c emacs.c common.c - @echo "Create $@" - $(SHELL) ./makelist -bc $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@ + $(AM_V_GEN)$(MAKELIST) -bc $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@ help.h: vi.c emacs.c common.c - @echo "Create $@" - $(SHELL) ./makelist -bh $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@ + $(AM_V_GEN)$(MAKELIST) -bh $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c > $@ EXTRA_DIST = \ chared.h \ + chartype.h \ editline.3 \ editrc.5 \ el.h \ @@ -89,7 +85,7 @@ EXTRA_DIST = \ filecomplete.h \ hist.h \ histedit.h \ - key.h \ + keymacro.h \ map.h \ parse.h \ prompt.h \ @@ -100,5 +96,5 @@ EXTRA_DIST = \ search.h \ sig.h \ sys.h \ - term.h \ + terminal.h \ tty.h
CVS commit: othersrc/usr.bin/tnftp/libedit
Module Name:othersrc
Committed By: lukem
Date: Sun Jan 31 22:11:18 UTC 2016
Modified Files:
othersrc/usr.bin/tnftp/libedit: makelist
Log Message:
makelist: allow AWK to be supplied in env
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/libedit/makelist
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/usr.bin/tnftp/libedit/makelist
diff -u othersrc/usr.bin/tnftp/libedit/makelist:1.3 othersrc/usr.bin/tnftp/libedit/makelist:1.4
--- othersrc/usr.bin/tnftp/libedit/makelist:1.3 Sun Jan 31 22:06:02 2016
+++ othersrc/usr.bin/tnftp/libedit/makelist Sun Jan 31 22:11:18 2016
@@ -1,5 +1,6 @@
#!/bin/sh -
-# NetBSD: makelist,v 1.18 2012/03/21 05:34:54 matt Exp
+# $NetBSD: makelist,v 1.4 2016/01/31 22:11:18 lukem Exp $
+# from: NetBSD: makelist,v 1.18 2012/03/21 05:34:54 matt Exp
#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
@@ -35,7 +36,7 @@
# makelist.sh: Automatically generate header files...
-AWK=awk
+: ${AWK:=awk}
USAGE="Usage: $0 -n|-h|-e|-fc|-fh|-bc|-bh|-m "
if [ "x$1" = "x" ]
CVS commit: othersrc/usr.bin/tnftp/libedit
Module Name:othersrc Committed By: lukem Date: Sun Jan 31 22:08:37 UTC 2016 Modified Files: othersrc/usr.bin/tnftp/libedit: config.h Log Message: adapt config.h to use tnftp.h To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 othersrc/usr.bin/tnftp/libedit/config.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/usr.bin/tnftp/libedit/config.h diff -u othersrc/usr.bin/tnftp/libedit/config.h:1.3 othersrc/usr.bin/tnftp/libedit/config.h:1.4 --- othersrc/usr.bin/tnftp/libedit/config.h:1.3 Sun Jan 31 22:06:02 2016 +++ othersrc/usr.bin/tnftp/libedit/config.h Sun Jan 31 22:08:37 2016 @@ -1,3 +1,8 @@ +#include "tnftp.h" +#include "sys.h" + +#if 0 /* TNFTP build */ + /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ @@ -287,3 +292,4 @@ /* #undef LIBC_SCCS */ /* #undef lint */ +#endif /* TNFTP build */
CVS commit: othersrc/usr.bin/tnftp/libedit
Module Name:othersrc Committed By: lukem Date: Sun Jan 31 22:06:02 UTC 2016 Added Files: othersrc/usr.bin/tnftp/libedit: config.h makelist Log Message: restore config.h and makelist from upstream To generate a diff of this commit: cvs rdiff -u -r0 -r1.3 othersrc/usr.bin/tnftp/libedit/config.h \ othersrc/usr.bin/tnftp/libedit/makelist Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: othersrc/usr.bin/tnftp/libedit/config.h diff -u /dev/null othersrc/usr.bin/tnftp/libedit/config.h:1.3 --- /dev/null Sun Jan 31 22:06:02 2016 +++ othersrc/usr.bin/tnftp/libedit/config.h Sun Jan 31 22:06:02 2016 @@ -0,0 +1,289 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define to 1 if the `closedir' function returns void instead of `int'. */ +/* #undef CLOSEDIR_VOID */ + +/* Define to 1 if you have the header file. */ +#define HAVE_CURSES_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#define HAVE_DIRENT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_DLFCN_H 1 + +/* Define to 1 if you have the `endpwent' function. */ +#define HAVE_ENDPWENT 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the `fgetln' function. */ +#define HAVE_FGETLN 1 + +/* Define to 1 if you have the `fork' function. */ +#define HAVE_FORK 1 + +/* Define to 1 if you have getpwnam_r and getpwuid_r that are draft POSIX.1 + versions. */ +/* #undef HAVE_GETPW_R_DRAFT */ + +/* Define to 1 if you have getpwnam_r and getpwuid_r that are POSIX.1 + compatible. */ +#define HAVE_GETPW_R_POSIX 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_INTTYPES_H 1 + +/* Define to 1 if you have the `isascii' function. */ +#define HAVE_ISASCII 1 + +/* Define to 1 if you have the `issetugid' function. */ +#define HAVE_ISSETUGID 1 + +/* Define to 1 if you have the `curses' library (-lcurses). */ +/* #undef HAVE_LIBCURSES */ + +/* Define to 1 if you have the `ncurses' library (-lncurses). */ +/* #undef HAVE_LIBNCURSES */ + +/* Define to 1 if you have the `termcap' library (-ltermcap). */ +/* #undef HAVE_LIBTERMCAP */ + +/* Define to 1 if you have the `terminfo' library (-lterminfo). */ +#define HAVE_LIBTERMINFO 1 + +/* Define to 1 if you have the `termlib' library (-ltermlib). */ +/* #undef HAVE_LIBTERMLIB */ + +/* Define to 1 if you have the header file. */ +#define HAVE_LIMITS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MALLOC_H 1 + +/* Define to 1 if you have the `memchr' function. */ +#define HAVE_MEMCHR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the `memset' function. */ +#define HAVE_MEMSET 1 + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_NCURSES_H */ + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +/* #undef HAVE_NDIR_H */ + +/* Define to 1 if you have the `regcomp' function. */ +#define HAVE_REGCOMP 1 + +/* Define to 1 if you have the `re_comp' function. */ +/* #undef HAVE_RE_COMP */ + +/* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ +/* #undef HAVE_STAT_EMPTY_STRING_BUG */ + +/* Define to 1 if you have the header file. */ +#define HAVE_STDINT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strcasecmp' function. */ +#define HAVE_STRCASECMP 1 + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the `strcspn' function. */ +#define HAVE_STRCSPN 1 + +/* Define to 1 if you have the `strdup' function. */ +#define HAVE_STRDUP 1 + +/* Define to 1 if you have the `strerror' function. */ +#define HAVE_STRERROR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRINGS_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strlcat' function. */ +#define HAVE_STRLCAT 1 + +/* Define to 1 if you have the `strlcpy' function. */ +#define HAVE_STRLCPY 1 + +/* Define to 1 if you have the `strrchr' function. */ +#define HAVE_STRRCHR 1 + +/* Define to 1 if you have the `strstr' function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if you have the `strtol' function. */ +#define HAVE_STRTOL 1 + +/* Define to 1 if struct dirent has member d_namlen */ +#define HAVE_STRUCT_DIRENT_D_NAMLEN 1 + +/* Define to 1 if you have the `strunvis' function. */ +#define HAVE_STRUNVIS 1 + +/* Define to 1 if you have the `strvis' function. */ +#define HAVE_STRVIS 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_CDEFS_H 1 + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +/* #undef HAVE_SYS_DIR_H */ + +/* Define to 1 if you have the header file. *
CVS commit: src/sbin/disklabel
Module Name:src
Committed By: christos
Date: Sun Jan 31 18:57:29 UTC 2016
Modified Files:
src/sbin/disklabel: Makefile bswap.c bswap.h interact.c main.c
Log Message:
PR/50729: Izumi Tsutsui: Add "SMALLPROG"-like options to disklabel(8)
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sbin/disklabel/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sbin/disklabel/bswap.c
cvs rdiff -u -r1.2 -r1.3 src/sbin/disklabel/bswap.h
cvs rdiff -u -r1.38 -r1.39 src/sbin/disklabel/interact.c
cvs rdiff -u -r1.45 -r1.46 src/sbin/disklabel/main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/disklabel/Makefile
diff -u src/sbin/disklabel/Makefile:1.70 src/sbin/disklabel/Makefile:1.71
--- src/sbin/disklabel/Makefile:1.70 Fri May 3 12:05:12 2013
+++ src/sbin/disklabel/Makefile Sun Jan 31 13:57:29 2016
@@ -1,4 +1,44 @@
-# $NetBSD: Makefile,v 1.70 2013/05/03 16:05:12 matt Exp $
+# $NetBSD: Makefile,v 1.71 2016/01/31 18:57:29 christos Exp $
+# Build a small disklabel (for tiny boot media)
+
+SRCDIR= ${.CURDIR}/../../../sbin/disklabel
+
+PROG= disklabel
+SRCS= main.c dkcksum.c printlabel.c
+#SRCS+= interact.c
+NOMAN= # defined
+
+CPPFLAGS+= -DNO_INTERACT
+CPPFLAGS+= -DNATIVELABEL_ONLY
+
+DPADD+= ${LIBUTIL}
+LDADD+= -lutil
+
+# these have additional requirements on the alignment of a partition
+.if (${MACHINE} == "sparc") || (${MACHINE} == "sparc64") \
+ || (${MACHINE} == "sun3")
+CPPFLAGS+= -DSTRICT_CYLINDER_ALIGNMENT
+.endif
+
+.if (${MACHINE} == "acorn32" || ${MACHINE} == "acorn26")
+# Support FileCore boot block
+CPPFLAGS+= -DUSE_ACORN
+.endif
+
+.if (${MACHINE_ARCH} == "alpha")
+# alpha requires boot block checksum
+CPPFLAGS+= -DALPHA_BOOTBLOCK_CKSUM
+.endif
+
+.if (${MACHINE_ARCH} == "vax")
+# vax requires labels in alternative sectors on SMD disk
+CPPFLAGS+= -DVAX_ALTLABELS
+.endif
+
+.include
+
+.PATH: ${SRCDIR}
+# $NetBSD: Makefile,v 1.71 2016/01/31 18:57:29 christos Exp $
# @(#)Makefile 8.2 (Berkeley) 3/17/94
PROG= disklabel
Index: src/sbin/disklabel/bswap.c
diff -u src/sbin/disklabel/bswap.c:1.4 src/sbin/disklabel/bswap.c:1.5
--- src/sbin/disklabel/bswap.c:1.4 Sat Jul 18 02:00:46 2015
+++ src/sbin/disklabel/bswap.c Sun Jan 31 13:57:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap.c,v 1.4 2015/07/18 06:00:46 htodd Exp $ */
+/* $NetBSD: bswap.c,v 1.5 2016/01/31 18:57:29 christos Exp $ */
/*-
* Copyright (c) 2009 Izumi Tsutsui. All rights reserved.
@@ -55,6 +55,8 @@
* @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91
*/
+#if !defined(NATIVELABEL_ONLY)
+
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
@@ -179,3 +181,5 @@ dkcksum_target(struct disklabel *lp)
return dkcksum_sized(lp, npartitions);
}
+
+#endif /* !NATIVELABEL_ONLY */
Index: src/sbin/disklabel/bswap.h
diff -u src/sbin/disklabel/bswap.h:1.2 src/sbin/disklabel/bswap.h:1.3
--- src/sbin/disklabel/bswap.h:1.2 Fri May 3 12:05:12 2013
+++ src/sbin/disklabel/bswap.h Sun Jan 31 13:57:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: bswap.h,v 1.2 2013/05/03 16:05:12 matt Exp $ */
+/* $NetBSD: bswap.h,v 1.3 2016/01/31 18:57:29 christos Exp $ */
/*-
* Copyright (c) 2009 Izumi Tsutsui. All rights reserved.
@@ -38,6 +38,7 @@
#include
#endif
+#if !defined(NATIVELABEL_ONLY)
extern int bswap_p;
extern u_int maxpartitions;
@@ -49,3 +50,13 @@ extern u_int maxpartitions;
void htotargetlabel(struct disklabel *, const struct disklabel *);
void targettohlabel(struct disklabel *, const struct disklabel *);
uint16_t dkcksum_target(struct disklabel *);
+#else
+#define htotarget16(x) (x)
+#define target16toh(x) (x)
+#define htotarget32(x) (x)
+#define target32toh(x) (x)
+
+#define htotargetlabel(dl, sl) do { *(dl) = *(sl); } while (0)
+#define targettohlabel(dl, sl) do { *(dl) = *(sl); } while (0)
+#define dkcksum_target(label) dkcksum(label)
+#endif /* !NATIVELABEL_ONLY */
Index: src/sbin/disklabel/interact.c
diff -u src/sbin/disklabel/interact.c:1.38 src/sbin/disklabel/interact.c:1.39
--- src/sbin/disklabel/interact.c:1.38 Fri May 3 12:05:12 2013
+++ src/sbin/disklabel/interact.c Sun Jan 31 13:57:29 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: interact.c,v 1.38 2013/05/03 16:05:12 matt Exp $ */
+/* $NetBSD: interact.c,v 1.39 2016/01/31 18:57:29 christos Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -24,13 +24,15 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if !defined(NO_INTERACT)
+
#if HAVE_NBTOOL_CONFIG_H
#include "nbtool_config.h"
#endif
#include
#ifndef lint
-__RCSID("$NetBSD: interact.c,v 1.38 2013/05/03 16:05:12 matt Exp $");
+__RCSID("$NetBSD: interact.c,v 1.39 2016/01/31 18:57:29 christos Exp $");
#endif /* lint */
#include
@@ -810,3 +812,5 @@ interact(struct disklabel *lp, int fd)
return;
}
}
+
+#endif /* !NO_INTERACT */
Index: src/sbin/disklabel/main.c
diff -u src/sbin/disklabel/main.c:1.45 src/sbin/disklabel/main.c:1.46
--- src/
CVS commit: src/distrib/utils
Module Name:src
Committed By: christos
Date: Sun Jan 31 18:56:49 UTC 2016
Modified Files:
src/distrib/utils: Makefile
Added Files:
src/distrib/utils/x_disklabel: Makefile
Log Message:
PR/50729: Izumi Tsutsui: Add "small" disklabel
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/utils/Makefile
cvs rdiff -u -r0 -r1.1 src/distrib/utils/x_disklabel/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/Makefile
diff -u src/distrib/utils/Makefile:1.21 src/distrib/utils/Makefile:1.22
--- src/distrib/utils/Makefile:1.21 Sat Jul 26 15:35:10 2014
+++ src/distrib/utils/Makefile Sun Jan 31 13:56:49 2016
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.21 2014/07/26 19:35:10 dholland Exp $
+# $NetBSD: Makefile,v 1.22 2016/01/31 18:56:49 christos Exp $
.if make(obj)
SUBDIR= libhack more ssh tls \
- x_ed x_gzip x_ifconfig \
+ x_disklabel x_ed x_gzip x_ifconfig \
x_netstat x_ping x_route x_umount zcat
.if ${MACHINE} == "acorn32"
Added files:
Index: src/distrib/utils/x_disklabel/Makefile
diff -u /dev/null src/distrib/utils/x_disklabel/Makefile:1.1
--- /dev/null Sun Jan 31 13:56:49 2016
+++ src/distrib/utils/x_disklabel/Makefile Sun Jan 31 13:56:49 2016
@@ -0,0 +1,40 @@
+# $NetBSD: Makefile,v 1.1 2016/01/31 18:56:49 christos Exp $
+# Build a small disklabel (for tiny boot media)
+
+SRCDIR= ${.CURDIR}/../../../sbin/disklabel
+
+PROG= disklabel
+SRCS= main.c dkcksum.c printlabel.c
+#SRCS+= interact.c
+NOMAN= # defined
+
+CPPFLAGS+= -DNO_INTERACT
+CPPFLAGS+= -DNATIVELABEL_ONLY
+
+DPADD+= ${LIBUTIL}
+LDADD+= -lutil
+
+# these have additional requirements on the alignment of a partition
+.if (${MACHINE} == "sparc") || (${MACHINE} == "sparc64") \
+ || (${MACHINE} == "sun3")
+CPPFLAGS+= -DSTRICT_CYLINDER_ALIGNMENT
+.endif
+
+.if (${MACHINE} == "acorn32" || ${MACHINE} == "acorn26")
+# Support FileCore boot block
+CPPFLAGS+= -DUSE_ACORN
+.endif
+
+.if (${MACHINE_ARCH} == "alpha")
+# alpha requires boot block checksum
+CPPFLAGS+= -DALPHA_BOOTBLOCK_CKSUM
+.endif
+
+.if (${MACHINE_ARCH} == "vax")
+# vax requires labels in alternative sectors on SMD disk
+CPPFLAGS+= -DVAX_ALTLABELS
+.endif
+
+.include
+
+.PATH: ${SRCDIR}
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Jan 31 18:47:14 UTC 2016
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
flip amd64 and evbarm to the new binutils
To generate a diff of this commit:
cvs rdiff -u -r1.890 -r1.891 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.890 src/share/mk/bsd.own.mk:1.891
--- src/share/mk/bsd.own.mk:1.890 Sun Jan 31 10:30:14 2016
+++ src/share/mk/bsd.own.mk Sun Jan 31 13:47:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.890 2016/01/31 15:30:14 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.891 2016/01/31 18:47:14 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -133,7 +133,12 @@ EXTERNAL_GDB_SUBDIR= gdb
EXTERNAL_GDB_SUBDIR= /does/not/exist
.endif
+.if ${MACHINE} == "amd64" || \
+${MACHINE} == "evbarm"
+HAVE_BINUTILS?= 226
+.else
HAVE_BINUTILS?= 223
+.endif
.if ${HAVE_BINUTILS} == 223
EXTERNAL_BINUTILS_SUBDIR= binutils.old
CVS commit: src/distrib/sets
Module Name:src Committed By: christos Date: Sun Jan 31 18:41:36 UTC 2016 Modified Files: src/distrib/sets: mkvars.mk src/distrib/sets/lists/base: shl.mi src/distrib/sets/lists/comp: md.amd64 shl.mi src/distrib/sets/lists/debug: shl.mi Log Message: handle both binutils 2.23 and 2.26 To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/mkvars.mk cvs rdiff -u -r1.760 -r1.761 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.233 -r1.234 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.284 -r1.285 src/distrib/sets/lists/comp/shl.mi cvs rdiff -u -r1.122 -r1.123 src/distrib/sets/lists/debug/shl.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/mkvars.mk diff -u src/distrib/sets/mkvars.mk:1.24 src/distrib/sets/mkvars.mk:1.25 --- src/distrib/sets/mkvars.mk:1.24 Thu Jul 23 04:03:25 2015 +++ src/distrib/sets/mkvars.mk Sun Jan 31 13:41:35 2016 @@ -1,4 +1,4 @@ -# $NetBSD: mkvars.mk,v 1.24 2015/07/23 08:03:25 mrg Exp $ +# $NetBSD: mkvars.mk,v 1.25 2016/01/31 18:41:35 christos Exp $ MKEXTRAVARS= \ MACHINE \ @@ -6,6 +6,7 @@ MKEXTRAVARS= \ MACHINE_CPU \ HAVE_GCC \ HAVE_GDB \ + HAVE_BINUTILS \ HAVE_LIBGCC_EH \ HAVE_SSP \ OBJECT_FMT \ Index: src/distrib/sets/lists/base/shl.mi diff -u src/distrib/sets/lists/base/shl.mi:1.760 src/distrib/sets/lists/base/shl.mi:1.761 --- src/distrib/sets/lists/base/shl.mi:1.760 Tue Jan 19 21:20:41 2016 +++ src/distrib/sets/lists/base/shl.mi Sun Jan 31 13:41:35 2016 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.760 2016/01/20 02:20:41 christos Exp $ +# $NetBSD: shl.mi,v 1.761 2016/01/31 18:41:35 christos Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -187,8 +187,10 @@ ./usr/lib/libavl.sobase-zfs-shlib compatfile,zfs ./usr/lib/libavl.so.0base-zfs-shlib compatfile,zfs ./usr/lib/libavl.so.0.0 base-zfs-shlib compatfile,zfs -./usr/lib/libbfd.so.13base-sys-shlib compatfile,binutils -./usr/lib/libbfd.so.13.0 base-sys-shlib compatfile,binutils +./usr/lib/libbfd.so.13base-sys-shlib compatfile,binutils=223 +./usr/lib/libbfd.so.13.0 base-sys-shlib compatfile,binutils=223 +./usr/lib/libbfd.so.14base-sys-shlib compatfile,binutils=226 +./usr/lib/libbfd.so.14.0 base-sys-shlib compatfile,binutils=226 ./usr/lib/libbind9.sobase-bind-shlib compatfile ./usr/lib/libbind9.so.8base-bind-shlib compatfile ./usr/lib/libbind9.so.8.4 base-bind-shlib compatfile Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.233 src/distrib/sets/lists/comp/md.amd64:1.234 --- src/distrib/sets/lists/comp/md.amd64:1.233 Sun Aug 9 23:21:44 2015 +++ src/distrib/sets/lists/comp/md.amd64 Sun Jan 31 13:41:36 2016 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.233 2015/08/10 03:21:44 mrg Exp $ +# $NetBSD: md.amd64,v 1.234 2016/01/31 18:41:36 christos Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include @@ -475,6 +475,19 @@ ./usr/libdata/ldscripts/i386nbsd.xn comp-util-bin binutils ./usr/libdata/ldscripts/i386nbsd.xr comp-util-bin binutils ./usr/libdata/ldscripts/i386nbsd.xu comp-util-bin binutils +./usr/libdata/ldscripts/elf_iamcu.x comp-util-bin binutils=226 +./usr/libdata/ldscripts/elf_iamcu.xbn comp-util-bin binutils=226 +./usr/libdata/ldscripts/elf_iamcu.xc comp-util-bin binutils=226 +./usr/libdata/ldscripts/elf_iamcu.xd comp-util-bin binutils=226 +./usr/libdata/ldscripts/elf_iamcu.xdc comp-util-bin binutils=226 +./usr/libdata/ldscripts/elf_iamcu.xdw comp-util-bin binutils=226 +./usr/libdata/ldscripts/elf_iamcu.xn comp-util-bin binutils=226 +./usr/libdata/ldscripts/elf_iamcu.xr comp-util-bin binutils=226 +./usr/libdata/ldscripts/elf_iamcu.xs comp-util-bin binutils=226 +./usr/libdata/ldscripts/elf_iamcu.xsc comp-util-bin binutils=226 +./usr/libdata/ldscripts/elf_iamcu.xsw comp-util-bin binutils=226 +./usr/libdata/ldscripts/elf_iamcu.xu comp-util-bin binutils=226 +./usr/libdata/ldscripts/elf_iamcu.xw comp-util-bin binutils=226 ./usr/libdata/lint/llib-lx86_64.ln comp-c-lintlib lint ./usr/share/ldscripts/elf_i386.x comp-obsolete obsolete ./usr/share/ldscripts/elf_i386.xbn comp-obsolete obsolete Index: src/distrib/sets/lists/comp/shl.mi diff -u src/distrib/sets/lists/comp/shl.mi:1.284 src/distrib/sets/lists/comp/shl.mi:1.285 --- src/distrib/sets/lists/comp/shl.mi:1.284 Sat Jan 23 10:01:31 2016 +++ src/distrib/sets/lists/comp/shl.mi Sun Jan 31 13:41:36 2016 @@ -1,4 +1,4 @@ -# $NetBSD: shl.mi,v 1.284 2016/01/23 15:01:31 christos Exp $ +# $NetBSD: shl.mi,v 1.285 2016/01/31 18:41:36 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -113,8 +113,10 @@ ./usr/lib/libntp_pic.acomp-obsolete obsolete ./usr/lib/libnvpair_pic.a comp-zfs-piclib comp
CVS commit: src/distrib/sets/lists/xcomp
Module Name:src Committed By: christos Date: Sun Jan 31 18:40:24 UTC 2016 Modified Files: src/distrib/sets/lists/xcomp: md.evbarm Log Message: add nouveau lint file To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/xcomp/md.evbarm 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/xcomp/md.evbarm diff -u src/distrib/sets/lists/xcomp/md.evbarm:1.6 src/distrib/sets/lists/xcomp/md.evbarm:1.7 --- src/distrib/sets/lists/xcomp/md.evbarm:1.6 Mon Jan 25 12:59:35 2016 +++ src/distrib/sets/lists/xcomp/md.evbarm Sun Jan 31 13:40:23 2016 @@ -1,5 +1,6 @@ -# $NetBSD: md.evbarm,v 1.6 2016/01/25 17:59:35 christos Exp $ +# $NetBSD: md.evbarm,v 1.7 2016/01/31 18:40:23 christos Exp $ ./usr/X11R7/lib/libdrm_nouveau.a -unknown- xorg ./usr/X11R7/lib/libdrm_nouveau_p.a -unknown- profile,xorg ./usr/X11R7/lib/libdrm_nouveau_pic.a -unknown- xorg,picinstall ./usr/X11R7/lib/pkgconfig/libdrm_nouveau.pc -unknown- xorg +./usr/libdata/lint/llib-ldrm_nouveau.ln -unknown- lint,xorg
CVS commit: src/external/gpl3/binutils/lib/libopcodes
Module Name:src
Committed By: christos
Date: Sun Jan 31 18:37:42 UTC 2016
Modified Files:
src/external/gpl3/binutils/lib/libopcodes: Makefile
Log Message:
bump major for new binutils.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/binutils/lib/libopcodes/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/lib/libopcodes/Makefile
diff -u src/external/gpl3/binutils/lib/libopcodes/Makefile:1.8 src/external/gpl3/binutils/lib/libopcodes/Makefile:1.9
--- src/external/gpl3/binutils/lib/libopcodes/Makefile:1.8 Tue Jan 26 14:37:47 2016
+++ src/external/gpl3/binutils/lib/libopcodes/Makefile Sun Jan 31 13:37:42 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2016/01/26 19:37:47 christos Exp $
+# $NetBSD: Makefile,v 1.9 2016/01/31 18:37:42 christos Exp $
NOLINKLIB= # defined
NOLINT= # defined
@@ -15,7 +15,7 @@ BFD_MACHINE_ARCH?= ${MACHINE_ARCH:C/armv
.if exists(${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk)
.include "${.CURDIR}/arch/${BFD_MACHINE_ARCH}/defs.mk"
-SHLIB_MAJOR= 6
+SHLIB_MAJOR= 7
SHLIB_MINOR= 0
GCPPFLAGS= ${G_archdefs} ${G_DEFS} ${G_INCLUDES} ${G_TDEFAULTS}
CVS commit: src/sys/arch/zaurus/stand
Module Name:src
Committed By: christos
Date: Sun Jan 31 15:32:13 UTC 2016
Modified Files:
src/sys/arch/zaurus/stand/zboot: Makefile
src/sys/arch/zaurus/stand/zbsdmod: Makefile
Log Message:
include bsd.init.mk to get Makefile.inc
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/zaurus/stand/zboot/Makefile
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/zaurus/stand/zbsdmod/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/zaurus/stand/zboot/Makefile
diff -u src/sys/arch/zaurus/stand/zboot/Makefile:1.17 src/sys/arch/zaurus/stand/zboot/Makefile:1.18
--- src/sys/arch/zaurus/stand/zboot/Makefile:1.17 Tue Aug 26 23:17:21 2014
+++ src/sys/arch/zaurus/stand/zboot/Makefile Sun Jan 31 10:32:12 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2014/08/27 03:17:21 matt Exp $
+# $NetBSD: Makefile,v 1.18 2016/01/31 15:32:12 christos Exp $
PROG= zboot
@@ -12,7 +12,7 @@ SRCS+= pathfs.c
NOMAN= # defined
-.include
+.include
CFLAGS+= -Wall -Wno-main
CFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
Index: src/sys/arch/zaurus/stand/zbsdmod/Makefile
diff -u src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.9 src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.10
--- src/sys/arch/zaurus/stand/zbsdmod/Makefile:1.9 Tue Oct 14 04:33:38 2014
+++ src/sys/arch/zaurus/stand/zbsdmod/Makefile Sun Jan 31 10:32:13 2016
@@ -1,7 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2014/10/14 08:33:38 nonaka Exp $
+# $NetBSD: Makefile,v 1.10 2016/01/31 15:32:13 christos Exp $
WARNS?= 4
+.include
+
S= ${.CURDIR}/../../../..
OBJS= zbsdmod.o
CVS commit: src/share/mk
Module Name:src
Committed By: christos
Date: Sun Jan 31 15:30:14 UTC 2016
Modified Files:
src/share/mk: bsd.lib.mk bsd.own.mk bsd.prog.mk bsd.sys.mk
Log Message:
Introduce NOPIE and NOCTF so that standalone programs build properly.
To generate a diff of this commit:
cvs rdiff -u -r1.362 -r1.363 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.889 -r1.890 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.294 -r1.295 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.250 -r1.251 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.lib.mk
diff -u src/share/mk/bsd.lib.mk:1.362 src/share/mk/bsd.lib.mk:1.363
--- src/share/mk/bsd.lib.mk:1.362 Tue Sep 8 12:06:42 2015
+++ src/share/mk/bsd.lib.mk Sun Jan 31 10:30:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.lib.mk,v 1.362 2015/09/08 16:06:42 uebayasi Exp $
+# $NetBSD: bsd.lib.mk,v 1.363 2016/01/31 15:30:14 christos Exp $
# @(#)bsd.lib.mk 8.3 (Berkeley) 4/22/94
.include
@@ -42,7 +42,7 @@ realinstall: checkver libinstall
# XXX: This is needed for programs that link with .a libraries
# Perhaps a more correct solution is to always generate _pic.a
# files or always have a shared library.
-.if defined(MKPIE) && (${MKPIE} != "no")
+.if defined(MKPIE) && (${MKPIE} != "no") && !defined(NOPIE)
CFLAGS+=${PIE_CFLAGS}
AFLAGS+=${PIE_AFLAGS}
.endif
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.889 src/share/mk/bsd.own.mk:1.890
--- src/share/mk/bsd.own.mk:1.889 Fri Jan 29 10:33:51 2016
+++ src/share/mk/bsd.own.mk Sun Jan 31 10:30:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.889 2016/01/29 15:33:51 christos Exp $
+# $NetBSD: bsd.own.mk,v 1.890 2016/01/31 15:30:14 christos Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -528,6 +528,13 @@ TOOL_ZIC= zic
.endif # USETOOLS != yes # }
+# Standalone code should not be compiled with PIE or CTF
+# Should create a better test
+.if defined(BINDIR) && ${BINDIR} == "/usr/mdec"
+NOPIE= # defined
+NOCTF= # defined
+.endif
+
# Fallback to ensure that all variables are defined to something
TOOL_CC.false= false
TOOL_CPP.false= false
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.294 src/share/mk/bsd.prog.mk:1.295
--- src/share/mk/bsd.prog.mk:1.294 Sat Jan 23 16:22:47 2016
+++ src/share/mk/bsd.prog.mk Sun Jan 31 10:30:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.294 2016/01/23 21:22:47 christos Exp $
+# $NetBSD: bsd.prog.mk,v 1.295 2016/01/31 15:30:14 christos Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -48,7 +48,7 @@ CLEANFILES+=strings
@rm -f x.cc
.endif
-.if defined(MKPIE) && (${MKPIE} != "no")
+.if defined(MKPIE) && (${MKPIE} != "no") && !defined(NOPIE)
CFLAGS+= ${PIE_CFLAGS}
AFLAGS+= ${PIE_AFLAGS}
LDFLAGS+= ${PIE_LDFLAGS}
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.250 src/share/mk/bsd.sys.mk:1.251
--- src/share/mk/bsd.sys.mk:1.250 Sun Jan 10 11:22:57 2016
+++ src/share/mk/bsd.sys.mk Sun Jan 31 10:30:14 2016
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.250 2016/01/10 16:22:57 christos Exp $
+# $NetBSD: bsd.sys.mk,v 1.251 2016/01/31 15:30:14 christos Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -174,7 +174,7 @@ CPUFLAGS+= -Wa,--fatal-warnings
CFLAGS+= ${CPUFLAGS}
AFLAGS+= ${CPUFLAGS}
-.if !defined(LDSTATIC) || ${LDSTATIC} != "-static"
+.if !defined(NOPIE) && (!defined(LDSTATIC) || ${LDSTATIC} != "-static")
# Position Independent Executable flags
PIE_CFLAGS?=-fPIC
PIE_LDFLAGS?= -Wl,-pie ${${ACTIVE_CC} == "gcc":? -shared-libgcc :}
CVS commit: src/sys/arch/evbarm/stand/gzboot
Module Name:src Committed By: christos Date: Sun Jan 31 15:29:04 UTC 2016 Modified Files: src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot Log Message: remove the MKPIE and MKCTF no hack, and move it to the .mk files To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.32 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.33 --- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.32 Sat Jan 30 21:16:28 2016 +++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Sun Jan 31 10:29:04 2016 @@ -1,10 +1,8 @@ -# $NetBSD: Makefile.gzboot,v 1.32 2016/01/31 02:16:28 christos Exp $ +# $NetBSD: Makefile.gzboot,v 1.33 2016/01/31 15:29:04 christos Exp $ NOMAN= # defined -.include # Pull in OBJDIR name rules. -MKPIE:=no -MKCTF:=no +.include # Pull in OBJDIR name rules. .include .include
CVS import: othersrc/usr.bin/tnftp/libedit
Module Name:othersrc Committed By: lukem Date: Sun Jan 31 08:23:17 UTC 2016 Update of /cvsroot/othersrc/usr.bin/tnftp/libedit In directory ivanova.netbsd.org:/tmp/cvs-serv17912 Log Message: Update libedit from NetBSD-current 20160131 * Notable API changes, even if not used by tnftp: - Make el_get varyadic, and implement EL_GETTC. - Add EL_GETFP, and EL_SETFP. - Add EL_REFRESH for the benefit of readline - Document and enable wide character support. - Provide an el_init_fd function. * Remove use of alloca. Status: Vendor Tag: NetBSD Release Tags: NetBSD-20160131 C othersrc/usr.bin/tnftp/libedit/histedit.h C othersrc/usr.bin/tnftp/libedit/hist.h C othersrc/usr.bin/tnftp/libedit/sig.h N othersrc/usr.bin/tnftp/libedit/terminal.c N othersrc/usr.bin/tnftp/libedit/chartype.h C othersrc/usr.bin/tnftp/libedit/chared.h C othersrc/usr.bin/tnftp/libedit/parse.h N othersrc/usr.bin/tnftp/libedit/keymacro.h C othersrc/usr.bin/tnftp/libedit/editline.3 C othersrc/usr.bin/tnftp/libedit/prompt.c C othersrc/usr.bin/tnftp/libedit/shlib_version C othersrc/usr.bin/tnftp/libedit/filecomplete.c C othersrc/usr.bin/tnftp/libedit/read.c C othersrc/usr.bin/tnftp/libedit/emacs.c N othersrc/usr.bin/tnftp/libedit/terminal.h C othersrc/usr.bin/tnftp/libedit/search.c C othersrc/usr.bin/tnftp/libedit/map.h C othersrc/usr.bin/tnftp/libedit/parse.c C othersrc/usr.bin/tnftp/libedit/read.h C othersrc/usr.bin/tnftp/libedit/vi.c C othersrc/usr.bin/tnftp/libedit/readline.c C othersrc/usr.bin/tnftp/libedit/el.c C othersrc/usr.bin/tnftp/libedit/filecomplete.h C othersrc/usr.bin/tnftp/libedit/makelist C othersrc/usr.bin/tnftp/libedit/prompt.h C othersrc/usr.bin/tnftp/libedit/common.c C othersrc/usr.bin/tnftp/libedit/hist.c C othersrc/usr.bin/tnftp/libedit/tty.h C othersrc/usr.bin/tnftp/libedit/tokenizer.c C othersrc/usr.bin/tnftp/libedit/editrc.5 C othersrc/usr.bin/tnftp/libedit/el.h C othersrc/usr.bin/tnftp/libedit/map.c C othersrc/usr.bin/tnftp/libedit/history.c C othersrc/usr.bin/tnftp/libedit/search.h N othersrc/usr.bin/tnftp/libedit/keymacro.c C othersrc/usr.bin/tnftp/libedit/Makefile C othersrc/usr.bin/tnftp/libedit/chared.c C othersrc/usr.bin/tnftp/libedit/refresh.h C othersrc/usr.bin/tnftp/libedit/sig.c C othersrc/usr.bin/tnftp/libedit/refresh.c C othersrc/usr.bin/tnftp/libedit/sys.h C othersrc/usr.bin/tnftp/libedit/tty.c C othersrc/usr.bin/tnftp/libedit/config.h N othersrc/usr.bin/tnftp/libedit/chartype.c N othersrc/usr.bin/tnftp/libedit/eln.c C othersrc/usr.bin/tnftp/libedit/readline/readline.h U othersrc/usr.bin/tnftp/libedit/readline/Makefile N othersrc/usr.bin/tnftp/libedit/TEST/tc1.c N othersrc/usr.bin/tnftp/libedit/TEST/wtc1.c C othersrc/usr.bin/tnftp/libedit/TEST/Makefile N othersrc/usr.bin/tnftp/libedit/TEST/rl1.c 40 conflicts created by this import. Use the following command to help the merge: cvs checkout -jNetBSD:yesterday -jNetBSD othersrc/usr.bin/tnftp/libedit
