CVS commit: src/sys/arch/x68k/stand
Module Name:src
Committed By: tsutsui
Date: Tue Feb 11 08:06:07 UTC 2014
Modified Files:
src/sys/arch/x68k/stand/libiocs: iocs.h
src/sys/arch/x68k/stand/libsa: sdcd.c
Log Message:
Specify default SCSI inquiry size (36 bytes) on IOCS_S_INQUIRY() command.
X680x0 SCSI IOCS stalls if SCSI device doesn't return inquiry data
of specified allocation length size on the INQUIRY command,
and it causes hangup on the XM6 based emulators that return only
upto 36 byte inquiry data on SCSI disk emulation.
Many real SCSI-2 hard drives seem to support 100 byte inquiry data,
but at least there is a harddisk that returns only supported inquiry
data size and quits transfer.
The bootloader checks only the device type and there is no reason
to read 100 bytes that includes vender specific data.
Analyzed and reported by GIMONS, a developer of XM6 TypeG emulator,
which also can run NetBSD/x68k.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/x68k/stand/libiocs/iocs.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x68k/stand/libsa/sdcd.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/x68k/stand/libiocs/iocs.h
diff -u src/sys/arch/x68k/stand/libiocs/iocs.h:1.8 src/sys/arch/x68k/stand/libiocs/iocs.h:1.9
--- src/sys/arch/x68k/stand/libiocs/iocs.h:1.8 Mon Feb 21 02:31:59 2011
+++ src/sys/arch/x68k/stand/libiocs/iocs.h Tue Feb 11 08:06:07 2014
@@ -6,7 +6,7 @@
* (based on PD libc 1.1.32 by PROJECT C Library)
* public domain
*
- * $NetBSD: iocs.h,v 1.8 2011/02/21 02:31:59 itohy Exp $
+ * $NetBSD: iocs.h,v 1.9 2014/02/11 08:06:07 tsutsui Exp $
*/
/*
* PROJECT C Library, X68000 PROGRAMMING INTERFACE DEFINITION
@@ -224,7 +224,10 @@ struct iocs_inquiry {
unsigned char ver;
unsigned char reserve;
unsigned char size;
- unsigned char buff[0]; /* actually longer */
+ unsigned char class[3];
+ char vendor[8];
+ char product[16];
+ char revision[4];
};
/*
Index: src/sys/arch/x68k/stand/libsa/sdcd.c
diff -u src/sys/arch/x68k/stand/libsa/sdcd.c:1.14 src/sys/arch/x68k/stand/libsa/sdcd.c:1.15
--- src/sys/arch/x68k/stand/libsa/sdcd.c:1.14 Thu Nov 22 20:15:49 2012
+++ src/sys/arch/x68k/stand/libsa/sdcd.c Tue Feb 11 08:06:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: sdcd.c,v 1.14 2012/11/22 20:15:49 tsutsui Exp $ */
+/* $NetBSD: sdcd.c,v 1.15 2014/02/11 08:06:07 tsutsui Exp $ */
/*
* Copyright (c) 2001 MINOURA Makoto.
@@ -67,9 +67,9 @@ check_unit(int id)
}
{
- struct iocs_inquiry *inqdata= buffer;
+ struct iocs_inquiry *inqdata = buffer;
- error = IOCS_S_INQUIRY(100, id, inqdata);
+ error = IOCS_S_INQUIRY(sizeof(*inqdata), id, inqdata);
if (error 0) { /* WHY??? */
error = ENXIO;
goto out;
CVS commit: src/sys/arch/x68k/stand/libiocs
Module Name:src Committed By: tsutsui Date: Tue Feb 11 08:10:10 UTC 2014 Removed Files: src/sys/arch/x68k/stand/libiocs: scsi.h Log Message: Remove unused inline version of SCSI IOCS functions. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 src/sys/arch/x68k/stand/libiocs/scsi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/sys
Module Name:src
Committed By: skrll
Date: Tue Feb 11 09:04:28 UTC 2014
Modified Files:
src/sys/sys: exec_elf.h
Log Message:
Fix typo in DF_STATIC_TLS. From Elliott Hughes on tech-userlevel.
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/sys/exec_elf.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/sys/exec_elf.h
diff -u src/sys/sys/exec_elf.h:1.137 src/sys/sys/exec_elf.h:1.138
--- src/sys/sys/exec_elf.h:1.137 Fri Jan 3 21:34:40 2014
+++ src/sys/sys/exec_elf.h Tue Feb 11 09:04:28 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: exec_elf.h,v 1.137 2014/01/03 21:34:40 dsl Exp $ */
+/* $NetBSD: exec_elf.h,v 1.138 2014/02/11 09:04:28 skrll Exp $ */
/*-
* Copyright (c) 1994 The NetBSD Foundation, Inc.
@@ -700,7 +700,7 @@ typedef struct {
#define DF_SYMBOLIC 0x0002 /* */
#define DF_TEXTREL 0x0004 /* */
#define DF_BIND_NOW 0x0008 /* */
-#define DF_STATICT_LS 0x0010 /* */
+#define DF_STATIC_TLS 0x0010 /* */
/* Flag values for DT_FLAGS_1 (incomplete) */
#define DF_1_BIND_NOW 0x0001 /* Same as DF_BIND_NOW */
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: maxv
Date: Tue Feb 11 16:00:13 UTC 2014
Modified Files:
src/sys/compat/linux/common: linux_futex.c
Log Message:
Fix uninitialized variable. Harmless: it does not change the behavior
at all.
ok rmind@ christos@
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/sys/compat/linux/common/linux_futex.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_futex.c
diff -u src/sys/compat/linux/common/linux_futex.c:1.32 src/sys/compat/linux/common/linux_futex.c:1.33
--- src/sys/compat/linux/common/linux_futex.c:1.32 Thu Oct 17 21:08:16 2013
+++ src/sys/compat/linux/common/linux_futex.c Tue Feb 11 16:00:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_futex.c,v 1.32 2013/10/17 21:08:16 christos Exp $ */
+/* $NetBSD: linux_futex.c,v 1.33 2014/02/11 16:00:13 maxv Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: linux_futex.c,v 1.32 2013/10/17 21:08:16 christos Exp $);
+__KERNEL_RCSID(1, $NetBSD: linux_futex.c,v 1.33 2014/02/11 16:00:13 maxv Exp $);
#include sys/param.h
#include sys/time.h
@@ -610,7 +610,7 @@ futex_atomic_op(lwp_t *l, int encoded_op
}
error = ucas_int(uaddr, cval, nval, oldval);
- if (oldval == cval || error) {
+ if (error || oldval == cval) {
break;
}
cval = oldval;
CVS import: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Tue Feb 11 16:07:10 UTC 2014 Update of /cvsroot/src/external/bsd/atf/dist In directory ivanova.netbsd.org:/tmp/cvs-serv9703 Log Message: Import atf-0.20: Experimental version released on February 7th, 2014. This is the first release without the code for the deprecated tools. If you require such code, please fetch a copy of the 0.19 release and extract the 'tools' directory for your own consumption. * Removed the deprecated tools. This includes atf-config, atf-report, atf-run and atf-version. Status: Vendor Tag: GITHUB_JMMV Release Tags: atf-0-20 U src/external/bsd/atf/dist/atf-c.h U src/external/bsd/atf/dist/atf-c++.hpp U src/external/bsd/atf/dist/AUTHORS U src/external/bsd/atf/dist/COPYING U src/external/bsd/atf/dist/NEWS U src/external/bsd/atf/dist/README U src/external/bsd/atf/dist/Kyuafile U src/external/bsd/atf/dist/atf-c/pkg_config_test.sh U src/external/bsd/atf/dist/atf-c/defs.h.in U src/external/bsd/atf/dist/atf-c/atf-c-api.3 U src/external/bsd/atf/dist/atf-c/build.h U src/external/bsd/atf/dist/atf-c/check.h U src/external/bsd/atf/dist/atf-c/config.h U src/external/bsd/atf/dist/atf-c/error.h U src/external/bsd/atf/dist/atf-c/error_fwd.h U src/external/bsd/atf/dist/atf-c/macros.h U src/external/bsd/atf/dist/atf-c/tc.h U src/external/bsd/atf/dist/atf-c/tp.h U src/external/bsd/atf/dist/atf-c/utils.h U src/external/bsd/atf/dist/atf-c/build.c U src/external/bsd/atf/dist/atf-c/check.c U src/external/bsd/atf/dist/atf-c/config.c U src/external/bsd/atf/dist/atf-c/error.c U src/external/bsd/atf/dist/atf-c/tc.c U src/external/bsd/atf/dist/atf-c/tp.c U src/external/bsd/atf/dist/atf-c/utils.c U src/external/bsd/atf/dist/atf-c/h_build.h U src/external/bsd/atf/dist/atf-c/atf_c_test.c U src/external/bsd/atf/dist/atf-c/build_test.c U src/external/bsd/atf/dist/atf-c/check_test.c U src/external/bsd/atf/dist/atf-c/config_test.c U src/external/bsd/atf/dist/atf-c/error_test.c U src/external/bsd/atf/dist/atf-c/macros_test.c U src/external/bsd/atf/dist/atf-c/tc_test.c U src/external/bsd/atf/dist/atf-c/tp_test.c U src/external/bsd/atf/dist/atf-c/utils_test.c U src/external/bsd/atf/dist/atf-c/atf-c.pc.in U src/external/bsd/atf/dist/atf-c/Kyuafile U src/external/bsd/atf/dist/atf-c/macros_h_test.c U src/external/bsd/atf/dist/atf-c/unused_test.c U src/external/bsd/atf/dist/atf-c/detail/process_helpers.c U src/external/bsd/atf/dist/atf-c/detail/test_helpers.c U src/external/bsd/atf/dist/atf-c/detail/test_helpers.h U src/external/bsd/atf/dist/atf-c/detail/dynstr.c U src/external/bsd/atf/dist/atf-c/detail/dynstr.h U src/external/bsd/atf/dist/atf-c/detail/env.c U src/external/bsd/atf/dist/atf-c/detail/env.h U src/external/bsd/atf/dist/atf-c/detail/fs.c U src/external/bsd/atf/dist/atf-c/detail/fs.h U src/external/bsd/atf/dist/atf-c/detail/list.c U src/external/bsd/atf/dist/atf-c/detail/list.h U src/external/bsd/atf/dist/atf-c/detail/map.c U src/external/bsd/atf/dist/atf-c/detail/map.h U src/external/bsd/atf/dist/atf-c/detail/process.c U src/external/bsd/atf/dist/atf-c/detail/process.h U src/external/bsd/atf/dist/atf-c/detail/sanity.c U src/external/bsd/atf/dist/atf-c/detail/sanity.h U src/external/bsd/atf/dist/atf-c/detail/text.c U src/external/bsd/atf/dist/atf-c/detail/text.h U src/external/bsd/atf/dist/atf-c/detail/tp_main.c U src/external/bsd/atf/dist/atf-c/detail/user.c U src/external/bsd/atf/dist/atf-c/detail/user.h U src/external/bsd/atf/dist/atf-c/detail/dynstr_test.c U src/external/bsd/atf/dist/atf-c/detail/env_test.c U src/external/bsd/atf/dist/atf-c/detail/fs_test.c U src/external/bsd/atf/dist/atf-c/detail/list_test.c U src/external/bsd/atf/dist/atf-c/detail/map_test.c U src/external/bsd/atf/dist/atf-c/detail/process_test.c U src/external/bsd/atf/dist/atf-c/detail/sanity_test.c U src/external/bsd/atf/dist/atf-c/detail/text_test.c U src/external/bsd/atf/dist/atf-c/detail/user_test.c U src/external/bsd/atf/dist/atf-c/detail/version_helper.c U src/external/bsd/atf/dist/atf-c/detail/Kyuafile U src/external/bsd/atf/dist/atf-c++/macros_hpp_test.cpp U src/external/bsd/atf/dist/atf-c++/atf-c++-api.3 U src/external/bsd/atf/dist/atf-c++/build.hpp U src/external/bsd/atf/dist/atf-c++/check.hpp U src/external/bsd/atf/dist/atf-c++/config.hpp U src/external/bsd/atf/dist/atf-c++/macros.hpp U src/external/bsd/atf/dist/atf-c++/tests.hpp U src/external/bsd/atf/dist/atf-c++/utils.hpp U src/external/bsd/atf/dist/atf-c++/build.cpp U src/external/bsd/atf/dist/atf-c++/check.cpp U src/external/bsd/atf/dist/atf-c++/config.cpp U src/external/bsd/atf/dist/atf-c++/tests.cpp U src/external/bsd/atf/dist/atf-c++/utils.cpp U src/external/bsd/atf/dist/atf-c++/atf_c++_test.cpp U src/external/bsd/atf/dist/atf-c++/build_test.cpp U src/external/bsd/atf/dist/atf-c++/check_test.cpp U src/external/bsd/atf/dist/atf-c++/config_test.cpp U src/external/bsd/atf/dist/atf-c++/macros_test.cpp U src/external/bsd/atf/dist/atf-c++/tests_test.cpp U
CVS commit: src/external/bsd/atf/dist
Module Name:src Committed By: jmmv Date: Tue Feb 11 16:10:41 UTC 2014 Removed Files: src/external/bsd/atf/dist: Atffile src/external/bsd/atf/dist/atf-c: Atffile src/external/bsd/atf/dist/atf-c++: Atffile src/external/bsd/atf/dist/atf-c++/detail: Atffile src/external/bsd/atf/dist/atf-c/detail: Atffile src/external/bsd/atf/dist/atf-sh: Atffile src/external/bsd/atf/dist/test-programs: Atffile src/external/bsd/atf/dist/tools: Atffile Log Message: Merge atf-0.20. The upstream Atffiles are gone so we will just rely on our automatic generation of such files from bsd.test.mk. To generate a diff of this commit: cvs rdiff -u -r1.1.1.4 -r0 src/external/bsd/atf/dist/Atffile cvs rdiff -u -r1.2 -r0 src/external/bsd/atf/dist/atf-c/Atffile cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c++/Atffile cvs rdiff -u -r1.1.1.3 -r0 src/external/bsd/atf/dist/atf-c++/detail/Atffile cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-c/detail/Atffile cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/atf-sh/Atffile cvs rdiff -u -r1.1.1.2 -r0 src/external/bsd/atf/dist/test-programs/Atffile cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/tools/Atffile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Tue Feb 11 16:11:29 UTC 2014
Modified Files:
src/external/bsd/atf: prepare-import.sh
src/external/bsd/atf/lib/libatf-c: bconfig.h
src/external/bsd/atf/lib/tools: Makefile
src/external/bsd/atf/tests/atf/atf-c: Makefile
src/external/bsd/atf/tests/atf/atf-c++: Makefile
src/external/bsd/atf/tests/atf/atf-c++/detail: Makefile
src/external/bsd/atf/tests/atf/atf-c/detail: Makefile
src/external/bsd/atf/tests/atf/atf-config: Makefile
src/external/bsd/atf/tests/atf/atf-report: Makefile
src/external/bsd/atf/tests/atf/atf-run: Makefile
src/external/bsd/atf/tests/atf/atf-sh: Makefile
src/external/bsd/atf/tests/atf/test-programs: Makefile
src/external/bsd/atf/tests/atf/tools: Makefile
Log Message:
Update reachover build files for atf-0.20.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/prepare-import.sh
cvs rdiff -u -r1.13 -r1.14 src/external/bsd/atf/lib/libatf-c/bconfig.h
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/atf/lib/tools/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/tests/atf/atf-c/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/tests/atf/atf-c++/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/tests/atf/atf-config/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/tests/atf/atf-report/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/tests/atf/atf-run/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/tests/atf/atf-sh/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/bsd/atf/tests/atf/test-programs/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/tests/atf/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/external/bsd/atf/prepare-import.sh
diff -u src/external/bsd/atf/prepare-import.sh:1.7 src/external/bsd/atf/prepare-import.sh:1.8
--- src/external/bsd/atf/prepare-import.sh:1.7 Sat Feb 8 19:06:05 2014
+++ src/external/bsd/atf/prepare-import.sh Tue Feb 11 16:11:28 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: prepare-import.sh,v 1.7 2014/02/08 19:06:05 jmmv Exp $
+# $NetBSD: prepare-import.sh,v 1.8 2014/02/11 16:11:28 jmmv Exp $
#
# Use this script to recreate the 'dist' subdirectory from a newly released
# distfile. The script takes care of unpacking the distfile, removing any
@@ -14,6 +14,7 @@ ProgName=${0##*/}
CLEAN_PATTERNS=
CLEAN_PATTERNS=${CLEAN_PATTERNS} *.m4
CLEAN_PATTERNS=${CLEAN_PATTERNS} INSTALL TODO
+CLEAN_PATTERNS=${CLEAN_PATTERNS} Atffile */Atffile */*/Atffile
CLEAN_PATTERNS=${CLEAN_PATTERNS} Makefile* */Makefile* */*/Makefile*
CLEAN_PATTERNS=${CLEAN_PATTERNS} admin
CLEAN_PATTERNS=${CLEAN_PATTERNS} atf-*/atf-*.m4
Index: src/external/bsd/atf/lib/libatf-c/bconfig.h
diff -u src/external/bsd/atf/lib/libatf-c/bconfig.h:1.13 src/external/bsd/atf/lib/libatf-c/bconfig.h:1.14
--- src/external/bsd/atf/lib/libatf-c/bconfig.h:1.13 Sun Feb 9 14:02:39 2014
+++ src/external/bsd/atf/lib/libatf-c/bconfig.h Tue Feb 11 16:11:28 2014
@@ -58,9 +58,6 @@
/* Define to 1 if vsnprintf is in std */
/* #undef HAVE_VSNPRINTF_IN_STD */
-/* Define to the last valid signal number */
-#define LAST_SIGNO 63
-
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
#define LT_OBJDIR .libs/
@@ -78,7 +75,7 @@
#define PACKAGE_NAME Automated Testing Framework
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING Automated Testing Framework 0.19
+#define PACKAGE_STRING Automated Testing Framework 0.20
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME atf
@@ -87,10 +84,10 @@
#define PACKAGE_URL https://github.com/jmmv/atf/;
/* Define to the version of this package. */
-#define PACKAGE_VERSION 0.19
+#define PACKAGE_VERSION 0.20
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Version number of package */
-#define VERSION 0.19
+#define VERSION 0.20
Index: src/external/bsd/atf/lib/tools/Makefile
diff -u src/external/bsd/atf/lib/tools/Makefile:1.1 src/external/bsd/atf/lib/tools/Makefile:1.2
--- src/external/bsd/atf/lib/tools/Makefile:1.1 Sat Feb 8 19:15:33 2014
+++ src/external/bsd/atf/lib/tools/Makefile Tue Feb 11 16:11:28 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2014/02/08 19:15:33 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2014/02/11 16:11:28 jmmv Exp $
NOLINT= # defined
@@ -29,6 +29,7 @@ CPPFLAGS+= -DATF_MACHINE=\${MACHINE}\
CPPFLAGS+= -DATF_PKGDATADIR=\/usr/share/atf\
CPPFLAGS+= -DATF_SHELL=\/bin/sh\
CPPFLAGS+= -DATF_WORKDIR=\/tmp\
+CPPFLAGS+= -DLAST_SIGNO=63
CPPFLAGS+= -I${SRCDIR}/tools
CPPFLAGS+= -I.
CPPFLAGS+= -I${TOPDIR}/lib/libatf-c # For bconfig.h
Index:
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Tue Feb 11 16:15:06 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note update of atf to 0.20. To generate a diff of this commit: cvs rdiff -u -r1.1090 -r1.1091 src/doc/3RDPARTY cvs rdiff -u -r1.1886 -r1.1887 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.1090 src/doc/3RDPARTY:1.1091 --- src/doc/3RDPARTY:1.1090 Sat Feb 8 19:18:39 2014 +++ src/doc/3RDPARTY Tue Feb 11 16:15:06 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1090 2014/02/08 19:18:39 jmmv Exp $ +# $NetBSD: 3RDPARTY,v 1.1091 2014/02/11 16:15:06 jmmv Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -69,11 +69,11 @@ Fix symbolic links before import. Check external/bsd/am-utils/include/config.h is correct after import. Package: Automated Testing Framework (ATF) -Version: 0.19 -Current Vers: 0.19 +Version: 0.20 +Current Vers: 0.20 Maintainer: Julio Merino j...@netbsd.org -Archive site: http://code.google.com/p/kyua/downloads/list?can=1 -Home page: http://code.google.com/p/kyua/wiki/ATF +Archive site: https://github.com/jmmv/atf/releases +Home page: https://github.com/jmmv/atf Mailing List: atf-de...@netbsd.org Responsible: jmmv License: The NetBSD Foundation's license (BSD 2-clause) @@ -81,9 +81,11 @@ Location: external/bsd/atf/dist Notes: The source files are in external/bsd/atf/dist. Use external/bsd/atf/prepare-import.sh to regenerate the dist/ directory. -Given that the primary goal of ATF is to provide a testing framework for -NetBSD, no local changes should be ever needed. Always direct them to the -maintainer for integration in official releases. +Please avoid performing local changes to this package without discussing +them with the responsible person and/or the mailing list shown above. +Note that the external/bsd/atf/dist/tools is owned by NetBSD and does not +exist upstream; however, please continue to discuss any desired changes +upfront. Package: ath-hal Version: FreeBSD SVN revision number 185521 Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1886 src/doc/CHANGES:1.1887 --- src/doc/CHANGES:1.1886 Sat Feb 8 19:18:39 2014 +++ src/doc/CHANGES Tue Feb 11 16:15:06 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1886 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1887 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -346,3 +346,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: ohci(4): Support the National Semiconductor PC87560 as found in many hppa machines. [skrll 20140128] atf(7): Import atf 0.19. [jmmv 20140208] + atf(7): Import atf 0.20. [jmmv 20140211]
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Tue Feb 11 16:31:38 UTC 2014
Modified Files:
src/external/bsd/atf/dist/tools: application.cpp atf-config.cpp
atf-report.cpp atffile.cpp auto_array_test.cpp config_file.cpp
process.cpp reader.cpp reader_test.cpp requirements.cpp
signals_test.cpp test-program.cpp timers.cpp
src/external/bsd/atf/lib/tools: Makefile
Removed Files:
src/external/bsd/atf/dist/tools: defs.hpp.in
Log Message:
Remove defs.hpp.
Because we now own the 'tools' subdirectory in the tree, we can yank some
of the upstream autoconf-related complexity. Start doing so by removing
defs.hpp and using the real compiler attributes where necessary.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/tools/application.cpp \
src/external/bsd/atf/dist/tools/atffile.cpp \
src/external/bsd/atf/dist/tools/auto_array_test.cpp \
src/external/bsd/atf/dist/tools/config_file.cpp \
src/external/bsd/atf/dist/tools/process.cpp \
src/external/bsd/atf/dist/tools/reader.cpp \
src/external/bsd/atf/dist/tools/reader_test.cpp \
src/external/bsd/atf/dist/tools/requirements.cpp \
src/external/bsd/atf/dist/tools/signals_test.cpp \
src/external/bsd/atf/dist/tools/test-program.cpp \
src/external/bsd/atf/dist/tools/timers.cpp
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/tools/atf-config.cpp \
src/external/bsd/atf/dist/tools/atf-report.cpp
cvs rdiff -u -r1.1.1.1 -r0 src/external/bsd/atf/dist/tools/defs.hpp.in
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/lib/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/external/bsd/atf/dist/tools/application.cpp
diff -u src/external/bsd/atf/dist/tools/application.cpp:1.1.1.1 src/external/bsd/atf/dist/tools/application.cpp:1.2
--- src/external/bsd/atf/dist/tools/application.cpp:1.1.1.1 Sat Feb 8 19:11:32 2014
+++ src/external/bsd/atf/dist/tools/application.cpp Tue Feb 11 16:31:38 2014
@@ -43,7 +43,6 @@ extern C {
#include iostream
#include application.hpp
-#include defs.hpp
#include ui.hpp
#if !defined(HAVE_VSNPRINTF_IN_STD)
@@ -148,8 +147,8 @@ impl::app::specific_options(void)
}
void
-impl::app::process_option(int ch ATF_DEFS_ATTRIBUTE_UNUSED,
- const char* arg ATF_DEFS_ATTRIBUTE_UNUSED)
+impl::app::process_option(int ch __attribute__((__unused__)),
+ const char* arg __attribute__((__unused__)))
{
}
Index: src/external/bsd/atf/dist/tools/atffile.cpp
diff -u src/external/bsd/atf/dist/tools/atffile.cpp:1.1.1.1 src/external/bsd/atf/dist/tools/atffile.cpp:1.2
--- src/external/bsd/atf/dist/tools/atffile.cpp:1.1.1.1 Sat Feb 8 19:11:32 2014
+++ src/external/bsd/atf/dist/tools/atffile.cpp Tue Feb 11 16:31:38 2014
@@ -32,7 +32,6 @@
#include fstream
#include atffile.hpp
-#include defs.hpp
#include exceptions.hpp
#include expand.hpp
#include parser.hpp
@@ -98,22 +97,22 @@ detail::atf_atffile_reader::~atf_atffile
void
detail::atf_atffile_reader::got_conf(
-const std::string name ATF_DEFS_ATTRIBUTE_UNUSED,
-const std::string val ATF_DEFS_ATTRIBUTE_UNUSED)
+const std::string name __attribute__((__unused__)),
+const std::string val __attribute__((__unused__)))
{
}
void
detail::atf_atffile_reader::got_prop(
-const std::string name ATF_DEFS_ATTRIBUTE_UNUSED,
-const std::string val ATF_DEFS_ATTRIBUTE_UNUSED)
+const std::string name __attribute__((__unused__)),
+const std::string val __attribute__((__unused__)))
{
}
void
detail::atf_atffile_reader::got_tp(
-const std::string name ATF_DEFS_ATTRIBUTE_UNUSED,
-bool isglob ATF_DEFS_ATTRIBUTE_UNUSED)
+const std::string name __attribute__((__unused__)),
+bool isglob __attribute__((__unused__)))
{
}
Index: src/external/bsd/atf/dist/tools/auto_array_test.cpp
diff -u src/external/bsd/atf/dist/tools/auto_array_test.cpp:1.1.1.1 src/external/bsd/atf/dist/tools/auto_array_test.cpp:1.2
--- src/external/bsd/atf/dist/tools/auto_array_test.cpp:1.1.1.1 Sat Feb 8 19:11:33 2014
+++ src/external/bsd/atf/dist/tools/auto_array_test.cpp Tue Feb 11 16:31:38 2014
@@ -36,7 +36,6 @@ extern C {
#include atf-c++.hpp
#include auto_array.hpp
-#include defs.hpp
//
// Tests for the auto_array class.
@@ -55,7 +54,7 @@ public:
return tools::auto_array test_array (ta);
}
-void* operator new(size_t size ATF_DEFS_ATTRIBUTE_UNUSED)
+void* operator new(size_t size __attribute__((__unused__)))
{
ATF_FAIL(New called but should have been new[]);
return new int(5);
@@ -69,7 +68,7 @@ public:
return mem;
}
-void operator delete(void* mem ATF_DEFS_ATTRIBUTE_UNUSED)
+void operator delete(void* mem __attribute__((__unused__)))
{
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Tue Feb 11 17:28:21 UTC 2014
Modified Files:
src/external/bsd/atf/dist/tools: application.cpp atf-run.cpp
atf-version.cpp env.cpp fs.cpp signals.cpp timers.cpp
src/external/bsd/atf/lib/tools: Makefile
src/external/bsd/atf/usr.bin/atf-config: Makefile
src/external/bsd/atf/usr.bin/atf-report: Makefile
src/external/bsd/atf/usr.bin/atf-run: Makefile
src/external/bsd/atf/usr.bin/atf-version: Makefile
Log Message:
Stop using bconfig.h in the tools code.
Just assume the code is being built for NetBSD for simplicity reasons.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/tools/application.cpp \
src/external/bsd/atf/dist/tools/timers.cpp
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/dist/tools/atf-run.cpp \
src/external/bsd/atf/dist/tools/atf-version.cpp
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/tools/env.cpp \
src/external/bsd/atf/dist/tools/fs.cpp \
src/external/bsd/atf/dist/tools/signals.cpp
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/atf/lib/tools/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/usr.bin/atf-config/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/atf/usr.bin/atf-report/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/bsd/atf/usr.bin/atf-run/Makefile
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/usr.bin/atf-version/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/dist/tools/application.cpp
diff -u src/external/bsd/atf/dist/tools/application.cpp:1.2 src/external/bsd/atf/dist/tools/application.cpp:1.3
--- src/external/bsd/atf/dist/tools/application.cpp:1.2 Tue Feb 11 16:31:38 2014
+++ src/external/bsd/atf/dist/tools/application.cpp Tue Feb 11 17:28:20 2014
@@ -27,10 +27,6 @@
// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
-#if defined(HAVE_CONFIG_H)
-#include bconfig.h
-#endif
-
extern C {
#include unistd.h
}
@@ -45,11 +41,9 @@ extern C {
#include application.hpp
#include ui.hpp
-#if !defined(HAVE_VSNPRINTF_IN_STD)
namespace std {
using ::vsnprintf;
}
-#endif // !defined(HAVE_VSNPRINTF_IN_STD)
namespace impl = tools::application;
#define IMPL_NAME tools::application
@@ -157,11 +151,7 @@ impl::app::process_options(void)
{
assert(inited());
-std::string optstr;
-#if defined(HAVE_GNU_GETOPT)
-optstr += '+'; // Turn on POSIX behavior.
-#endif
-optstr += ':';
+std::string optstr = :;
{
options_set opts = options();
for (options_set::const_iterator iter = opts.begin();
@@ -200,9 +190,7 @@ impl::app::process_options(void)
// Clear getopt state just in case the test wants to use it.
opterr = old_opterr;
optind = 1;
-#if defined(HAVE_OPTRESET)
optreset = 1;
-#endif
}
void
@@ -275,9 +263,8 @@ impl::app::run(int argc, char* const* ar
const std::string bug =
std::string(This is probably a bug in ) + m_prog_name +
- or one of the libraries it uses. Please report this problem to
-PACKAGE_BUGREPORT and provide as many details as possible
-describing how you got to this condition.;
+ Please use send-pr(1) to report this issue and provide as many
+ details as possible describing how you got to this condition.;
int errcode;
try {
Index: src/external/bsd/atf/dist/tools/timers.cpp
diff -u src/external/bsd/atf/dist/tools/timers.cpp:1.2 src/external/bsd/atf/dist/tools/timers.cpp:1.3
--- src/external/bsd/atf/dist/tools/timers.cpp:1.2 Tue Feb 11 16:31:38 2014
+++ src/external/bsd/atf/dist/tools/timers.cpp Tue Feb 11 17:28:20 2014
@@ -27,10 +27,6 @@
// IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
-#if defined(HAVE_CONFIG_H)
-# include bconfig.h
-#endif
-
extern C {
#include sys/time.h
}
@@ -47,15 +43,10 @@ extern C {
namespace impl = tools::timers;
#define IMPL_NAME tools::timers
-#if !defined(HAVE_TIMER_T)
-static impl::timer* compat_handle;
-#endif
-
//
// Auxiliary functions.
//
-#if defined(HAVE_TIMER_T)
static
void
handler(const int signo __attribute__((__unused__)), siginfo_t* si,
@@ -65,29 +56,14 @@ handler(const int signo __attribute__((_
timer-set_fired();
timer-timeout_callback();
}
-#else
-static
-void
-handler(const int signo __attribute__((__unused__)),
-siginfo_t* si __attribute__((__unused__)),
-void* uc __attribute__((__unused__)))
-{
-compat_handle-set_fired();
-compat_handle-timeout_callback();
-}
-#endif
//
// The timer class.
//
struct impl::timer::impl {
-#if defined(HAVE_TIMER_T)
CVS commit: src/external/bsd/atf
Module Name:src
Committed By: jmmv
Date: Tue Feb 11 18:07:30 UTC 2014
Modified Files:
src/external/bsd/atf/dist/tools: atf-version.cpp
src/external/bsd/atf/usr.bin/atf-version: Makefile
Removed Files:
src/external/bsd/atf/usr.bin/atf-version: revision.h
Log Message:
Remove revision.h and associated complexity from atf-version.
Arguably, this was never needed and only made the code and the build system
more complex for no real reason.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/tools/atf-version.cpp
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/usr.bin/atf-version/Makefile
cvs rdiff -u -r1.1 -r0 src/external/bsd/atf/usr.bin/atf-version/revision.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/atf/dist/tools/atf-version.cpp
diff -u src/external/bsd/atf/dist/tools/atf-version.cpp:1.4 src/external/bsd/atf/dist/tools/atf-version.cpp:1.5
--- src/external/bsd/atf/dist/tools/atf-version.cpp:1.4 Tue Feb 11 17:28:20 2014
+++ src/external/bsd/atf/dist/tools/atf-version.cpp Tue Feb 11 18:07:30 2014
@@ -31,8 +31,6 @@
#include iostream
#include application.hpp
-#include revision.h
-#include ui.hpp
class atf_version : public tools::application::app {
static const char* m_description;
@@ -55,28 +53,9 @@ atf_version::atf_version(void) :
int
atf_version::main(void)
{
-using tools::ui::format_text;
-using tools::ui::format_text_with_tag;
-
std::cout
Automated Testing Framework ATF_VERSION (atf- ATF_VERSION )\n
-Copyright (c) 2007 The NetBSD Foundation, Inc.\n\n;
-
-#if defined(PACKAGE_REVISION_TYPE_DIST)
-std::cout format_text(Built from a distribution file; no revision
-information available.) \n;
-#elif defined(PACKAGE_REVISION_TYPE_GIT)
-std::cout format_text_with_tag(PACKAGE_REVISION_BRANCH, Branch: ,
- false) \n;
-std::cout format_text_with_tag(PACKAGE_REVISION_BASE
-# if PACKAGE_REVISION_MODIFIED
- (locally modified)
-# endif
- PACKAGE_REVISION_DATE,
-Base revision: , false) \n;
-#else
-# error Unknown PACKAGE_REVISION_TYPE value
-#endif
+Copyright (c) 2007 The NetBSD Foundation, Inc.\n;
return EXIT_SUCCESS;
}
Index: src/external/bsd/atf/usr.bin/atf-version/Makefile
diff -u src/external/bsd/atf/usr.bin/atf-version/Makefile:1.9 src/external/bsd/atf/usr.bin/atf-version/Makefile:1.10
--- src/external/bsd/atf/usr.bin/atf-version/Makefile:1.9 Tue Feb 11 17:28:21 2014
+++ src/external/bsd/atf/usr.bin/atf-version/Makefile Tue Feb 11 18:07:30 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/02/11 17:28:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2014/02/11 18:07:30 jmmv Exp $
.include bsd.own.mk
@@ -12,7 +12,6 @@ MAN= atf-version.1
CPPFLAGS+= -DATF_VERSION=\$(ATF_VERSION)\
CPPFLAGS+= -I${SRCDIR}/tools
-CPPFLAGS+= -I${.CURDIR}
USE_ATF_LIBTOOLS= yes
CVS commit: src/external/bsd/atf/dist/tools
Module Name:src
Committed By: jmmv
Date: Tue Feb 11 18:13:45 UTC 2014
Modified Files:
src/external/bsd/atf/dist/tools: atf-run.cpp fs.cpp process.cpp
requirements.cpp requirements_test.cpp
Log Message:
Remove portability-related guards from the atf tools.
Just assume we are building for NetBSD given that the tools code is now
owned by the NetBSD tree.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/dist/tools/atf-run.cpp
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/dist/tools/fs.cpp \
src/external/bsd/atf/dist/tools/process.cpp \
src/external/bsd/atf/dist/tools/requirements.cpp
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/bsd/atf/dist/tools/requirements_test.cpp
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/dist/tools/atf-run.cpp
diff -u src/external/bsd/atf/dist/tools/atf-run.cpp:1.4 src/external/bsd/atf/dist/tools/atf-run.cpp:1.5
--- src/external/bsd/atf/dist/tools/atf-run.cpp:1.4 Tue Feb 11 17:28:20 2014
+++ src/external/bsd/atf/dist/tools/atf-run.cpp Tue Feb 11 18:13:45 2014
@@ -64,12 +64,6 @@ typedef std::map std::string, std::stri
} // anonymous namespace
-#if defined(MAXCOMLEN)
-static const std::string::size_type max_core_name_length = MAXCOMLEN;
-#else
-static const std::string::size_type max_core_name_length = std::string::npos;
-#endif
-
class atf_run : public tools::application::app {
static const char* m_description;
@@ -127,7 +121,7 @@ dump_stacktrace(const tools::fs::path t
w.stderr_tc(Test program crashed; attempting to get stack trace);
const tools::fs::path corename = workdir /
-(tp.leaf_name().substr(0, max_core_name_length) + .core);
+(tp.leaf_name().substr(0, MAXCOMLEN) + .core);
if (!tools::fs::exists(corename)) {
w.stderr_tc(Expected file + corename.str() + not found);
return;
Index: src/external/bsd/atf/dist/tools/fs.cpp
diff -u src/external/bsd/atf/dist/tools/fs.cpp:1.2 src/external/bsd/atf/dist/tools/fs.cpp:1.3
--- src/external/bsd/atf/dist/tools/fs.cpp:1.2 Tue Feb 11 17:28:20 2014
+++ src/external/bsd/atf/dist/tools/fs.cpp Tue Feb 11 18:13:45 2014
@@ -434,9 +434,7 @@ impl::file_info::file_info(const path p
case S_IFLNK: m_type = lnk_type; break;
case S_IFREG: m_type = reg_type; break;
case S_IFSOCK: m_type = sock_type; break;
-#if defined(S_IFWHT)
case S_IFWHT: m_type = wht_type; break;
-#endif
default:
throw system_error(IMPL_NAME ::file_info, Unknown file type
error, EINVAL);
Index: src/external/bsd/atf/dist/tools/process.cpp
diff -u src/external/bsd/atf/dist/tools/process.cpp:1.2 src/external/bsd/atf/dist/tools/process.cpp:1.3
--- src/external/bsd/atf/dist/tools/process.cpp:1.2 Tue Feb 11 16:31:38 2014
+++ src/external/bsd/atf/dist/tools/process.cpp Tue Feb 11 18:13:45 2014
@@ -399,12 +399,8 @@ impl::status::coredump(void)
const
{
assert(signaled());
-#if defined(WCOREDUMP)
int mutable_status = m_status;
return WCOREDUMP(mutable_status);
-#else
-return false;
-#endif
}
//
Index: src/external/bsd/atf/dist/tools/requirements.cpp
diff -u src/external/bsd/atf/dist/tools/requirements.cpp:1.2 src/external/bsd/atf/dist/tools/requirements.cpp:1.3
--- src/external/bsd/atf/dist/tools/requirements.cpp:1.2 Tue Feb 11 16:31:38 2014
+++ src/external/bsd/atf/dist/tools/requirements.cpp Tue Feb 11 18:13:45 2014
@@ -145,14 +145,15 @@ check_machine(const std::string machine
return Requires one of the ' + machines + ' machine types;
}
-#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__NetBSD__)
static
std::string
-check_memory_sysctl(const int64_t needed, const char* sysctl_variable)
+check_memory(const std::string raw_memory)
{
+const int64_t needed = tools::text::to_bytes(raw_memory);
+
int64_t available;
std::size_t available_length = sizeof(available);
-if (::sysctlbyname(sysctl_variable, available, available_length,
+if (::sysctlbyname(hw.usermem64, available, available_length,
NULL, 0) == -1) {
const char* e = std::strerror(errno);
return Failed to get sysctl(hw.usermem64) value: + std::string(e);
@@ -164,55 +165,6 @@ check_memory_sysctl(const int64_t needed
} else
return ;
}
-# if defined(__APPLE__)
-static
-std::string
-check_memory_darwin(const int64_t needed)
-{
-return check_memory_sysctl(needed, hw.usermem);
-}
-# elif defined(__FreeBSD__)
-static
-std::string
-check_memory_freebsd(const int64_t needed)
-{
-return check_memory_sysctl(needed, hw.usermem);
-}
-# elif defined(__NetBSD__)
-static
-std::string
-check_memory_netbsd(const int64_t needed)
-{
-return check_memory_sysctl(needed, hw.usermem64);
-}
-# else
-# error
CVS commit: src
Module Name:src Committed By: dsl Date: Tue Feb 11 20:17:16 UTC 2014 Modified Files: src/distrib/sets/lists/comp: md.amd64 src/sys/arch/amd64/amd64: machdep.c netbsd32_machdep.c process_machdep.c trap.c src/sys/arch/amd64/conf: files.amd64 src/sys/arch/amd64/include: Makefile fenv.h frame.h pcb.h reg.h src/sys/arch/x86/acpi: acpi_wakeup.c src/sys/arch/x86/include: Makefile src/sys/arch/x86/x86: ipi.c vm_machdep.c src/sys/arch/xen/conf: files.xen src/sys/arch/xen/x86: cpu.c xen_ipi.c src/sys/compat/linux/arch/amd64: linux_machdep.c Added Files: src/sys/arch/x86/include: fpu.h src/sys/arch/x86/x86: fpu.c Removed Files: src/sys/arch/amd64/amd64: fpu.c src/sys/arch/amd64/include: fpu.h Log Message: Move sys/arch/amd64/amd64/fpu.c and sys/arch/amd64/include/fpu.h into sys/arch/x86 in preparation for using the same code for i386. To generate a diff of this commit: cvs rdiff -u -r1.213 -r1.214 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.48 -r0 src/sys/arch/amd64/amd64/fpu.c cvs rdiff -u -r1.202 -r1.203 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.89 -r1.90 src/sys/arch/amd64/amd64/netbsd32_machdep.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amd64/amd64/process_machdep.c cvs rdiff -u -r1.75 -r1.76 src/sys/arch/amd64/amd64/trap.c cvs rdiff -u -r1.81 -r1.82 src/sys/arch/amd64/conf/files.amd64 cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amd64/include/Makefile \ src/sys/arch/amd64/include/frame.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amd64/include/fenv.h cvs rdiff -u -r1.12 -r0 src/sys/arch/amd64/include/fpu.h cvs rdiff -u -r1.23 -r1.24 src/sys/arch/amd64/include/pcb.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amd64/include/reg.h cvs rdiff -u -r1.35 -r1.36 src/sys/arch/x86/acpi/acpi_wakeup.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/x86/include/Makefile cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/include/fpu.h cvs rdiff -u -r0 -r1.1 src/sys/arch/x86/x86/fpu.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/x86/x86/ipi.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/x86/x86/vm_machdep.c cvs rdiff -u -r1.131 -r1.132 src/sys/arch/xen/conf/files.xen cvs rdiff -u -r1.96 -r1.97 src/sys/arch/xen/x86/cpu.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/xen/x86/xen_ipi.c cvs rdiff -u -r1.45 -r1.46 src/sys/compat/linux/arch/amd64/linux_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/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.213 src/distrib/sets/lists/comp/md.amd64:1.214 --- src/distrib/sets/lists/comp/md.amd64:1.213 Fri Feb 7 23:18:04 2014 +++ src/distrib/sets/lists/comp/md.amd64 Tue Feb 11 20:17:16 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.213 2014/02/07 23:18:04 dsl Exp $ +# $NetBSD: md.amd64,v 1.214 2014/02/11 20:17:16 dsl Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include @@ -19,7 +19,7 @@ ./usr/include/amd64/endian_machdep.h comp-c-include ./usr/include/amd64/fenv.h comp-c-include ./usr/include/amd64/float.h comp-c-include -./usr/include/amd64/fpu.h comp-c-include +./usr/include/amd64/fpu.h comp-c-include obsolete ./usr/include/amd64/frame.h comp-c-include ./usr/include/amd64/frame_regs.h comp-c-include ./usr/include/amd64/gdt.h comp-c-include @@ -431,6 +431,7 @@ ./usr/include/x86/cputypes.h comp-c-include ./usr/include/x86/cpuvar.h comp-c-include ./usr/include/x86/float.h comp-c-include +./usr/include/x86/fpu.hcomp-c-include ./usr/include/x86/ieee.h comp-c-include ./usr/include/x86/ieeefp.h comp-c-include ./usr/include/x86/intr.h comp-c-include Index: src/sys/arch/amd64/amd64/machdep.c diff -u src/sys/arch/amd64/amd64/machdep.c:1.202 src/sys/arch/amd64/amd64/machdep.c:1.203 --- src/sys/arch/amd64/amd64/machdep.c:1.202 Fri Feb 7 22:40:22 2014 +++ src/sys/arch/amd64/amd64/machdep.c Tue Feb 11 20:17:16 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.202 2014/02/07 22:40:22 dsl Exp $ */ +/* $NetBSD: machdep.c,v 1.203 2014/02/11 20:17:16 dsl Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011 @@ -111,7 +111,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.202 2014/02/07 22:40:22 dsl Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.203 2014/02/11 20:17:16 dsl Exp $); /* #define XENDEBUG_LOW */ @@ -174,7 +174,7 @@ __KERNEL_RCSID(0, $NetBSD: machdep.c,v #include machine/reg.h #include machine/specialreg.h #include machine/bootinfo.h -#include machine/fpu.h +#include x86/fpu.h #include machine/mtrr.h #include machine/mpbiosvar.h Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.89 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.90 --- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.89 Fri Feb 7 22:40:22 2014 +++ src/sys/arch/amd64/amd64/netbsd32_machdep.c
CVS commit: src/distrib/sets/lists/comp
Module Name:src Committed By: dsl Date: Tue Feb 11 22:48:25 UTC 2014 Modified Files: src/distrib/sets/lists/comp: md.i386 Log Message: Add x86/fpu.h Nothing in i386 uses it yet, but it ends up in destdir so it has to be released. To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.144 src/distrib/sets/lists/comp/md.i386 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/md.i386 diff -u src/distrib/sets/lists/comp/md.i386:1.143 src/distrib/sets/lists/comp/md.i386:1.144 --- src/distrib/sets/lists/comp/md.i386:1.143 Fri Feb 7 23:18:04 2014 +++ src/distrib/sets/lists/comp/md.i386 Tue Feb 11 22:48:25 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.143 2014/02/07 23:18:04 dsl Exp $ +# $NetBSD: md.i386,v 1.144 2014/02/11 22:48:25 dsl Exp $ ./usr/include/clang-3.0/avx2intrin.h comp-obsolete obsolete ./usr/include/clang-3.0/avxintrin.h comp-obsolete obsolete ./usr/include/clang-3.0/bmi2intrin.h comp-obsolete obsolete @@ -306,6 +306,7 @@ ./usr/include/x86/cputypes.h comp-c-include ./usr/include/x86/cpuvar.h comp-c-include ./usr/include/x86/float.h comp-c-include +./usr/include/x86/fpu.hcomp-c-include ./usr/include/x86/ieee.h comp-c-include ./usr/include/x86/ieeefp.h comp-c-include ./usr/include/x86/intr.h comp-c-include
CVS commit: src/usr.bin/make
Module Name:src Committed By: sjg Date: Wed Feb 12 01:35:56 UTC 2014 Modified Files: src/usr.bin/make: str.c Log Message: Reduce the calls to realloc from brk_string by basing initial argmax guess on length of input. Reviewed by: christos To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/usr.bin/make/str.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.bin/make/str.c diff -u src/usr.bin/make/str.c:1.34 src/usr.bin/make/str.c:1.35 --- src/usr.bin/make/str.c:1.34 Sat Mar 3 23:16:47 2012 +++ src/usr.bin/make/str.c Wed Feb 12 01:35:56 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: str.c,v 1.34 2012/03/03 23:16:47 dholland Exp $ */ +/* $NetBSD: str.c,v 1.35 2014/02/12 01:35:56 sjg Exp $ */ /*- * Copyright (c) 1988, 1989, 1990, 1993 @@ -69,14 +69,14 @@ */ #ifndef MAKE_NATIVE -static char rcsid[] = $NetBSD: str.c,v 1.34 2012/03/03 23:16:47 dholland Exp $; +static char rcsid[] = $NetBSD: str.c,v 1.35 2014/02/12 01:35:56 sjg Exp $; #else #include sys/cdefs.h #ifndef lint #if 0 static char sccsid[] = @(#)str.c 5.8 (Berkeley) 6/1/90; #else -__RCSID($NetBSD: str.c,v 1.34 2012/03/03 23:16:47 dholland Exp $); +__RCSID($NetBSD: str.c,v 1.35 2014/02/12 01:35:56 sjg Exp $); #endif #endif/* not lint */ #endif @@ -145,7 +145,7 @@ brk_string(const char *str, int *store_a const char *p; int len; int argmax = 50, curlen = 0; - char **argv = bmake_malloc((argmax + 1) * sizeof(char *)); + char **argv; /* skip leading space chars. */ for (; *str == ' ' || *str == '\t'; ++str) @@ -156,6 +156,12 @@ brk_string(const char *str, int *store_a *buffer = bmake_malloc(curlen = len); /* + * initial argmax based on len + */ + argmax = MAX((len / 5), 50); + argv = bmake_malloc((argmax + 1) * sizeof(char *)); + + /* * copy the string; at the same time, parse backslashes, * quotes and build the argument list. */
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: rmind
Date: Wed Feb 12 01:42:50 UTC 2014
Modified Files:
src/usr.sbin/npf/npfctl: npf_show.c
Log Message:
npfctl_print_table: add a cdb type.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/npf/npfctl/npf_show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf_show.c
diff -u src/usr.sbin/npf/npfctl/npf_show.c:1.10 src/usr.sbin/npf/npfctl/npf_show.c:1.11
--- src/usr.sbin/npf/npfctl/npf_show.c:1.10 Sat Feb 8 01:20:09 2014
+++ src/usr.sbin/npf/npfctl/npf_show.c Wed Feb 12 01:42:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_show.c,v 1.10 2014/02/08 01:20:09 rmind Exp $ */
+/* $NetBSD: npf_show.c,v 1.11 2014/02/12 01:42:50 rmind Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: npf_show.c,v 1.10 2014/02/08 01:20:09 rmind Exp $);
+__RCSID($NetBSD: npf_show.c,v 1.11 2014/02/12 01:42:50 rmind Exp $);
#include sys/socket.h
#include netinet/in.h
@@ -423,17 +423,19 @@ static void
npfctl_print_table(npf_conf_info_t *ctx, nl_table_t *tl)
{
const char *name = npf_table_getname(tl);
- const int type = npf_table_gettype(tl);
+ const unsigned type = npf_table_gettype(tl);
+ const char *table_types[] = {
+ [NPF_TABLE_HASH] = hash,
+ [NPF_TABLE_TREE] = tree,
+ [NPF_TABLE_CDB] = cdb,
+ };
if (name[0] == '.') {
/* Internal tables use dot and are hidden. */
return;
}
-
- fprintf(ctx-fp, table %s type %s\n, name,
- (type == NPF_TABLE_HASH) ? hash :
- (type == NPF_TABLE_TREE) ? tree :
- unknown);
+ assert(type __arraycount(table_types));
+ fprintf(ctx-fp, table %s type %s\n, name, table_types[type]);
}
int
CVS commit: src/external/bsd/atf/tests/atf
Module Name:src Committed By: jmmv Date: Wed Feb 12 03:47:21 UTC 2014 Removed Files: src/external/bsd/atf/tests/atf/atf-config: Makefile src/external/bsd/atf/tests/atf/atf-report: Makefile src/external/bsd/atf/tests/atf/atf-run: Makefile Log Message: Remove unused reachover Makefiles. The content of these was subsumed into the sibling 'tools' subdirectory during the import of atf-0.19. To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/external/bsd/atf/tests/atf/atf-config/Makefile cvs rdiff -u -r1.6 -r0 src/external/bsd/atf/tests/atf/atf-report/Makefile cvs rdiff -u -r1.7 -r0 src/external/bsd/atf/tests/atf/atf-run/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/atf
Module Name:src Committed By: jmmv Date: Wed Feb 12 04:08:32 UTC 2014 Modified Files: src/external/bsd/atf: Makefile.inc src/external/bsd/atf/etc/atf: Makefile src/external/bsd/atf/lib/libatf-c: Makefile src/external/bsd/atf/lib/libatf-c++: Makefile src/external/bsd/atf/lib/tools: Makefile src/external/bsd/atf/libexec/atf-check: Makefile src/external/bsd/atf/share/doc/atf: Makefile src/external/bsd/atf/share/examples/atf: Makefile src/external/bsd/atf/share/xml/atf: Makefile src/external/bsd/atf/share/xsl/atf: Makefile src/external/bsd/atf/tests/atf: Makefile src/external/bsd/atf/tests/atf/atf-c: Makefile src/external/bsd/atf/tests/atf/atf-c++: Makefile src/external/bsd/atf/tests/atf/atf-c++/detail: Makefile src/external/bsd/atf/tests/atf/atf-c/detail: Makefile src/external/bsd/atf/tests/atf/atf-sh: Makefile src/external/bsd/atf/tests/atf/test-programs: Makefile src/external/bsd/atf/tests/atf/tools: Makefile src/external/bsd/atf/usr.bin/atf-config: Makefile src/external/bsd/atf/usr.bin/atf-report: Makefile src/external/bsd/atf/usr.bin/atf-run: Makefile src/external/bsd/atf/usr.bin/atf-sh: Makefile src/external/bsd/atf/usr.bin/atf-version: Makefile Added Files: src/external/bsd/atf: bconfig.h src/external/bsd/atf/etc: Makefile.inc src/external/bsd/atf/lib/libatf-c: defs.h src/external/bsd/atf/libexec: Makefile.inc src/external/bsd/atf/share: Makefile.inc src/external/bsd/atf/share/doc: Makefile.inc src/external/bsd/atf/share/examples: Makefile.inc src/external/bsd/atf/share/xml: Makefile.inc src/external/bsd/atf/share/xsl: Makefile.inc src/external/bsd/atf/tests: Makefile.inc src/external/bsd/atf/tests/atf: Makefile.inc src/external/bsd/atf/tests/atf/atf-c: Makefile.inc src/external/bsd/atf/tests/atf/atf-c++: Makefile.inc Removed Files: src/external/bsd/atf/lib/libatf-c: bconfig.h Log Message: Homogenize reachover build file structure with that of kyua-cli: - Move the majority of the common build definitions to the top-level Makefile.inc and ensure this gets included everywhere. - Move the bconfig.h file to the top-level directory. - Add a statically-generated defs.h file instead of creating one during the build. Easier to understand and less chances for things to go wrong. - Make sure all files using ATF_VERSION have the right dependency to trigger a rebuild when the value changes. - Clean up stale -I flags. This is all mostly for simplicity reasons and to reduce the cognitive load required to understand the build of the atf and kyua-* packages. I have tested this with both MKKYUA=no/yes and non-clean/clean builds so hopefully I got the details right. But if not, let me know please. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/bconfig.h cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/etc/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/etc/atf/Makefile cvs rdiff -u -r1.18 -r1.19 src/external/bsd/atf/lib/libatf-c/Makefile cvs rdiff -u -r1.14 -r0 src/external/bsd/atf/lib/libatf-c/bconfig.h cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/lib/libatf-c/defs.h cvs rdiff -u -r1.21 -r1.22 src/external/bsd/atf/lib/libatf-c++/Makefile cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/lib/tools/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/libexec/Makefile.inc cvs rdiff -u -r1.2 -r1.3 src/external/bsd/atf/libexec/atf-check/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/doc/Makefile.inc cvs rdiff -u -r1.5 -r1.6 src/external/bsd/atf/share/doc/atf/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/examples/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/share/examples/atf/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/xml/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/share/xml/atf/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/share/xsl/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/external/bsd/atf/share/xsl/atf/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/Makefile.inc cvs rdiff -u -r1.8 -r1.9 src/external/bsd/atf/tests/atf/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/Makefile.inc cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/tests/atf/atf-c/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-c/Makefile.inc cvs rdiff -u -r1.9 -r1.10 src/external/bsd/atf/tests/atf/atf-c++/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/atf/tests/atf/atf-c++/Makefile.inc cvs rdiff -u -r1.4 -r1.5 \ src/external/bsd/atf/tests/atf/atf-c++/detail/Makefile cvs rdiff -u -r1.6 -r1.7 src/external/bsd/atf/tests/atf/atf-c/detail/Makefile cvs rdiff -u -r1.6
