CVS commit: src/sys/compat/ossaudio
Module Name:src
Committed By: isaki
Date: Sat Feb 2 05:02:03 UTC 2019
Modified Files:
src/sys/compat/ossaudio: ossaudio.c
Log Message:
Correct debug messages.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/sys/compat/ossaudio/ossaudio.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/ossaudio/ossaudio.c
diff -u src/sys/compat/ossaudio/ossaudio.c:1.72 src/sys/compat/ossaudio/ossaudio.c:1.73
--- src/sys/compat/ossaudio/ossaudio.c:1.72 Sat Feb 2 04:52:16 2019
+++ src/sys/compat/ossaudio/ossaudio.c Sat Feb 2 05:02:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.72 2019/02/02 04:52:16 isaki Exp $ */
+/* $NetBSD: ossaudio.c,v 1.73 2019/02/02 05:02:03 isaki Exp $ */
/*-
* Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.72 2019/02/02 04:52:16 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.73 2019/02/02 05:02:03 isaki Exp $");
#include
#include
@@ -509,12 +509,12 @@ oss_ioctl_audio(struct lwp *l, const str
AUDIO_INITINFO();
error = copyin(SCARG(uap, data), , sizeof idat);
if (error) {
- DPRINTF(("%s: DSP_SETFRAGMENT %d\n",
+ DPRINTF(("%s: SNDCTL_DSP_SETFRAGMENT %d\n",
__func__, error));
goto out;
}
if ((idat & 0x) < 4 || (idat & 0x) > 17) {
- DPRINTF(("%s: DSP_SETFRAGMENT bad ival%d\n",
+ DPRINTF(("%s: SNDCTL_DSP_SETFRAGMENT bad ival%d\n",
__func__, idat));
error = EINVAL;
goto out;
@@ -657,7 +657,7 @@ oss_ioctl_audio(struct lwp *l, const str
idat = 1;
error = ioctlf(fp, FIONBIO, );
if (error) {
- DPRINTF(("%s: SENDCLT_DSP_NONBLOCK %d\n",
+ DPRINTF(("%s: FIONBIO %d\n",
__func__, error));
goto out;
}
CVS commit: src
Module Name:src
Committed By: isaki
Date: Sat Feb 2 04:52:16 UTC 2019
Modified Files:
src/lib/libossaudio: ossaudio.c
src/sys/compat/ossaudio: ossaudio.c
Log Message:
Fix minor bugs of SNDCTL_DSP_GETISPACE.
- hiwat is playback-only parameter.
- 'bytes' should not be rounded down.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/lib/libossaudio/ossaudio.c
cvs rdiff -u -r1.71 -r1.72 src/sys/compat/ossaudio/ossaudio.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/libossaudio/ossaudio.c
diff -u src/lib/libossaudio/ossaudio.c:1.35 src/lib/libossaudio/ossaudio.c:1.36
--- src/lib/libossaudio/ossaudio.c:1.35 Tue Jan 29 11:54:02 2019
+++ src/lib/libossaudio/ossaudio.c Sat Feb 2 04:52:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.35 2019/01/29 11:54:02 isaki Exp $ */
+/* $NetBSD: ossaudio.c,v 1.36 2019/02/02 04:52:16 isaki Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: ossaudio.c,v 1.35 2019/01/29 11:54:02 isaki Exp $");
+__RCSID("$NetBSD: ossaudio.c,v 1.36 2019/02/02 04:52:16 isaki Exp $");
/*
* This is an OSS (Linux) sound API emulator.
@@ -425,8 +425,9 @@ audio_ioctl(int fd, unsigned long com, v
setblocksize(fd, );
bufinfo.fragsize = tmpinfo.blocksize;
bufinfo.fragments = tmpinfo.record.seek / tmpinfo.blocksize;
- bufinfo.fragstotal = tmpinfo.hiwat;
- bufinfo.bytes = bufinfo.fragments * tmpinfo.blocksize;
+ bufinfo.fragstotal =
+ tmpinfo.record.buffer_size / tmpinfo.blocksize;
+ bufinfo.bytes = tmpinfo.record.seek;
*(struct audio_buf_info *)argp = bufinfo;
break;
case SNDCTL_DSP_NONBLOCK:
Index: src/sys/compat/ossaudio/ossaudio.c
diff -u src/sys/compat/ossaudio/ossaudio.c:1.71 src/sys/compat/ossaudio/ossaudio.c:1.72
--- src/sys/compat/ossaudio/ossaudio.c:1.71 Tue Jan 29 12:01:20 2019
+++ src/sys/compat/ossaudio/ossaudio.c Sat Feb 2 04:52:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ossaudio.c,v 1.71 2019/01/29 12:01:20 isaki Exp $ */
+/* $NetBSD: ossaudio.c,v 1.72 2019/02/02 04:52:16 isaki Exp $ */
/*-
* Copyright (c) 1997, 2008 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.71 2019/01/29 12:01:20 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ossaudio.c,v 1.72 2019/02/02 04:52:16 isaki Exp $");
#include
#include
@@ -642,8 +642,9 @@ oss_ioctl_audio(struct lwp *l, const str
setblocksize(fp, );
bufinfo.fragsize = tmpinfo.blocksize;
bufinfo.fragments = tmpinfo.record.seek / tmpinfo.blocksize;
- bufinfo.fragstotal = tmpinfo.hiwat;
- bufinfo.bytes = bufinfo.fragments * tmpinfo.blocksize;
+ bufinfo.fragstotal =
+ tmpinfo.record.buffer_size / tmpinfo.blocksize;
+ bufinfo.bytes = tmpinfo.record.seek;
error = copyout(, SCARG(uap, data), sizeof bufinfo);
if (error) {
DPRINTF(("%s: SNDCTL_DSP_GETISPACE %d %d %d %d = %d\n",
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Sat Feb 2 01:13:19 UTC 2019 Modified Files: src/external/gpl3/gcc/lib/libbacktrace/arch/earmv4: backtrace-supported.h src/external/gpl3/gcc/lib/libgcc/arch/earmv4: auto-target.h defs.mk src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv4: defs.mk gcov-iov.h src/external/gpl3/gcc/lib/libgomp/arch/earmv4: config.h libgomp_f.h omp.h src/external/gpl3/gcc/lib/libobjc/arch/earmv4: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4: c++config.h cxxabi_tweaks.h defs.mk gstdint.h gthr-posix.h gthr-single.h gthr.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4: auto-host.h bversion.h configargs.h defs.mk gtyp-input.list insn-modes.h plugin-version.h src/external/gpl3/gcc/usr.bin/include/arch: earmv4.mk src/external/gpl3/gcc/usr.bin/libcpp/arch/earmv4: config.h Log Message: regen for earmv4 and GCC 7. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/lib/libbacktrace/arch/earmv4/backtrace-supported.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/lib/libgcc/arch/earmv4/auto-target.h cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/lib/libgcc/arch/earmv4/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv4/defs.mk cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv4/gcov-iov.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/lib/libgomp/arch/earmv4/config.h \ src/external/gpl3/gcc/lib/libgomp/arch/earmv4/omp.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/lib/libgomp/arch/earmv4/libgomp_f.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libobjc/arch/earmv4/defs.mk cvs rdiff -u -r1.19 -r1.20 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++config.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/cxxabi_tweaks.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/gthr-posix.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/gthr-single.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/gthr.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/defs.mk cvs rdiff -u -r1.17 -r1.18 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/gstdint.h cvs rdiff -u -r1.10 -r1.11 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/auto-host.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/bversion.h cvs rdiff -u -r1.22 -r1.23 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/configargs.h cvs rdiff -u -r1.12 -r1.13 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/defs.mk \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/plugin-version.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/gtyp-input.list cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4/insn-modes.h cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/include/arch/earmv4.mk cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/usr.bin/libcpp/arch/earmv4/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/gpl3/gcc/lib/libbacktrace/arch/earmv4/backtrace-supported.h diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/earmv4/backtrace-supported.h:1.5 src/external/gpl3/gcc/lib/libbacktrace/arch/earmv4/backtrace-supported.h:1.6 --- src/external/gpl3/gcc/lib/libbacktrace/arch/earmv4/backtrace-supported.h:1.5 Mon Feb 5 22:06:44 2018 +++ src/external/gpl3/gcc/lib/libbacktrace/arch/earmv4/backtrace-supported.h Sat Feb 2 01:13:18 2019 @@ -1,9 +1,9 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.91 2018/02/03 19:06:25 mrg Exp */ -/* Generated from: NetBSD: mknative.common,v 1.15 2017/11/29 03:32:28 christos Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.97 2019/02/01 09:27:23 mrg Exp */ +/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */ /* backtrace-supported.h.in -- Whether stack backtrace is supported. - Copyright (C) 2012-2016 Free Software Foundation, Inc. + Copyright (C) 2012-2017 Free Software Foundation, Inc. Written by Ian Lance Taylor, Google. Redistribution and use in source and binary forms, with or without @@ -11,13 +11,13 @@ modification, are permitted provided tha met: (1) Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. +notice, this list of conditions and the following disclaimer. (2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the -distribution. - +
CVS commit: src/share/misc
Module Name:src
Committed By: sevan
Date: Fri Feb 1 21:23:22 UTC 2019
Modified Files:
src/share/misc: acronyms.comp
Log Message:
Add MFU
To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.228 src/share/misc/acronyms.comp:1.229
--- src/share/misc/acronyms.comp:1.228 Mon Jan 28 12:17:28 2019
+++ src/share/misc/acronyms.comp Fri Feb 1 21:23:22 2019
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.228 2019/01/28 12:17:28 sevan Exp $
+$NetBSD: acronyms.comp,v 1.229 2019/02/01 21:23:22 sevan Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -844,6 +844,7 @@ MESI modified, exclusive, shared, invali
MFC merge from current
MFC Microsoft Foundation Classes
MFM modified frequency modulation
+MFU most frequently used
MI machine-independent
MIB management information base
MIC message integrity {check,code}
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src Committed By: mrg Date: Fri Feb 1 13:12:22 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/gcc/config/arm: t-arm Log Message: fix merge botch. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/dist/gcc/config/arm/t-arm Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/arm/t-arm diff -u src/external/gpl3/gcc/dist/gcc/config/arm/t-arm:1.7 src/external/gpl3/gcc/dist/gcc/config/arm/t-arm:1.8 --- src/external/gpl3/gcc/dist/gcc/config/arm/t-arm:1.7 Sat Jan 19 12:10:05 2019 +++ src/external/gpl3/gcc/dist/gcc/config/arm/t-arm Fri Feb 1 13:12:22 2019 @@ -67,9 +67,9 @@ s-config s-conditions s-flags s-codes s- s-opinit s-extract s-peep s-attr s-attrtab s-output: $(MD_INCLUDES) $(srcdir)/config/arm/arm-tune.md: $(srcdir)/config/arm/parsecpu.awk \ + $(srcdir)/config/arm/arm-cpus.in @echo "NOT REBUILDING $@" NetBSD_DISABLED_config_arm_arm-tune.md: - $(srcdir)/config/arm/arm-cpus.in $(AWK) -f $(srcdir)/config/arm/parsecpu.awk -v cmd=md \ $(srcdir)/config/arm/arm-cpus.in > arm-tune.new mv arm-tune.new $(srcdir)/config/arm/arm-tune.md
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Fri Feb 1 12:49:21 UTC 2019 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc: c++config.h defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc: c++config.h defs.mk src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc: configargs.h src/external/gpl3/gcc/usr.bin/gcc/arch/sparc: configargs.h Log Message: regen mknative for ppc and sparc. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/defs.mk cvs rdiff -u -r1.26 -r1.27 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/c++config.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/defs.mk cvs rdiff -u -r1.35 -r1.36 \ src/external/gpl3/gcc/usr.bin/gcc/arch/powerpc/configargs.h cvs rdiff -u -r1.31 -r1.32 \ src/external/gpl3/gcc/usr.bin/gcc/arch/sparc/configargs.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h:1.26 src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h:1.27 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h:1.26 Thu Jan 24 08:56:44 2019 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/c++config.h Fri Feb 1 12:49:21 2019 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.96 2019/01/19 20:02:06 mrg Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.97 2019/02/01 09:27:23 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */ // Predefined symbols and macros -*- C++ -*- @@ -1455,7 +1455,7 @@ namespace std #define _GLIBCXX_FULLY_DYNAMIC_STRING 0 /* Define if gthreads library is available. */ -/* #undef _GLIBCXX_HAS_GTHREADS */ +#define _GLIBCXX_HAS_GTHREADS 1 /* Define to 1 if a full hosted library is built, or 0 if freestanding. */ #define _GLIBCXX_HOSTED 1 @@ -1583,7 +1583,7 @@ namespace std /* #undef _GLIBCXX_USE_PTHREADS_NUM_PROCESSORS_NP */ /* Define if POSIX read/write locks are available in . */ -/* #undef _GLIBCXX_USE_PTHREAD_RWLOCK_T */ +#define _GLIBCXX_USE_PTHREAD_RWLOCK_T 1 /* Define if /dev/random and /dev/urandom are available for the random_device of TR1 (Chapter 5.1). */ Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/defs.mk diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/defs.mk:1.9 src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/defs.mk:1.10 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/defs.mk:1.9 Thu Jan 24 08:56:44 2019 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc/defs.mk Fri Feb 1 12:49:21 2019 @@ -1,5 +1,5 @@ # This file is automatically generated. DO NOT EDIT! -# Generated from: NetBSD: mknative-gcc,v 1.96 2019/01/19 20:02:06 mrg Exp +# Generated from: NetBSD: mknative-gcc,v 1.97 2019/02/01 09:27:23 mrg Exp # Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp # G_port_specific_symbol_files= @@ -11,6 +11,7 @@ G_SRC_SOURCES=compatibility.cc compatibi G_CPP11_SOURCES=chrono.cc c11-codecvt.cc condition_variable.cc cow-stdexcept.cc ctype.cc debug.cc functexcept.cc functional.cc futex.cc future.cc hash_c++0x.cc hashtable_c++0x.cc ios.cc limits.cc mutex.cc placeholders.cc random.cc regex.cc shared_ptr.cc snprintf_lite.cc system_error.cc thread.cc ctype_configure_char.cc ctype_members.cc ext11-inst.cc fstream-inst.cc ios-inst.cc iostream-inst.cc istream-inst.cc locale-inst.cc ostream-inst.cc sstream-inst.cc streambuf-inst.cc string-inst.cc string-io-inst.cc wlocale-inst.cc wstring-inst.cc wstring-io-inst.cc G_GLIBCXX_ABI_FLAGS= G_CPP98_SOURCES=bitmap_allocator.cc pool_allocator.cc mt_allocator.cc c98-codecvt.cc complex_io.cc globals_io.cc hash_tr1.cc hashtable_tr1.cc ios_failure.cc ios_init.cc ios_locale.cc list.cc list-aux.cc list-aux-2.cc list_associated.cc list_associated-2.cc locale.cc locale_init.cc locale_facets.cc localename.cc math_stubs_float.cc math_stubs_long_double.cc stdexcept.cc strstream.cc tree.cc istream.cc istream-string.cc streambuf.cc valarray.cc atomicity.cc codecvt_members.cc collate_members.cc messages_members.cc monetary_members.cc numeric_members.cc time_members.cc basic_file.cc c++locale.cc allocator-inst.cc concept-inst.cc ext-inst.cc misc-inst.cc parallel_settings.cc +G_FILESYSTEM_SOURCES=dir.cc ops.cc path.cc G_ATOMICITY_SRCDIR=config/cpu/generic/atomicity_builtins G_BASIC_FILE_CC=config/io/basic_file_stdio.cc G_CLOCALE_CC=config/locale/generic/c_locale.cc Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc/c++config.h diff -u
CVS commit: src/sys/arch/x86
Module Name:src
Committed By: maxv
Date: Fri Feb 1 11:35:13 UTC 2019
Modified Files:
src/sys/arch/x86/include: pmap.h
src/sys/arch/x86/x86: pmap.c
Log Message:
Add the remaining pmap callbacks, will be used by NVMM-VMX.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/x86/include/pmap.h
cvs rdiff -u -r1.318 -r1.319 src/sys/arch/x86/x86/pmap.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/x86/include/pmap.h
diff -u src/sys/arch/x86/include/pmap.h:1.94 src/sys/arch/x86/include/pmap.h:1.95
--- src/sys/arch/x86/include/pmap.h:1.94 Fri Feb 1 05:44:29 2019
+++ src/sys/arch/x86/include/pmap.h Fri Feb 1 11:35:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.94 2019/02/01 05:44:29 maxv Exp $ */
+/* $NetBSD: pmap.h,v 1.95 2019/02/01 11:35:13 maxv Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -263,7 +263,15 @@ struct pmap {
/* Used by NVMM. */
int (*pm_enter)(struct pmap *, vaddr_t, paddr_t, vm_prot_t, u_int);
+ bool (*pm_extract)(struct pmap *, vaddr_t, paddr_t *);
void (*pm_remove)(struct pmap *, vaddr_t, vaddr_t);
+ int (*pm_sync_pv)(struct vm_page *, vaddr_t, paddr_t, int, uint8_t *,
+ pt_entry_t *);
+ void (*pm_pp_remove_ent)(struct pmap *, struct vm_page *, pt_entry_t,
+ vaddr_t);
+ void (*pm_write_protect)(struct pmap *, vaddr_t, vaddr_t, vm_prot_t);
+ void (*pm_unwire)(struct pmap *, vaddr_t);
+
void (*pm_tlb_flush)(struct pmap *);
void *pm_data;
};
Index: src/sys/arch/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.318 src/sys/arch/x86/x86/pmap.c:1.319
--- src/sys/arch/x86/x86/pmap.c:1.318 Fri Feb 1 05:44:29 2019
+++ src/sys/arch/x86/x86/pmap.c Fri Feb 1 11:35:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.318 2019/02/01 05:44:29 maxv Exp $ */
+/* $NetBSD: pmap.c,v 1.319 2019/02/01 11:35:13 maxv Exp $ */
/*
* Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -130,7 +130,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.318 2019/02/01 05:44:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.319 2019/02/01 11:35:13 maxv Exp $");
#include "opt_user_ldt.h"
#include "opt_lockdebug.h"
@@ -2387,8 +2387,14 @@ pmap_create(void)
pmap->pm_flags = 0;
pmap->pm_gc_ptp = NULL;
+ /* Used by NVMM. */
pmap->pm_enter = NULL;
+ pmap->pm_extract = NULL;
pmap->pm_remove = NULL;
+ pmap->pm_sync_pv = NULL;
+ pmap->pm_pp_remove_ent = NULL;
+ pmap->pm_write_protect = NULL;
+ pmap->pm_unwire = NULL;
pmap->pm_tlb_flush = NULL;
pmap->pm_data = NULL;
@@ -2542,7 +2548,11 @@ pmap_destroy(struct pmap *pmap)
pmap_free_ptps(pmap->pm_gc_ptp);
- pool_cache_put(_pdp_cache, pmap->pm_pdir);
+ if (__predict_false(pmap->pm_enter != NULL)) {
+ pool_cache_destruct_object(_pdp_cache, pmap->pm_pdir);
+ } else {
+ pool_cache_put(_pdp_cache, pmap->pm_pdir);
+ }
#ifdef USER_LDT
if (pmap->pm_ldt != NULL) {
@@ -3051,6 +3061,10 @@ pmap_extract(struct pmap *pmap, vaddr_t
lwp_t *l;
bool hard, rv;
+ if (__predict_false(pmap->pm_extract != NULL)) {
+ return (*pmap->pm_extract)(pmap, va, pap);
+ }
+
#ifdef __HAVE_DIRECT_MAP
if (va >= PMAP_DIRECT_BASE && va < PMAP_DIRECT_END) {
if (pap != NULL) {
@@ -3625,6 +3639,11 @@ pmap_sync_pv(struct pv_pte *pvpte, paddr
KASSERT(ptp == NULL || ptp_va2o(va, 1) == ptp->offset);
pmap = ptp_to_pmap(ptp);
+ if (__predict_false(pmap->pm_sync_pv != NULL)) {
+ return (*pmap->pm_sync_pv)(ptp, va, pa, clearbits, oattrs,
+ optep);
+ }
+
if (clearbits != ~0) {
KASSERT((clearbits & ~(PP_ATTRS_M|PP_ATTRS_U|PP_ATTRS_W)) == 0);
clearbits = pmap_pp_attrs_to_pte(clearbits);
@@ -3762,7 +3781,11 @@ startover:
if (ptp != NULL) {
KASSERT(pmap != pmap_kernel());
pmap_tlb_shootnow();
- pmap_pp_remove_ent(pmap, ptp, opte, va);
+ if (__predict_false(pmap->pm_pp_remove_ent != NULL)) {
+(*pmap->pm_pp_remove_ent)(pmap, ptp, opte, va);
+ } else {
+pmap_pp_remove_ent(pmap, ptp, opte, va);
+ }
pmap_destroy(pmap);
} else {
KASSERT(pmap == pmap_kernel());
@@ -3980,6 +4003,11 @@ pmap_write_protect(struct pmap *pmap, va
KASSERT(curlwp->l_md.md_gc_pmap != pmap);
+ if (__predict_false(pmap->pm_write_protect != NULL)) {
+ (*pmap->pm_write_protect)(pmap, sva, eva, prot);
+ return;
+ }
+
bit_rem = 0;
if (!(prot & VM_PROT_WRITE))
bit_rem = PG_RW;
@@ -4048,6 +4076,11 @@ pmap_unwire(struct pmap *pmap, vaddr_t v
pd_entry_t * const *pdes;
struct pmap *pmap2;
+ if (__predict_false(pmap->pm_unwire != NULL)) {
+ (*pmap->pm_unwire)(pmap, va);
+ return;
+ }
+
/* Acquire pmap. */
kpreempt_disable();
pmap_map_ptes(pmap, , , );
@@ -4545,6 +4578,13 @@ pmap_growkernel(vaddr_t maxkvaddr)
mutex_enter(_lock);
LIST_FOREACH(pm, , pm_list) {
+ if (__predict_false(pm->pm_enter != NULL)) {
+/*
+ * Not a native pmap, the kernel is not mapped,
+ * so nothing to
CVS commit: [netbsd-8] src/sys/kern
Module Name:src
Committed By: martin
Date: Fri Feb 1 11:21:30 UTC 2019
Modified Files:
src/sys/kern [netbsd-8]: kern_time.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1180):
sys/kern/kern_time.c: revision 1.190
sys/kern/kern_time.c: revision 1.194
Fix stack info leak. There are 4 bytes of padding in struct timeval. Looks
like there are other leaks related to timeval in this file.
[ 133.414352] kleak: Possible leak in copyout: [len=16, leaked=4]
[ 133.414352] #0 0x80224d0a in kleak_note
[ 133.424360] #1 0x80224d8a in kleak_copyout
[ 133.434361] #2 0x80b5fd79 in sys___gettimeofday50
[ 133.434361] #3 0x8025a89c in sy_call
[ 133.444351] #4 0x8025aace in sy_invoke
[ 133.454365] #5 0x8025ab54 in syscall
-
Fix kernel info leaks.
To generate a diff of this commit:
cvs rdiff -u -r1.189.8.3 -r1.189.8.4 src/sys/kern/kern_time.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/kern_time.c
diff -u src/sys/kern/kern_time.c:1.189.8.3 src/sys/kern/kern_time.c:1.189.8.4
--- src/sys/kern/kern_time.c:1.189.8.3 Thu Dec 27 12:19:45 2018
+++ src/sys/kern/kern_time.c Fri Feb 1 11:21:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.189.8.3 2018/12/27 12:19:45 martin Exp $ */
+/* $NetBSD: kern_time.c,v 1.189.8.4 2019/02/01 11:21:30 martin Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.189.8.3 2018/12/27 12:19:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.189.8.4 2019/02/01 11:21:30 martin Exp $");
#include
#include
@@ -424,6 +424,7 @@ sys___gettimeofday50(struct lwp *l, cons
struct timezone tzfake;
if (SCARG(uap, tp)) {
+ memset(, 0, sizeof(atv));
microtime();
error = copyout(, SCARG(uap, tp), sizeof(atv));
if (error)
@@ -523,6 +524,7 @@ adjtime1(const struct timeval *delta, st
extern int64_t time_adjtime; /* in kern_ntptime.c */
if (olddelta) {
+ memset(olddelta, 0, sizeof(*olddelta));
mutex_spin_enter(_lock);
olddelta->tv_sec = time_adjtime / 100;
olddelta->tv_usec = time_adjtime % 100;
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Feb 1 11:26:14 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.1 Log Message: Tickets #1180 and #1181 To generate a diff of this commit: cvs rdiff -u -r1.1.2.100 -r1.1.2.101 src/doc/CHANGES-8.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.1 diff -u src/doc/CHANGES-8.1:1.1.2.100 src/doc/CHANGES-8.1:1.1.2.101 --- src/doc/CHANGES-8.1:1.1.2.100 Thu Jan 31 06:46:52 2019 +++ src/doc/CHANGES-8.1 Fri Feb 1 11:26:13 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.1,v 1.1.2.100 2019/01/31 06:46:52 martin Exp $ +# $NetBSD: CHANGES-8.1,v 1.1.2.101 2019/02/01 11:26:13 martin Exp $ A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1 release: @@ -2405,4 +2405,15 @@ sys/dev/mii/inbmphyreg.h 1.13-1.15 - Rename functions. Add comment. [msaitoh, ticket #1179] +sys/kern/kern_time.c1.190,1.194 + + Fix kernel info leaks. + [maxv, ticket #1180] + +sys/dev/pci/ppb.c1.66,1.67 + + If the secondary bus is configured and the bus mastering is + not enabled, enable it in case BIOS, UEFI or firmware don't + do it. + [msaitoh, ticket #1181]
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Fri Feb 1 11:25:13 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-8]: ppb.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1181):
sys/dev/pci/ppb.c: revision 1.66
sys/dev/pci/ppb.c: revision 1.67
Explicitly enable bus masterling in case BIOS, UEFI or firmware don't enable
it. Might fix PR kern/53811.
-
If the secondary bus is configured and the bus mastering is not enabled,
enable it. Suggested by thorpej@.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.2.1 src/sys/dev/pci/ppb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ppb.c
diff -u src/sys/dev/pci/ppb.c:1.63 src/sys/dev/pci/ppb.c:1.63.2.1
--- src/sys/dev/pci/ppb.c:1.63 Wed May 10 03:24:31 2017
+++ src/sys/dev/pci/ppb.c Fri Feb 1 11:25:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ppb.c,v 1.63 2017/05/10 03:24:31 msaitoh Exp $ */
+/* $NetBSD: ppb.c,v 1.63.2.1 2019/02/01 11:25:13 martin Exp $ */
/*
* Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.63 2017/05/10 03:24:31 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.63.2.1 2019/02/01 11:25:13 martin Exp $");
#include
#include
@@ -214,6 +214,7 @@ ppbattach(device_t parent, device_t self
char intrbuf[PCI_INTRSTR_LEN];
#endif
pcireg_t busdata, reg;
+ bool second_configured = false;
pci_aprint_devinfo(pa, NULL);
@@ -350,6 +351,73 @@ ppbattach(device_t parent, device_t self
}
#endif /* PPB_USEINTR */
+ /* Configuration test */
+ if (PPB_BUSINFO_SECONDARY(busdata) != 0) {
+ uint32_t base, limit;
+
+ /* I/O region test */
+ reg = pci_conf_read(pc, pa->pa_tag, PCI_BRIDGE_STATIO_REG);
+ base = (reg & PCI_BRIDGE_STATIO_IOBASE_MASK) << 8;
+ limit = ((reg >> PCI_BRIDGE_STATIO_IOLIMIT_SHIFT)
+ & PCI_BRIDGE_STATIO_IOLIMIT_MASK) << 8;
+ limit |= 0x0fff;
+ if (PCI_BRIDGE_IO_32BITS(reg)) {
+ reg = pci_conf_read(pc, pa->pa_tag,
+ PCI_BRIDGE_IOHIGH_REG);
+ base |= ((reg >> PCI_BRIDGE_IOHIGH_BASE_SHIFT)
+ & 0x) << 16;
+ limit |= ((reg >> PCI_BRIDGE_IOHIGH_LIMIT_SHIFT)
+ & 0x) << 16;
+ }
+ if (base < limit) {
+ second_configured = true;
+ goto configure;
+ }
+
+ /* Non-prefetchable memory region test */
+ reg = pci_conf_read(pc, pa->pa_tag, PCI_BRIDGE_MEMORY_REG);
+ base = ((reg >> PCI_BRIDGE_MEMORY_BASE_SHIFT)
+ & PCI_BRIDGE_MEMORY_BASE_MASK) << 20;
+ limit = (((reg >> PCI_BRIDGE_MEMORY_LIMIT_SHIFT)
+ & PCI_BRIDGE_MEMORY_LIMIT_MASK) << 20) | 0x000f;
+ if (base < limit) {
+ second_configured = true;
+ goto configure;
+ }
+
+ /* Prefetchable memory region test */
+ reg = pci_conf_read(pc, pa->pa_tag,
+ PCI_BRIDGE_PREFETCHMEM_REG);
+ base = ((reg >> PCI_BRIDGE_PREFETCHMEM_BASE_SHIFT)
+ & PCI_BRIDGE_PREFETCHMEM_BASE_MASK) << 20;
+ limit = (((reg >> PCI_BRIDGE_PREFETCHMEM_LIMIT_SHIFT)
+ & PCI_BRIDGE_PREFETCHMEM_LIMIT_MASK) << 20) | 0x000f;
+ if (PCI_BRIDGE_PREFETCHMEM_64BITS(reg)) {
+ reg = pci_conf_read(pc, pa->pa_tag,
+ PCI_BRIDGE_IOHIGH_REG);
+ base |= (uint64_t)pci_conf_read(pc, pa->pa_tag,
+ PCI_BRIDGE_PREFETCHBASE32_REG) << 32;
+ limit |= (uint64_t)pci_conf_read(pc, pa->pa_tag,
+ PCI_BRIDGE_PREFETCHLIMIT32_REG) << 32;
+ }
+ if (base < limit) {
+ second_configured = true;
+ goto configure;
+ }
+ }
+
+configure:
+ /*
+ * If the secondary bus is configured and the bus mastering is not
+ * enabled, enable it.
+ */
+ if (second_configured) {
+ reg = pci_conf_read(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
+ if ((reg & PCI_COMMAND_MASTER_ENABLE) == 0)
+ pci_conf_write(pc, pa->pa_tag, PCI_COMMAND_STATUS_REG,
+ reg | PCI_COMMAND_MASTER_ENABLE);
+ }
+
if (!pmf_device_register(self, ppb_suspend, ppb_resume))
aprint_error_dev(self, "couldn't establish power handler\n");
CVS commit: [netbsd-7-0] src/doc
Module Name:src Committed By: martin Date: Fri Feb 1 11:12:55 UTC 2019 Modified Files: src/doc [netbsd-7-0]: CHANGES-7.0.3 Log Message: Ticket #1678 To generate a diff of this commit: cvs rdiff -u -r1.1.2.133 -r1.1.2.134 src/doc/CHANGES-7.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0.3 diff -u src/doc/CHANGES-7.0.3:1.1.2.133 src/doc/CHANGES-7.0.3:1.1.2.134 --- src/doc/CHANGES-7.0.3:1.1.2.133 Wed Jan 30 13:33:34 2019 +++ src/doc/CHANGES-7.0.3 Fri Feb 1 11:12:55 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0.3,v 1.1.2.133 2019/01/30 13:33:34 martin Exp $ +# $NetBSD: CHANGES-7.0.3,v 1.1.2.134 2019/02/01 11:12:55 martin Exp $ A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3 release: @@ -5727,3 +5727,8 @@ sys/arch/vax/vax/sig_machdep.c 1.23 Fix widespread leak in the sendsig_siginfo() functions. [maxv, ticket #1677] +sys/kern/kern_time.c1.190,1.194 + + Fix kernel info leaks. + [maxv, ticket #1678] +
CVS commit: [netbsd-7-0] src/sys/kern
Module Name:src
Committed By: martin
Date: Fri Feb 1 11:12:03 UTC 2019
Modified Files:
src/sys/kern [netbsd-7-0]: kern_time.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1678):
sys/kern/kern_time.c: revision 1.190
sys/kern/kern_time.c: revision 1.194
Fix stack info leak. There are 4 bytes of padding in struct timeval. Looks
like there are other leaks related to timeval in this file.
[ 133.414352] kleak: Possible leak in copyout: [len=16, leaked=4]
[ 133.414352] #0 0x80224d0a in kleak_note
[ 133.424360] #1 0x80224d8a in kleak_copyout
[ 133.434361] #2 0x80b5fd79 in sys___gettimeofday50
[ 133.434361] #3 0x8025a89c in sy_call
[ 133.444351] #4 0x8025aace in sy_invoke
[ 133.454365] #5 0x8025ab54 in syscall
-
Fix kernel info leaks.
To generate a diff of this commit:
cvs rdiff -u -r1.179.12.4 -r1.179.12.5 src/sys/kern/kern_time.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/kern_time.c
diff -u src/sys/kern/kern_time.c:1.179.12.4 src/sys/kern/kern_time.c:1.179.12.5
--- src/sys/kern/kern_time.c:1.179.12.4 Thu Dec 27 12:01:50 2018
+++ src/sys/kern/kern_time.c Fri Feb 1 11:12:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.179.12.4 2018/12/27 12:01:50 martin Exp $ */
+/* $NetBSD: kern_time.c,v 1.179.12.5 2019/02/01 11:12:03 martin Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.179.12.4 2018/12/27 12:01:50 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.179.12.5 2019/02/01 11:12:03 martin Exp $");
#include
#include
@@ -388,6 +388,7 @@ sys___gettimeofday50(struct lwp *l, cons
struct timezone tzfake;
if (SCARG(uap, tp)) {
+ memset(, 0, sizeof(atv));
microtime();
error = copyout(, SCARG(uap, tp), sizeof(atv));
if (error)
@@ -487,6 +488,7 @@ adjtime1(const struct timeval *delta, st
extern int64_t time_adjtime; /* in kern_ntptime.c */
if (olddelta) {
+ memset(olddelta, 0, sizeof(*olddelta));
mutex_spin_enter(_lock);
olddelta->tv_sec = time_adjtime / 100;
olddelta->tv_usec = time_adjtime % 100;
CVS commit: [netbsd-7-1] src/sys/kern
Module Name:src
Committed By: martin
Date: Fri Feb 1 11:08:56 UTC 2019
Modified Files:
src/sys/kern [netbsd-7-1]: kern_time.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1678):
sys/kern/kern_time.c: revision 1.190
sys/kern/kern_time.c: revision 1.194
Fix stack info leak. There are 4 bytes of padding in struct timeval. Looks
like there are other leaks related to timeval in this file.
[ 133.414352] kleak: Possible leak in copyout: [len=16, leaked=4]
[ 133.414352] #0 0x80224d0a in kleak_note
[ 133.424360] #1 0x80224d8a in kleak_copyout
[ 133.434361] #2 0x80b5fd79 in sys___gettimeofday50
[ 133.434361] #3 0x8025a89c in sy_call
[ 133.444351] #4 0x8025aace in sy_invoke
[ 133.454365] #5 0x8025ab54 in syscall
-
Fix kernel info leaks.
To generate a diff of this commit:
cvs rdiff -u -r1.179.8.1.4.3 -r1.179.8.1.4.4 src/sys/kern/kern_time.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/kern_time.c
diff -u src/sys/kern/kern_time.c:1.179.8.1.4.3 src/sys/kern/kern_time.c:1.179.8.1.4.4
--- src/sys/kern/kern_time.c:1.179.8.1.4.3 Thu Dec 27 12:01:06 2018
+++ src/sys/kern/kern_time.c Fri Feb 1 11:08:56 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.179.8.1.4.3 2018/12/27 12:01:06 martin Exp $ */
+/* $NetBSD: kern_time.c,v 1.179.8.1.4.4 2019/02/01 11:08:56 martin Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.179.8.1.4.3 2018/12/27 12:01:06 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.179.8.1.4.4 2019/02/01 11:08:56 martin Exp $");
#include
#include
@@ -388,6 +388,7 @@ sys___gettimeofday50(struct lwp *l, cons
struct timezone tzfake;
if (SCARG(uap, tp)) {
+ memset(, 0, sizeof(atv));
microtime();
error = copyout(, SCARG(uap, tp), sizeof(atv));
if (error)
@@ -487,6 +488,7 @@ adjtime1(const struct timeval *delta, st
extern int64_t time_adjtime; /* in kern_ntptime.c */
if (olddelta) {
+ memset(olddelta, 0, sizeof(*olddelta));
mutex_spin_enter(_lock);
olddelta->tv_sec = time_adjtime / 100;
olddelta->tv_usec = time_adjtime % 100;
CVS commit: [netbsd-7-1] src/doc
Module Name:src Committed By: martin Date: Fri Feb 1 11:10:21 UTC 2019 Modified Files: src/doc [netbsd-7-1]: CHANGES-7.1.3 Log Message: Ticket #1678 To generate a diff of this commit: cvs rdiff -u -r1.1.2.40 -r1.1.2.41 src/doc/CHANGES-7.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.1.3 diff -u src/doc/CHANGES-7.1.3:1.1.2.40 src/doc/CHANGES-7.1.3:1.1.2.41 --- src/doc/CHANGES-7.1.3:1.1.2.40 Wed Jan 30 13:30:16 2019 +++ src/doc/CHANGES-7.1.3 Fri Feb 1 11:10:21 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.1.3,v 1.1.2.40 2019/01/30 13:30:16 martin Exp $ +# $NetBSD: CHANGES-7.1.3,v 1.1.2.41 2019/02/01 11:10:21 martin Exp $ A complete list of changes from the NetBSD 7.1.2 release to the NetBSD 7.1.3 release: @@ -419,3 +419,8 @@ sys/arch/vax/vax/sig_machdep.c 1.23 Fix widespread leak in the sendsig_siginfo() functions. [maxv, ticket #1677] +sys/kern/kern_time.c1.190,1.194 + + Fix kernel info leaks. + [maxv, ticket #1678] +
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Fri Feb 1 11:07:54 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1678 To generate a diff of this commit: cvs rdiff -u -r1.1.2.38 -r1.1.2.39 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.38 src/doc/CHANGES-7.3:1.1.2.39 --- src/doc/CHANGES-7.3:1.1.2.38 Wed Jan 30 13:28:09 2019 +++ src/doc/CHANGES-7.3 Fri Feb 1 11:07:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.38 2019/01/30 13:28:09 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.39 2019/02/01 11:07:54 martin Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -438,3 +438,8 @@ sys/arch/vax/vax/sig_machdep.c 1.23 Fix widespread leak in the sendsig_siginfo() functions. [maxv, ticket #1677] +sys/kern/kern_time.c1.190,1.194 + + Fix kernel info leaks. + [maxv, ticket #1678] +
CVS commit: [netbsd-7] src/sys/kern
Module Name:src
Committed By: martin
Date: Fri Feb 1 11:06:20 UTC 2019
Modified Files:
src/sys/kern [netbsd-7]: kern_time.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #1678):
sys/kern/kern_time.c: revision 1.190
sys/kern/kern_time.c: revision 1.194
Fix stack info leak. There are 4 bytes of padding in struct timeval. Looks
like there are other leaks related to timeval in this file.
[ 133.414352] kleak: Possible leak in copyout: [len=16, leaked=4]
[ 133.414352] #0 0x80224d0a in kleak_note
[ 133.424360] #1 0x80224d8a in kleak_copyout
[ 133.434361] #2 0x80b5fd79 in sys___gettimeofday50
[ 133.434361] #3 0x8025a89c in sy_call
[ 133.444351] #4 0x8025aace in sy_invoke
[ 133.454365] #5 0x8025ab54 in syscall
-
Fix kernel info leaks.
To generate a diff of this commit:
cvs rdiff -u -r1.179.8.4 -r1.179.8.5 src/sys/kern/kern_time.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/kern_time.c
diff -u src/sys/kern/kern_time.c:1.179.8.4 src/sys/kern/kern_time.c:1.179.8.5
--- src/sys/kern/kern_time.c:1.179.8.4 Thu Dec 27 12:00:10 2018
+++ src/sys/kern/kern_time.c Fri Feb 1 11:06:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.179.8.4 2018/12/27 12:00:10 martin Exp $ */
+/* $NetBSD: kern_time.c,v 1.179.8.5 2019/02/01 11:06:20 martin Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.179.8.4 2018/12/27 12:00:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.179.8.5 2019/02/01 11:06:20 martin Exp $");
#include
#include
@@ -388,6 +388,7 @@ sys___gettimeofday50(struct lwp *l, cons
struct timezone tzfake;
if (SCARG(uap, tp)) {
+ memset(, 0, sizeof(atv));
microtime();
error = copyout(, SCARG(uap, tp), sizeof(atv));
if (error)
@@ -487,6 +488,7 @@ adjtime1(const struct timeval *delta, st
extern int64_t time_adjtime; /* in kern_ntptime.c */
if (olddelta) {
+ memset(olddelta, 0, sizeof(*olddelta));
mutex_spin_enter(_lock);
olddelta->tv_sec = time_adjtime / 100;
olddelta->tv_usec = time_adjtime % 100;
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: mrg
Date: Fri Feb 1 10:39:48 UTC 2019
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.inc
src/external/gpl3/gcc/usr.bin/common: Makefile
src/external/gpl3/gcc/usr.bin/common-target: Makefile
Log Message:
- update source lists
- XXX: pull out OBJS-libcommon-target and OBJS-libcommon-target
in mknative
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/external/gpl3/gcc/usr.bin/Makefile.inc
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/usr.bin/common/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/common-target/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/Makefile.inc
diff -u src/external/gpl3/gcc/usr.bin/Makefile.inc:1.31 src/external/gpl3/gcc/usr.bin/Makefile.inc:1.32
--- src/external/gpl3/gcc/usr.bin/Makefile.inc:1.31 Sun Feb 11 02:12:28 2018
+++ src/external/gpl3/gcc/usr.bin/Makefile.inc Fri Feb 1 10:39:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.31 2018/02/11 02:12:28 christos Exp $
+# $NetBSD: Makefile.inc,v 1.32 2019/02/01 10:39:48 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -90,8 +90,12 @@ VER_CPPFLAGS= -DBASEVER="\"${BASEVER}"\"
-DPKGVERSION=$(G_PKGVERSION_s) \
-DBUGURL=$(G_BUGURL_s)
-CPPFLAGS.version.c+= ${VER_CPPFLAGS}
-version.c: ${GCCARCH}/defs.mk ${TOP}/tools/gcc/gcc-version.mk
+VERFILES= cppbuiltin.c c-cppbuiltin.c gcc.c version.c
+
+.for _f in ${VERFILES}
+CPPFLAGS.${_f} += ${VER_CPPFLAGS}
+${_f}: ${GCCARCH}/defs.mk ${TOP}/tools/gcc/gcc-version.mk
+.endfor
.include "${GCCARCH}/defs.mk"
Index: src/external/gpl3/gcc/usr.bin/common/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common/Makefile:1.6 src/external/gpl3/gcc/usr.bin/common/Makefile:1.7
--- src/external/gpl3/gcc/usr.bin/common/Makefile:1.6 Sun Feb 4 10:16:07 2018
+++ src/external/gpl3/gcc/usr.bin/common/Makefile Fri Feb 1 10:39:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2018/02/04 10:16:07 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2019/02/01 10:39:48 mrg Exp $
LIBISPRIVATE= yes
@@ -7,17 +7,20 @@ LIBISPRIVATE= yes
LIB= common
+# XXX pullout OBJS-libcommon-target
SRCS= diagnostic.c \
diagnostic-color.c \
diagnostic-show-locus.o \
+ edit-context.o \
pretty-print.c \
- vec.c \
intl.c \
+ vec.c \
input.c \
version.c \
hash-table.c \
ggc-none.c \
- memory-block.cc
+ memory-block.cc \
+ selftest.cc
# XXX make sure this doesn't have more than it needs
CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ} -I. \
Index: src/external/gpl3/gcc/usr.bin/common-target/Makefile
diff -u src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.5 src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.6
--- src/external/gpl3/gcc/usr.bin/common-target/Makefile:1.5 Thu Oct 6 02:58:32 2016
+++ src/external/gpl3/gcc/usr.bin/common-target/Makefile Fri Feb 1 10:39:48 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2016/10/06 02:58:32 christos Exp $
+# $NetBSD: Makefile,v 1.6 2019/02/01 10:39:48 mrg Exp $
LIBISPRIVATE= yes
@@ -7,8 +7,10 @@ LIBISPRIVATE= yes
LIB= common-target
+# XXX pullout OBJS-libcommon-target
SRCS= prefix.c params.c opts.c opts-common.c options.c vec.c \
hooks.c common-targhooks.c hash-table.c file-find.c \
+ spellcheck.c selftest.c \
${G_common_out_file:T}
CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ} -I. \
CVS commit: src/external/gpl3/gcc/lib/libubsan
Module Name:src
Committed By: mrg
Date: Fri Feb 1 10:39:03 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libubsan: Makefile
Log Message:
use -Wno-error=maybe-uninitialized for one of the new ubsan files.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libubsan/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libubsan/Makefile
diff -u src/external/gpl3/gcc/lib/libubsan/Makefile:1.8 src/external/gpl3/gcc/lib/libubsan/Makefile:1.9
--- src/external/gpl3/gcc/lib/libubsan/Makefile:1.8 Sun Jul 1 17:41:50 2018
+++ src/external/gpl3/gcc/lib/libubsan/Makefile Fri Feb 1 10:39:03 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2018/07/01 17:41:50 christos Exp $
+# $NetBSD: Makefile,v 1.9 2019/02/01 10:39:03 mrg Exp $
UNSUPPORTED_COMPILER.clang= # defined
LIBISCXX = yes
@@ -27,6 +27,8 @@ UBSAN_SRCS= \
COPTS.${_s}.cc+=-frtti
.endfor
+COPTS.ubsan_handlers_cxx.cc+= -Wno-error=maybe-uninitialized
+
LIB= ubsan
SRCS+= ${UBSAN_SRCS}
LIBDPLIBS+= rt ${NETBSDSRCDIR}/lib/librt
CVS commit: src/external/gpl3/gcc/lib
Module Name:src
Committed By: mrg
Date: Fri Feb 1 10:37:13 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile.common
Log Message:
- new shlib minor
- move -std=* handling, besides the list in CXX11_ALWAYS, to
libsupc++/Makefile.common
- include the arch defs.mk to obtain ${G_*_SOURCES} and use them
for -std= setting
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gcc/lib/libsupc++/Makefile.common
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.38 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.39
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.38 Thu Jan 31 08:42:03 2019
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Fri Feb 1 10:37:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2019/01/31 08:42:03 mrg Exp $
+# $NetBSD: Makefile,v 1.39 2019/02/01 10:37:13 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -47,7 +47,7 @@ CWARNFLAGS.clang+= -Wno-logical-op-paren
.include "${.CURDIR}/arch/${LIBSTDCXX_MACHINE_ARCH}/defs.mk"
SHLIB_MAJOR= 8
-SHLIB_MINOR= 1
+SHLIB_MINOR= 2
SUBDIR= include
@@ -153,33 +153,10 @@ CXX11_ALWAYS= localename.cc \
compatibility-condvar.cc \
ios_failure.cc
-.for _s in ${G_CPP11_SOURCES:M*.cc} ${CXX11_ALWAYS}
+.for _s in ${CXX11_ALWAYS}
COPTS.${_s}+= -std=gnu++11
.endfor
-.for _s in ${G_FILESYSTEM_SOURCES:M*.cc}
-COPTS.${_s}+= -std=gnu++14
-.endfor
-
-CXX98_ALWAYS= collate_members_cow.cc \
- messages_members_cow.cc \
- monetary_members_cow.cc \
- numeric_members_cow.cc \
- atomicity.cc \
- collate_members.cc \
- messages_members.cc \
- monetary_members.cc \
- numeric_members.cc \
- time_members.cc \
- basic_file.cc \
- c++locale.cc
-
-.for _s in ${CXX98_ALWAYS}
-. if empty(COPTS.${_s}:M-std=*)
-#COPTS.${_s}+= -std=gnu++98
-. endif
-.endfor
-
COPTS.cp-demangle.c += -Wno-unused-function
COPTS.ext-inst.cc+= -Wno-error
Index: src/external/gpl3/gcc/lib/libsupc++/Makefile.common
diff -u src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.11 src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.12
--- src/external/gpl3/gcc/lib/libsupc++/Makefile.common:1.11 Thu Jan 31 06:50:51 2019
+++ src/external/gpl3/gcc/lib/libsupc++/Makefile.common Fri Feb 1 10:37:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2019/01/31 06:50:51 mrg Exp $
+# $NetBSD: Makefile.common,v 1.12 2019/02/01 10:37:13 mrg Exp $
DIST= ${GCCDIST}
GNUHOSTDIST= ${DIST}
@@ -12,7 +12,12 @@ LIBSTDCXX_MACHINE_ARCH=${MLIBDIR}
LIBSTDCXX_MACHINE_ARCH=${GCC_MACHINE_ARCH}
.endif
+# Make sure we get G_*_SOURCES, etc.*, for the .for loops
+.include "${.CURDIR}/../libstdc++-v3/arch/${LIBSTDCXX_MACHINE_ARCH}/defs.mk"
+
LIBSTDCXXSRCS= ${G_SRC_SOURCES} ${G_CPP98_SOURCES} ${G_CPP11_SOURCES} ${G_FILESYSTEM_SOURCES}
+# XXX XXX dir.o doesn't have stuff properly, leave it out for now?
+LIBSTDCXXSRCS= ${G_SRC_SOURCES} ${G_CPP98_SOURCES} ${G_CPP11_SOURCES}
LIBSUPCXXSRCS= ${G_LIBSUPCXX_SOURCES} ${G_LIBSUPCXX_C_SOURCES}
CPPFLAGS+= -I${DIST}/gcc
@@ -24,44 +29,48 @@ CPPFLAGS+= -DHAVE_STDLIB_H -DHAVE_STRING
CPPFLAGS.cp-demangle.c=-DIN_GLIBCPP_V3
+.for _f in ${G_CPP98_SOURCES}
+COPTS.${_f}+= -std=gnu++98
+.endfor
+
STD_GNU11= \
- bad_array_length \
- bad_array_new \
- eh_aux_runtime \
- eh_ptr \
- eh_terminate \
- eh_throw \
- guard \
- atexit_thread \
- nested_exception \
- new_handler \
- new_op \
- new_opnt
+ bad_array_length.cc \
+ bad_array_new.cc \
+ eh_aux_runtime.cc \
+ eh_ptr.cc \
+ eh_terminate.cc \
+ eh_throw.cc \
+ guard.cc \
+ atexit_thread.cc \
+ nested_exception.cc \
+ new_handler.cc \
+ new_op.cc \
+ new_opnt.cc
-.for _f in ${STD_GNU11}
-COPTS.${_f}.cc= -std=gnu++11
+.for _f in ${STD_GNU11} ${G_CPP11_SOURCES:M*.cc}
+COPTS.${_f}+= -std=gnu++11
.endfor
STD_GNU14= \
- del_ops \
- del_opvs
+ del_ops.cc \
+ del_opvs.cc
-.for _f in ${STD_GNU14}
-COPTS.${_f}.cc= -std=gnu++14 -Wno-sized-deallocation
+.for _f in ${STD_GNU14} ${G_FILESYSTEM_SOURCES:M*.cc}
+COPTS.${_f}+= -std=gnu++14 -Wno-sized-deallocation
.endfor
STD_GNU1Z= \
- new_opa \
- new_opant \
- new_opva \
- new_opvant \
- del_opa \
- del_opant \
- del_opsa \
- del_opva \
- del_opvant \
- del_opvsa
+ new_opa.cc \
+ new_opant.cc \
+ new_opva.cc \
+ new_opvant.cc \
+ del_opa.cc \
+ del_opant.cc \
+ del_opsa.cc \
+ del_opva.cc \
+ del_opvant.cc \
+ del_opvsa.cc
.for _f in ${STD_GNU1Z}
-COPTS.${_f}.cc= -std=gnu++1z
+COPTS.${_f}+= -std=gnu++1z
.endfor
CVS commit: src/external/gpl3/gcc
Module Name:src
Committed By: mrg
Date: Fri Feb 1 10:37:39 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386: c++config.h defs.mk
src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: c++config.h
src/external/gpl3/gcc/usr.bin/gcc/arch/i386: configargs.h
src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64: configargs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/defs.mk
cvs rdiff -u -r1.30 -r1.31 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h
cvs rdiff -u -r1.37 -r1.38 \
src/external/gpl3/gcc/usr.bin/gcc/arch/i386/configargs.h
cvs rdiff -u -r1.41 -r1.42 \
src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h:1.25 src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h:1.26
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h:1.25 Tue Jan 22 23:52:22 2019
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++config.h Fri Feb 1 10:37:38 2019
@@ -1,5 +1,5 @@
/* This file is automatically generated. DO NOT EDIT! */
-/* Generated from: NetBSD: mknative-gcc,v 1.96 2019/01/19 20:02:06 mrg Exp */
+/* Generated from: NetBSD: mknative-gcc,v 1.97 2019/02/01 09:27:23 mrg Exp */
/* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */
// Predefined symbols and macros -*- C++ -*-
@@ -1455,7 +1455,7 @@ namespace std
#define _GLIBCXX_FULLY_DYNAMIC_STRING 0
/* Define if gthreads library is available. */
-/* #undef _GLIBCXX_HAS_GTHREADS */
+#define _GLIBCXX_HAS_GTHREADS 1
/* Define to 1 if a full hosted library is built, or 0 if freestanding. */
#define _GLIBCXX_HOSTED 1
@@ -1583,7 +1583,7 @@ namespace std
/* #undef _GLIBCXX_USE_PTHREADS_NUM_PROCESSORS_NP */
/* Define if POSIX read/write locks are available in . */
-/* #undef _GLIBCXX_USE_PTHREAD_RWLOCK_T */
+#define _GLIBCXX_USE_PTHREAD_RWLOCK_T 1
/* Define if /dev/random and /dev/urandom are available for the random_device
of TR1 (Chapter 5.1). */
Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/defs.mk
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/defs.mk:1.11 src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/defs.mk:1.12
--- src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/defs.mk:1.11 Tue Jan 22 23:52:22 2019
+++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/defs.mk Fri Feb 1 10:37:38 2019
@@ -1,5 +1,5 @@
# This file is automatically generated. DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.96 2019/01/19 20:02:06 mrg Exp
+# Generated from: NetBSD: mknative-gcc,v 1.97 2019/02/01 09:27:23 mrg Exp
# Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp
#
G_port_specific_symbol_files=${GNUHOSTDIST}/libstdc++-v3/config/abi/pre/float128.ver
@@ -11,6 +11,7 @@ G_SRC_SOURCES=compatibility.cc compatibi
G_CPP11_SOURCES=chrono.cc c11-codecvt.cc condition_variable.cc cow-stdexcept.cc ctype.cc debug.cc functexcept.cc functional.cc futex.cc future.cc hash_c++0x.cc hashtable_c++0x.cc ios.cc limits.cc mutex.cc placeholders.cc random.cc regex.cc shared_ptr.cc snprintf_lite.cc system_error.cc thread.cc ctype_configure_char.cc ctype_members.cc ext11-inst.cc fstream-inst.cc ios-inst.cc iostream-inst.cc istream-inst.cc locale-inst.cc ostream-inst.cc sstream-inst.cc streambuf-inst.cc string-inst.cc string-io-inst.cc wlocale-inst.cc wstring-inst.cc wstring-io-inst.cc
G_GLIBCXX_ABI_FLAGS=
G_CPP98_SOURCES=bitmap_allocator.cc pool_allocator.cc mt_allocator.cc c98-codecvt.cc complex_io.cc globals_io.cc hash_tr1.cc hashtable_tr1.cc ios_failure.cc ios_init.cc ios_locale.cc list.cc list-aux.cc list-aux-2.cc list_associated.cc list_associated-2.cc locale.cc locale_init.cc locale_facets.cc localename.cc math_stubs_float.cc math_stubs_long_double.cc stdexcept.cc strstream.cc tree.cc istream.cc istream-string.cc streambuf.cc valarray.cc atomicity.cc codecvt_members.cc collate_members.cc messages_members.cc monetary_members.cc numeric_members.cc time_members.cc basic_file.cc c++locale.cc allocator-inst.cc concept-inst.cc ext-inst.cc misc-inst.cc parallel_settings.cc
+G_FILESYSTEM_SOURCES=dir.cc ops.cc path.cc
G_ATOMICITY_SRCDIR=config/cpu/generic/atomicity_builtins
G_BASIC_FILE_CC=config/io/basic_file_stdio.cc
G_CLOCALE_CC=config/locale/generic/c_locale.cc
Index: src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h:1.30 src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/c++config.h:1.31
---
CVS commit: src/external/gpl3/gcc/usr.bin/cpp
Module Name:src
Committed By: mrg
Date: Fri Feb 1 10:36:33 UTC 2019
Modified Files:
src/external/gpl3/gcc/usr.bin/cpp: Makefile
Log Message:
- use ADD_FRONTEND_LIBRARY to avoid linking libfrontend
- add a hack to ensure driver-i386.c gets built before linking
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/usr.bin/cpp/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/cpp/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.9 src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.10
--- src/external/gpl3/gcc/usr.bin/cpp/Makefile:1.9 Tue Mar 15 19:12:06 2016
+++ src/external/gpl3/gcc/usr.bin/cpp/Makefile Fri Feb 1 10:36:33 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2016/03/15 19:12:06 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2019/02/01 10:36:33 mrg Exp $
PROG= cpp
SRCS= cppspec.c ${G_GCC_OBJS:.o=.c}
@@ -18,7 +18,11 @@ INFOFLAGS= -I${DIST}/gcc/doc -I${DIST}/g
LDADD+= -lintl
DPADD+= ${LIBINTL}
+.include
+
+ADD_FRONTEND_LIBRARY= no
.include "../Makefile.frontend"
+.include "../Makefile.driver"
${SRCS}: ${GCCARCH}/defs.mk
@@ -29,3 +33,6 @@ COPTS.gcc.c= -Wno-stack-protector
.PATH: ${DIST}/gcc ${DIST}/gcc/c-family ${DIST}/gcc/doc
cpp.info: gcc-vers.texi
+
+# XXX - driver-i386.o isn't built otherwise
+${PROG}: ${OBJS}
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: mrg
Date: Fri Feb 1 10:34:19 UTC 2019
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.backend Makefile.frontend
Makefile.gcc-tool
src/external/gpl3/gcc/usr.bin/cc1: Makefile
src/external/gpl3/gcc/usr.bin/cc1obj: Makefile
src/external/gpl3/gcc/usr.bin/cc1plus: Makefile
src/external/gpl3/gcc/usr.bin/gcov: Makefile
src/external/gpl3/gcc/usr.bin/gcov-dump: Makefile
src/external/gpl3/gcc/usr.bin/lto-wrapper: Makefile
Added Files:
src/external/gpl3/gcc/usr.bin: Makefile.prog
Log Message:
- move various stuff into Makefile.prog
- make sure VER_CPPFLAGS is applied to all required files
- add ADD_FRONTEND_LIBRARY to avoid linking libfrontend, while
using the rest of this fragment
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/Makefile.backend
cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/usr.bin/Makefile.frontend
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/Makefile.prog
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/usr.bin/cc1/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/cc1obj/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/cc1plus/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/gcov/Makefile
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/gcov-dump/Makefile
cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/usr.bin/lto-wrapper/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/Makefile.backend
diff -u src/external/gpl3/gcc/usr.bin/Makefile.backend:1.7 src/external/gpl3/gcc/usr.bin/Makefile.backend:1.8
--- src/external/gpl3/gcc/usr.bin/Makefile.backend:1.7 Sun Feb 11 02:12:28 2018
+++ src/external/gpl3/gcc/usr.bin/Makefile.backend Fri Feb 1 10:34:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.backend,v 1.7 2018/02/11 02:12:28 christos Exp $
+# $NetBSD: Makefile.backend,v 1.8 2019/02/01 10:34:18 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKEND_=1
@@ -17,19 +17,7 @@ LDADD+= ${BACKENDOBJ}/libbackend.a
.include "../Makefile.common"
.include "../Makefile.libiberty"
-
-HOSTPROG_CXX= 1
-
-.include
-
-# Force using C++ for this
-HOST_CC:= ${HOST_CXX}
-CC:= ${CXX}
-CFLAGS:= ${CXXFLAGS}
-
-# Don't auto-frob .y or .l files.
-.l.c .y.c .y.h:
- @true
+.include "../Makefile.prog"
# Find our (local) libraries
LIBGMPDIR!= cd ${GMPDISTDIR}/lib/libgmp && ${PRINTOBJDIR}
Index: src/external/gpl3/gcc/usr.bin/Makefile.frontend
diff -u src/external/gpl3/gcc/usr.bin/Makefile.frontend:1.5 src/external/gpl3/gcc/usr.bin/Makefile.frontend:1.6
--- src/external/gpl3/gcc/usr.bin/Makefile.frontend:1.5 Sun Feb 11 02:12:28 2018
+++ src/external/gpl3/gcc/usr.bin/Makefile.frontend Fri Feb 1 10:34:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.frontend,v 1.5 2018/02/11 02:12:28 christos Exp $
+# $NetBSD: Makefile.frontend,v 1.6 2019/02/01 10:34:18 mrg Exp $
BINDIR= /usr/bin
@@ -9,8 +9,10 @@ CPPFLAGS+= -I${GCCARCH} -I${FRONTENDOBJ}
NOCTF= # defined
.include
+.if ${ADD_FRONTEND_LIBRARY:Uyes} != "no"
DPADD+= ${FRONTENDOBJ}/libfrontend.a
LDADD+= -L${FRONTENDOBJ} -lfrontend
+.endif
.include "../Makefile.common"
.include "../Makefile.common-target"
@@ -19,14 +21,7 @@ LDADD+= -L${FRONTENDOBJ} -lfrontend
.include "../Makefile.libiberty"
.include "../Makefile.libdecnumber"
-HOSTPROG_CXX= 1
-
-.include
-
-# Force using C++ for this
-HOST_CC:= ${HOST_CXX}
-CC:= ${CXX}
-CFLAGS:= ${CXXFLAGS}
+.include "../Makefile.prog"
gcc-vers.texi:
(echo "@set version-GCC $(BASEVER)"; \
Index: src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool
diff -u src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool:1.2 src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool:1.3
--- src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool:1.2 Sat May 31 22:55:16 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.gcc-tool Fri Feb 1 10:34:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gcc-tool,v 1.2 2014/05/31 22:55:16 mrg Exp $
+# $NetBSD: Makefile.gcc-tool,v 1.3 2019/02/01 10:34:18 mrg Exp $
PROG= gcc-${GCC_TOOL}
SRCS= gcc-ar.c file-find.c
@@ -23,19 +23,14 @@ CPPFLAGS+= -I${GCCARCH} -I${BACKENDOBJ}
BINDIR= /usr/bin
NOMAN= # defined
-.include
-
-# Force using C++ for this
-HOST_CC:= ${HOST_CXX}
-CC:= ${CXX}
-CFLAGS:= ${CXXFLAGS}
-
.include "../Makefile.common"
.include "../Makefile.libcpp"
.include "../Makefile.backtrace"
.include "../Makefile.libiberty"
.include "../Makefile.libdecnumber"
+.include "../Makefile.prog"
+
COPTS+= -Wno-stack-protector
.PATH: ${DIST}/gcc
Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.12 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.13
---
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: mrg
Date: Fri Feb 1 10:35:09 UTC 2019
Modified Files:
src/external/gpl3/gcc/usr.bin: Makefile.backtrace Makefile.common
Makefile.common-target Makefile.libcpp Makefile.libdecnumber
Makefile.libiberty
Log Message:
- be sure bsd.own.mk has been included
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/Makefile.backtrace \
src/external/gpl3/gcc/usr.bin/Makefile.common \
src/external/gpl3/gcc/usr.bin/Makefile.common-target \
src/external/gpl3/gcc/usr.bin/Makefile.libiberty
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/usr.bin/Makefile.libcpp \
src/external/gpl3/gcc/usr.bin/Makefile.libdecnumber
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/Makefile.backtrace
diff -u src/external/gpl3/gcc/usr.bin/Makefile.backtrace:1.1 src/external/gpl3/gcc/usr.bin/Makefile.backtrace:1.2
--- src/external/gpl3/gcc/usr.bin/Makefile.backtrace:1.1 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.backtrace Fri Feb 1 10:35:09 2019
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.backtrace,v 1.1 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile.backtrace,v 1.2 2019/02/01 10:35:09 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKTRACE_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_BACKTRACE_=1
+.include
+
LIBBACKTRACEOBJ!= cd ${.CURDIR}/../../lib/libbacktrace && ${PRINTOBJDIR}
DPADD+= ${LIBBACKTRACEOBJ}/libbacktrace.a
LDADD+= ${LIBBACKTRACEOBJ}/libbacktrace.a
Index: src/external/gpl3/gcc/usr.bin/Makefile.common
diff -u src/external/gpl3/gcc/usr.bin/Makefile.common:1.1 src/external/gpl3/gcc/usr.bin/Makefile.common:1.2
--- src/external/gpl3/gcc/usr.bin/Makefile.common:1.1 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.common Fri Feb 1 10:35:09 2019
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.common,v 1.1 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile.common,v 1.2 2019/02/01 10:35:09 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_COMMON_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_COMMON_=1
+.include
+
COMMONOBJ!= cd ${.CURDIR}/../common && ${PRINTOBJDIR}
DPADD+= ${COMMONOBJ}/libcommon.a
LDADD+= ${COMMONOBJ}/libcommon.a
Index: src/external/gpl3/gcc/usr.bin/Makefile.common-target
diff -u src/external/gpl3/gcc/usr.bin/Makefile.common-target:1.1 src/external/gpl3/gcc/usr.bin/Makefile.common-target:1.2
--- src/external/gpl3/gcc/usr.bin/Makefile.common-target:1.1 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.common-target Fri Feb 1 10:35:09 2019
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.common-target,v 1.1 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile.common-target,v 1.2 2019/02/01 10:35:09 mrg Exp $
#.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_COMMON_TARGET_
#_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_COMMON_TARGET_=1
+.include
+
COMMONTARGETOBJ!= cd ${.CURDIR}/../common-target && ${PRINTOBJDIR}
DPADD+= ${COMMONTARGETOBJ}/libcommon-target.a
LDADD+= ${COMMONTARGETOBJ}/libcommon-target.a
Index: src/external/gpl3/gcc/usr.bin/Makefile.libiberty
diff -u src/external/gpl3/gcc/usr.bin/Makefile.libiberty:1.1 src/external/gpl3/gcc/usr.bin/Makefile.libiberty:1.2
--- src/external/gpl3/gcc/usr.bin/Makefile.libiberty:1.1 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.libiberty Fri Feb 1 10:35:09 2019
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.libiberty,v 1.1 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile.libiberty,v 1.2 2019/02/01 10:35:09 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_LIBIBERTY_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_LIBIBERTY_=1
+.include
+
LIBIBERTYOBJ!= cd ${.CURDIR}/../../lib/libiberty && ${PRINTOBJDIR}
DPADD+= ${LIBIBERTYOBJ}/libiberty.a
LDADD+= ${LIBIBERTYOBJ}/libiberty.a
Index: src/external/gpl3/gcc/usr.bin/Makefile.libcpp
diff -u src/external/gpl3/gcc/usr.bin/Makefile.libcpp:1.2 src/external/gpl3/gcc/usr.bin/Makefile.libcpp:1.3
--- src/external/gpl3/gcc/usr.bin/Makefile.libcpp:1.2 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.libcpp Fri Feb 1 10:35:09 2019
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.libcpp,v 1.2 2014/03/01 10:00:49 mrg Exp $
+# $NetBSD: Makefile.libcpp,v 1.3 2019/02/01 10:35:09 mrg Exp $
.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_LIBCPP_
_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_LIBCPP_=1
+.include
+
LIBCPPOBJ!= cd ${.CURDIR}/../libcpp && ${PRINTOBJDIR}
DPADD+= ${LIBCPPOBJ}/libcpp.a
LDADD+= ${LIBCPPOBJ}/libcpp.a
Index: src/external/gpl3/gcc/usr.bin/Makefile.libdecnumber
diff -u src/external/gpl3/gcc/usr.bin/Makefile.libdecnumber:1.2 src/external/gpl3/gcc/usr.bin/Makefile.libdecnumber:1.3
--- src/external/gpl3/gcc/usr.bin/Makefile.libdecnumber:1.2 Sat Mar 1 10:00:49 2014
+++ src/external/gpl3/gcc/usr.bin/Makefile.libdecnumber Fri Feb 1 10:35:09 2019
@@ -1,8 +1,10 @@
-# $NetBSD: Makefile.libdecnumber,v
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: mrg
Date: Fri Feb 1 10:32:32 UTC 2019
Modified Files:
src/external/gpl3/gcc/usr.bin/frontend: Makefile
Added Files:
src/external/gpl3/gcc/usr.bin: Makefile.driver
Log Message:
- move driver file config to Makefile.driver.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/usr.bin/Makefile.driver
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/usr.bin/frontend/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/usr.bin/frontend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.12 src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.13
--- src/external/gpl3/gcc/usr.bin/frontend/Makefile:1.12 Sun Jul 15 16:37:04 2018
+++ src/external/gpl3/gcc/usr.bin/frontend/Makefile Fri Feb 1 10:32:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/07/15 16:37:04 christos Exp $
+# $NetBSD: Makefile,v 1.13 2019/02/01 10:32:32 mrg Exp $
LIBISPRIVATE= yes
@@ -11,20 +11,7 @@ SRCS= gcc.c version.c prefix.c
HOSTPROG_CXX= 1
-# XXX
-.if ${GCC_MACHINE_ARCH} == "x86_64" || ${GCC_MACHINE_ARCH} == "i386"
-SRCS+= driver-i386.c
-.PATH: ${DIST}/gcc/config/i386
-.endif
-.if ${GCC_MACHINE_ARCH} == "powerpc" || ${GCC_MACHINE_ARCH} == "powerpc64"
-SRCS+= driver-rs6000.c
-.PATH: ${DIST}/gcc/config/rs6000
-.endif
-.if ${GCC_MACHINE_ARCH} == "aarch64"
-SRCS+= driver-aarch64.c
-.PATH: ${DIST}/gcc/config/aarch64
-.endif
-
+.include "../Makefile.driver"
.include "../Makefile.target-defines"
version.c: ${GCCARCH}/defs.mk ${TOP}/tools/gcc/gcc-version.mk
Added files:
Index: src/external/gpl3/gcc/usr.bin/Makefile.driver
diff -u /dev/null src/external/gpl3/gcc/usr.bin/Makefile.driver:1.1
--- /dev/null Fri Feb 1 10:32:32 2019
+++ src/external/gpl3/gcc/usr.bin/Makefile.driver Fri Feb 1 10:32:32 2019
@@ -0,0 +1,20 @@
+# $NetBSD: Makefile.driver,v 1.1 2019/02/01 10:32:32 mrg Exp $
+
+.ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_DRIVER_
+_EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_DRIVER_=1
+
+# XXX
+.if ${GCC_MACHINE_ARCH} == "x86_64" || ${GCC_MACHINE_ARCH} == "i386"
+SRCS+= driver-i386.c
+.PATH: ${DIST}/gcc/config/i386
+.endif
+.if ${GCC_MACHINE_ARCH} == "powerpc" || ${GCC_MACHINE_ARCH} == "powerpc64"
+SRCS+= driver-rs6000.c
+.PATH: ${DIST}/gcc/config/rs6000
+.endif
+.if ${GCC_MACHINE_ARCH} == "aarch64"
+SRCS+= driver-aarch64.c
+.PATH: ${DIST}/gcc/config/aarch64
+.endif
+
+.endif
CVS commit: src/external/gpl3/gcc/lib
Module Name:src Committed By: mrg Date: Fri Feb 1 10:31:56 UTC 2019 Modified Files: src/external/gpl3/gcc/lib/libasan: shlib_version src/external/gpl3/gcc/lib/liblsan: shlib_version src/external/gpl3/gcc/lib/libtsan: shlib_version src/external/gpl3/gcc/lib/libubsan: shlib_version Log Message: - new shlib majors To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/lib/libasan/shlib_version cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/liblsan/shlib_version cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/libtsan/shlib_version cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/lib/libubsan/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/lib/libasan/shlib_version diff -u src/external/gpl3/gcc/lib/libasan/shlib_version:1.4 src/external/gpl3/gcc/lib/libasan/shlib_version:1.5 --- src/external/gpl3/gcc/lib/libasan/shlib_version:1.4 Sat Feb 3 21:27:45 2018 +++ src/external/gpl3/gcc/lib/libasan/shlib_version Fri Feb 1 10:31:55 2019 @@ -1,2 +1,2 @@ -major=3 +major=4 minor=0 Index: src/external/gpl3/gcc/lib/liblsan/shlib_version diff -u src/external/gpl3/gcc/lib/liblsan/shlib_version:1.1 src/external/gpl3/gcc/lib/liblsan/shlib_version:1.2 --- src/external/gpl3/gcc/lib/liblsan/shlib_version:1.1 Tue Jun 26 20:54:32 2018 +++ src/external/gpl3/gcc/lib/liblsan/shlib_version Fri Feb 1 10:31:55 2019 @@ -1,2 +1,2 @@ -major=1 +major=2 minor=0 Index: src/external/gpl3/gcc/lib/libtsan/shlib_version diff -u src/external/gpl3/gcc/lib/libtsan/shlib_version:1.1 src/external/gpl3/gcc/lib/libtsan/shlib_version:1.2 --- src/external/gpl3/gcc/lib/libtsan/shlib_version:1.1 Wed Jan 7 03:49:13 2015 +++ src/external/gpl3/gcc/lib/libtsan/shlib_version Fri Feb 1 10:31:55 2019 @@ -1,2 +1,2 @@ -major=0 +major=1 minor=0 Index: src/external/gpl3/gcc/lib/libubsan/shlib_version diff -u src/external/gpl3/gcc/lib/libubsan/shlib_version:1.3 src/external/gpl3/gcc/lib/libubsan/shlib_version:1.4 --- src/external/gpl3/gcc/lib/libubsan/shlib_version:1.3 Sat Feb 3 21:27:45 2018 +++ src/external/gpl3/gcc/lib/libubsan/shlib_version Fri Feb 1 10:31:56 2019 @@ -1,2 +1,2 @@ -major=2 +major=3 minor=0
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Fri Feb 1 09:27:24 UTC 2019
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
- use --with-default-libstdcxx-abi=new for GCC, otherwise we get the
old ABI with --disable-libstdcxx-dual-abi
- fix libbacktrace mknative
- find gthr-default.h for libstdc++ mknative
- fetch FILESYSTEM_SOURCES
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/tools/gcc/Makefile
cvs rdiff -u -r1.96 -r1.97 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.88 src/tools/gcc/Makefile:1.89
--- src/tools/gcc/Makefile:1.88 Sat Jan 19 12:58:37 2019
+++ src/tools/gcc/Makefile Fri Feb 1 09:27:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2019/01/19 12:58:37 mrg Exp $
+# $NetBSD: Makefile,v 1.89 2019/02/01 09:27:23 mrg Exp $
.include
@@ -39,7 +39,8 @@ COMMON_CONFIGURE_ARGS= --target=${MACHIN
--disable-libstdcxx-dual-abi \
--enable-__cxa_atexit \
--enable-libstdcxx-time=rt \
- --enable-libstdcxx-threads
+ --enable-libstdcxx-threads \
+ --with-diagnostics-color=auto-if-env
.if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
COMMON_CONFIGURE_ARGS+= --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
.endif
@@ -47,7 +48,9 @@ COMMON_CONFIGURE_ARGS+= --with-arch=${GC
COMMON_CONFIGURE_ARGS+= --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
.endif
-COMMON_CONFIGURE_ARGS+= --with-diagnostics-color=auto-if-env
+.if ${HAVE_GCC} >= 7
+COMMON_CONFIGURE_ARGS+= --with-default-libstdcxx-abi=new
+.endif
CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
CONFIGURE_ARGS+= \
@@ -94,6 +97,7 @@ MKNATIVE_TARGET= gcc6
MKNATIVE_CONFIG_TARGET_LIBS+= \
configure-target-libstdc++-v3 \
+ configure-target-libbacktrace \
configure-target-libobjc
BINENV= /usr/bin/env -i
@@ -105,7 +109,7 @@ MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:
CFLAGS_FOR_BUILD="-I${TOOLDIR}/include" \
CC=${CC:Q}' '${CCADDFLAGS:Q} \
CXX=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
- CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
+ CPP=${CPP:Q}' '-I${DESTDIR}/usr/include' '-I${DESTDIR}/usr/include/g++/bits \
CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS= \
AS=${AS:Q} AWK=${TOOL_AWK:Q} LD=${LD:Q} \
MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
@@ -185,14 +189,15 @@ NATIVE_CONFIGURE_ARGS+= \
--disable-multilib \
--disable-symvers \
--disable-libstdcxx-pch \
- --disable-libstdcxx-dual-abi \
--build=`${GCCDIST}/config.guess` \
--host=${MACHINE_GNU_PLATFORM} \
--with-sysroot=${DESTDIR}
MKENV_BUILD_MAKE=cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE}
.native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile
- mkdir .native 2>/dev/null || true
+ mkdir .native .native/gcc .native/gcc/include 2>/dev/null || true
+ # If this fails, gthreads won't be configured initially, but reconfig will.
+ -cp ${DESTDIR}/usr/include/g++/bits/gthr-default.h .native/gcc/include
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native && ${MKNATIVE_ENV} \
${HOST_SH} ${GNUHOSTDIST}/configure \
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.96 src/tools/gcc/mknative-gcc:1.97
--- src/tools/gcc/mknative-gcc:1.96 Sat Jan 19 20:02:06 2019
+++ src/tools/gcc/mknative-gcc Fri Feb 1 09:27:23 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.96 2019/01/19 20:02:06 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.97 2019/02/01 09:27:23 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -178,9 +178,9 @@ get_libbacktrace () {
mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
- <$_TMPDIR/$_subdir/config.h
+ <$_TMPDIR/$_PLATFORM/$_subdir/config.h
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/backtrace-supported.h \
- <$_TMPDIR/$_subdir/backtrace-supported.h
+ <$_TMPDIR/$_PLATFORM/$_subdir/backtrace-supported.h
}
# lib/libobjc #
@@ -256,6 +256,9 @@ get_libstdcxx_v3 () {
GLIBCXX_ABI_FLAGS libc__98convenience_la_SOURCES | \
sed -e 's/^G_libc__98convenience_la_SOURCES=/G_CPP98_SOURCES=/' \
-e 's/codecvt.cc/c98-codecvt.cc/'
+ getvars $_PLATFORM/libstdc++-v3/src/filesystem/Makefile \
+ libstdc__fs_la_SOURCES | \
+ sed -e 's/^G_libstdc__fs_la_SOURCES=/G_FILESYSTEM_SOURCES=/'
getvars $_PLATFORM/libstdc++-v3/Makefile ATOMICITY_SRCDIR \
BASIC_FILE_CC CLOCALE_CC CCODECVT_CC CCOLLATE_CC \
CCTYPE_CC CMESSAGES_CC CMONEY_CC CNUMERIC_CC CTIME_CC \
CVS commit: src
Module Name:src
Committed By: mrg
Date: Fri Feb 1 09:06:07 UTC 2019
Modified Files:
src/tests/fs/common: fstest_nfs.c fstest_puffs.c
src/usr.sbin/puffs/rump_syspuffs: rump_syspuffs.c
Log Message:
don't check the return value of execvp() for failure to call err().
assume if it returns at all something has failed.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/fs/common/fstest_nfs.c
cvs rdiff -u -r1.11 -r1.12 src/tests/fs/common/fstest_puffs.c
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/fs/common/fstest_nfs.c
diff -u src/tests/fs/common/fstest_nfs.c:1.9 src/tests/fs/common/fstest_nfs.c:1.10
--- src/tests/fs/common/fstest_nfs.c:1.9 Mon Feb 28 21:08:46 2011
+++ src/tests/fs/common/fstest_nfs.c Fri Feb 1 09:06:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fstest_nfs.c,v 1.9 2011/02/28 21:08:46 pooka Exp $ */
+/* $NetBSD: fstest_nfs.c,v 1.10 2019/02/01 09:06:07 mrg Exp $ */
/*
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -113,8 +113,8 @@ donewfs(const atf_tc_t *tc, void **argp,
close(pipes[0]);
if (dup2(pipes[1], 3) == -1)
err(1, "dup2");
- if (execvp(nfsdargv[0], nfsdargv) == -1)
- err(1, "execvp");
+ execvp(nfsdargv[0], nfsdargv);
+ err(1, "execvp");
case -1:
return errno;
default:
Index: src/tests/fs/common/fstest_puffs.c
diff -u src/tests/fs/common/fstest_puffs.c:1.11 src/tests/fs/common/fstest_puffs.c:1.12
--- src/tests/fs/common/fstest_puffs.c:1.11 Mon Sep 9 19:47:38 2013
+++ src/tests/fs/common/fstest_puffs.c Fri Feb 1 09:06:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fstest_puffs.c,v 1.11 2013/09/09 19:47:38 pooka Exp $ */
+/* $NetBSD: fstest_puffs.c,v 1.12 2019/02/01 09:06:07 mrg Exp $ */
/*
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
@@ -277,8 +277,8 @@ donewfs(const atf_tc_t *tc, void **argp,
if (setenv("PUFFS_COMFD", comfd, 1) == -1)
return errno;
- if (execvp(theargv[0], theargv) == -1)
- return errno;
+ execvp(theargv[0], theargv);
+ return errno;
case -1:
return errno;
default:
Index: src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.c
diff -u src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.c:1.12 src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.c:1.13
--- src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.c:1.12 Wed Aug 31 13:32:39 2011
+++ src/usr.sbin/puffs/rump_syspuffs/rump_syspuffs.c Fri Feb 1 09:06:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syspuffs.c,v 1.12 2011/08/31 13:32:39 joerg Exp $ */
+/* $NetBSD: rump_syspuffs.c,v 1.13 2019/02/01 09:06:07 mrg Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
@@ -113,8 +113,8 @@ mount_syspuffs_parseargs(int argc, char
err(1, "setenv");
argv++;
- if (execvp(argv[0], argv) == -1)
- err(1, "execvp");
+ (void)execvp(argv[0], argv);
+ err(1, "execvp");
/*NOTREACHED*/
case -1:
err(1, "fork");
CVS commit: src/usr.bin/midiplay
Module Name:src
Committed By: mrg
Date: Fri Feb 1 08:37:21 UTC 2019
Modified Files:
src/usr.bin/midiplay: midiplay.c
Log Message:
make a fallthru comment GCC7 compatible.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/usr.bin/midiplay/midiplay.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/midiplay/midiplay.c
diff -u src/usr.bin/midiplay/midiplay.c:1.32 src/usr.bin/midiplay/midiplay.c:1.33
--- src/usr.bin/midiplay/midiplay.c:1.32 Thu May 3 05:14:55 2018
+++ src/usr.bin/midiplay/midiplay.c Fri Feb 1 08:37:21 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: midiplay.c,v 1.32 2018/05/03 05:14:55 wiz Exp $ */
+/* $NetBSD: midiplay.c,v 1.33 2019/02/01 08:37:21 mrg Exp $ */
/*
* Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: midiplay.c,v 1.32 2018/05/03 05:14:55 wiz Exp $");
+__RCSID("$NetBSD: midiplay.c,v 1.33 2019/02/01 08:37:21 mrg Exp $");
#endif
@@ -677,7 +677,8 @@ playdata(u_char *buf, u_int tot, const c
}
break;
}
-/* Sorry, can't do this yet; FALLTHROUGH */
+/* Sorry, can't do this yet */
+/* FALLTHROUGH */
default:
if (verbose)
printf("MIDI event 0x%02x ignored\n",
CVS commit: src/sys/dev/iscsi
Module Name:src Committed By: mrg Date: Fri Feb 1 08:33:29 UTC 2019 Modified Files: src/sys/dev/iscsi: iscsi_utils.c Log Message: fix FALLTRHOUGH spell-o. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/dev/iscsi/iscsi_utils.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/iscsi/iscsi_utils.c diff -u src/sys/dev/iscsi/iscsi_utils.c:1.24 src/sys/dev/iscsi/iscsi_utils.c:1.25 --- src/sys/dev/iscsi/iscsi_utils.c:1.24 Sun Dec 3 19:07:10 2017 +++ src/sys/dev/iscsi/iscsi_utils.c Fri Feb 1 08:33:29 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: iscsi_utils.c,v 1.24 2017/12/03 19:07:10 christos Exp $ */ +/* $NetBSD: iscsi_utils.c,v 1.25 2019/02/01 08:33:29 mrg Exp $ */ /*- * Copyright (c) 2004,2005,2006,2008 The NetBSD Foundation, Inc. @@ -422,7 +422,7 @@ wake_ccb(ccb_t *ccb, uint32_t status) case CCBDISP_SCSIPI: iscsi_done(ccb); - /* FALLTRHOUGH */ + /* FALLTHROUGH */ case CCBDISP_FREE: free_ccb(ccb); break;
CVS commit: src
Module Name:src
Committed By: mrg
Date: Fri Feb 1 08:29:04 UTC 2019
Modified Files:
src/bin/csh: lex.c
src/external/bsd/ppp/dist/pppd: options.c
src/usr.bin/basename: basename.c
src/usr.bin/gcore: gcore.c
src/usr.bin/mail: mime_attach.c
src/usr.bin/tabs: tabs.c
src/usr.bin/tip: acu.c
src/usr.sbin/fwctl: fwcontrol.c
Log Message:
compare pointers with NULL not '\0'.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/bin/csh/lex.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/ppp/dist/pppd/options.c
cvs rdiff -u -r1.15 -r1.16 src/usr.bin/basename/basename.c
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/gcore/gcore.c
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/mail/mime_attach.c
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/tabs/tabs.c
cvs rdiff -u -r1.16 -r1.17 src/usr.bin/tip/acu.c
cvs rdiff -u -r1.16 -r1.17 src/usr.sbin/fwctl/fwcontrol.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/csh/lex.c
diff -u src/bin/csh/lex.c:1.33 src/bin/csh/lex.c:1.34
--- src/bin/csh/lex.c:1.33 Sat Jan 5 16:54:00 2019
+++ src/bin/csh/lex.c Fri Feb 1 08:29:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.33 2019/01/05 16:54:00 christos Exp $ */
+/* $NetBSD: lex.c,v 1.34 2019/02/01 08:29:03 mrg Exp $ */
/*-
* Copyright (c) 1980, 1991, 1993
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)lex.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: lex.c,v 1.33 2019/01/05 16:54:00 christos Exp $");
+__RCSID("$NetBSD: lex.c,v 1.34 2019/02/01 08:29:03 mrg Exp $");
#endif
#endif /* not lint */
@@ -1323,7 +1323,7 @@ top:
}
}
if (alvec) {
- if ((alvecp = *alvec) != '\0') {
+ if ((alvecp = *alvec) != NULL) {
alvec++;
goto top;
}
@@ -1346,7 +1346,7 @@ top:
doneinp = 1;
reset();
}
- if ((evalp = *evalvec) != '\0') {
+ if ((evalp = *evalvec) != NULL) {
evalvec++;
goto top;
}
Index: src/external/bsd/ppp/dist/pppd/options.c
diff -u src/external/bsd/ppp/dist/pppd/options.c:1.4 src/external/bsd/ppp/dist/pppd/options.c:1.5
--- src/external/bsd/ppp/dist/pppd/options.c:1.4 Sat Oct 25 21:11:37 2014
+++ src/external/bsd/ppp/dist/pppd/options.c Fri Feb 1 08:29:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.4 2014/10/25 21:11:37 christos Exp $ */
+/* $NetBSD: options.c,v 1.5 2019/02/01 08:29:04 mrg Exp $ */
/*
* options.c - handles option processing for PPP.
@@ -47,7 +47,7 @@
#define RCSID "Id: options.c,v 1.102 2008/06/15 06:53:06 paulus Exp "
static const char rcsid[] = RCSID;
#else
-__RCSID("$NetBSD: options.c,v 1.4 2014/10/25 21:11:37 christos Exp $");
+__RCSID("$NetBSD: options.c,v 1.5 2019/02/01 08:29:04 mrg Exp $");
#endif
#include
@@ -1787,7 +1787,7 @@ user_unsetenv(argv)
option_error("unexpected = in name: %s", arg);
return 0;
}
-if (arg == '\0') {
+if (arg == NULL) {
option_error("missing variable name for unset");
return 0;
}
Index: src/usr.bin/basename/basename.c
diff -u src/usr.bin/basename/basename.c:1.15 src/usr.bin/basename/basename.c:1.16
--- src/usr.bin/basename/basename.c:1.15 Mon Aug 29 14:24:03 2011
+++ src/usr.bin/basename/basename.c Fri Feb 1 08:29:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: basename.c,v 1.15 2011/08/29 14:24:03 joerg Exp $ */
+/* $NetBSD: basename.c,v 1.16 2019/02/01 08:29:04 mrg Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)basename.c 8.4 (Berkeley) 5/4/95";
#endif
-__RCSID("$NetBSD: basename.c,v 1.15 2011/08/29 14:24:03 joerg Exp $");
+__RCSID("$NetBSD: basename.c,v 1.16 2019/02/01 08:29:04 mrg Exp $");
#endif /* not lint */
#include
@@ -78,7 +78,7 @@ main(int argc, char **argv)
}
if ((p = basename(*argv)) == NULL)
err(1, "%s", *argv);
- if (*++argv != '\0') {
+ if (*++argv != NULL) {
int suffixlen, stringlen, off;
suffixlen = strlen(*argv);
Index: src/usr.bin/gcore/gcore.c
diff -u src/usr.bin/gcore/gcore.c:1.11 src/usr.bin/gcore/gcore.c:1.12
--- src/usr.bin/gcore/gcore.c:1.11 Mon Apr 28 20:24:13 2008
+++ src/usr.bin/gcore/gcore.c Fri Feb 1 08:29:04 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gcore.c,v 1.11 2008/04/28 20:24:13 martin Exp $ */
+/* $NetBSD: gcore.c,v 1.12 2019/02/01 08:29:04 mrg Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: gcore.c,v 1.11 2008/04/28 20:24:13 martin Exp $");
+__RCSID("$NetBSD: gcore.c,v 1.12 2019/02/01 08:29:04 mrg Exp $");
#include
#include
@@ -88,7 +88,7 @@ main(int argc, char **argv)
errno = 0;
lval = strtoul(argv[c], , 0);
- if (argv[c] == '\0' || *ep)
+ if (argv[c] == NULL || *ep)
errx(1, "`%s' is not a number.", argv[c]);
if (errno == ERANGE && lval == ULONG_MAX)
Index: src/usr.bin/mail/mime_attach.c
diff -u src/usr.bin/mail/mime_attach.c:1.19 src/usr.bin/mail/mime_attach.c:1.20
---
