CVS commit: src/external/gpl3/gcc/dist
Module Name:src Committed By: mrg Date: Sat Mar 1 09:04:13 UTC 2014 Modified Files: src/external/gpl3/gcc/dist: config.sub src/external/gpl3/gcc/dist/gcc: Makefile.in builtins.c config.gcc configure configure.ac dwarf2out.c gcc.c gcc.h target-def.h tree-cfg.c src/external/gpl3/gcc/dist/gcc/config: freebsd-spec.h netbsd.h src/external/gpl3/gcc/dist/gcc/config/alpha: elf.h src/external/gpl3/gcc/dist/gcc/config/arm: arm-cores.def arm.h bpabi.h netbsd-elf.h thumb2.md src/external/gpl3/gcc/dist/gcc/config/i386: driver-i386.c i386.c netbsd-elf.h netbsd64.h src/external/gpl3/gcc/dist/gcc/config/m68k: netbsd-elf.h src/external/gpl3/gcc/dist/gcc/config/mips: netbsd.h src/external/gpl3/gcc/dist/gcc/config/pa: pa.h src/external/gpl3/gcc/dist/gcc/config/rs6000: rs6000.c sysv4.h t-netbsd src/external/gpl3/gcc/dist/gcc/config/vax: vax.c src/external/gpl3/gcc/dist/gcc/cp: Make-lang.in src/external/gpl3/gcc/dist/gcc/doc: gcov.texi invoke.texi src/external/gpl3/gcc/dist/libcpp: init.c lex.c macro.c src/external/gpl3/gcc/dist/libmudflap: mf-hooks1.c src/external/gpl3/gcc/dist/libobjc: encoding.c hash.c sendmsg.c src/external/gpl3/gcc/dist/libstdc++-v3/config/os/bsd/netbsd: ctype_base.h src/external/gpl3/gcc/dist/libstdc++-v3/include/bits: stl_pair.h stl_queue.h src/external/gpl3/gcc/dist/libstdc++-v3/include/ext: rope ropeimpl.h src/external/gpl3/gcc/dist/libstdc++-v3/libsupc++: exception_ptr.h unwind-cxx.h Log Message: merge gcc 4.8.2 r206687 (part 2). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/config.sub cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/dist/gcc/Makefile.in cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/builtins.c cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/dist/gcc/config.gcc cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/dist/gcc/configure cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/configure.ac cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/dwarf2out.c \ src/external/gpl3/gcc/dist/gcc/gcc.h \ src/external/gpl3/gcc/dist/gcc/target-def.h \ src/external/gpl3/gcc/dist/gcc/tree-cfg.c cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/gcc.c cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/freebsd-spec.h cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/dist/gcc/config/netbsd.h cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/config/alpha/elf.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/dist/gcc/config/arm/arm-cores.def cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/config/arm/arm.h \ src/external/gpl3/gcc/dist/gcc/config/arm/bpabi.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/arm/thumb2.md cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/dist/gcc/config/i386/driver-i386.c \ src/external/gpl3/gcc/dist/gcc/config/i386/netbsd64.h cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/config/i386/i386.c \ src/external/gpl3/gcc/dist/gcc/config/i386/netbsd-elf.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gcc/dist/gcc/config/m68k/netbsd-elf.h cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/config/mips/netbsd.h cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/config/pa/pa.h cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/rs6000.c \ src/external/gpl3/gcc/dist/gcc/config/rs6000/t-netbsd cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/config/rs6000/sysv4.h cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/config/vax/vax.c cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/cp/Make-lang.in cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/doc/gcov.texi \ src/external/gpl3/gcc/dist/gcc/doc/invoke.texi cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/libcpp/init.c \ src/external/gpl3/gcc/dist/libcpp/lex.c \ src/external/gpl3/gcc/dist/libcpp/macro.c cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/libmudflap/mf-hooks1.c cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/libobjc/encoding.c \ src/external/gpl3/gcc/dist/libobjc/hash.c \ src/external/gpl3/gcc/dist/libobjc/sendmsg.c cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/dist/libstdc++-v3/config/os/bsd/netbsd/ctype_base.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_pair.h \ src/external/gpl3/gcc/dist/libstdc++-v3/include/bits/stl_queue.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/rope cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/dist/libstdc++-v3/include/ext/ropeimpl.h cvs rdiff -u -r1.2 -r1.3 \
CVS commit: src/external/gpl3/gcc/dist
Module Name:src
Committed By: mrg
Date: Sat Mar 1 09:26:01 UTC 2014
Added Files:
src/external/gpl3/gcc/dist/gcc/config: host-netbsd.c netbsd-stdint.h
x-netbsd
src/external/gpl3/gcc/dist/libgcc/config/arm: t-netbsd-eabi
src/external/gpl3/gcc/dist/libgcc/config/m68k: t-netbsd-m68010
src/external/gpl3/gcc/dist/libgcc/config/pa: t-netbsd
Removed Files:
src/external/gpl3/gcc/dist/gcc/config/arm: t-netbsd-eabi
Log Message:
merge gcc 4.8.2 r206687 (part 3).
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/dist/gcc/config/host-netbsd.c \
src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h \
src/external/gpl3/gcc/dist/gcc/config/x-netbsd
cvs rdiff -u -r1.6 -r0 \
src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd-eabi
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/dist/libgcc/config/arm/t-netbsd-eabi
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/dist/libgcc/config/m68k/t-netbsd-m68010
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/dist/libgcc/config/pa/t-netbsd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/gpl3/gcc/dist/gcc/config/host-netbsd.c
diff -u /dev/null src/external/gpl3/gcc/dist/gcc/config/host-netbsd.c:1.1
--- /dev/null Sat Mar 1 09:26:01 2014
+++ src/external/gpl3/gcc/dist/gcc/config/host-netbsd.c Sat Mar 1 09:26:00 2014
@@ -0,0 +1,85 @@
+/* NetBSD host-specific hook definitions.
+ Copyright (C) 2004-2013 Free Software Foundation, Inc.
+
+ This file is part of GCC.
+
+ GCC is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 3, or (at your
+ option) any later version.
+
+ GCC is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public
+ License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3. If not see
+ http://www.gnu.org/licenses/. */
+
+#include config.h
+#include system.h
+#include coretypes.h
+#include hosthooks.h
+#include hosthooks-def.h
+
+
+#undef HOST_HOOKS_GT_PCH_GET_ADDRESS
+#define HOST_HOOKS_GT_PCH_GET_ADDRESS netbsd_gt_pch_get_address
+#undef HOST_HOOKS_GT_PCH_USE_ADDRESS
+#define HOST_HOOKS_GT_PCH_USE_ADDRESS netbsd_gt_pch_use_address
+
+/* For various ports, try to guess a fixed spot in the vm space
+ that's probably free. */
+#if defined(__sparc64__)
+# define TRY_EMPTY_VM_SPACE 0x400
+#elif defined(_LP64)
+# define TRY_EMPTY_VM_SPACE 0x4000
+#elif defined(__mips__) || defined(__vax__)
+# define TRY_EMPTY_VM_SPACE 0x6000
+#else
+# define TRY_EMPTY_VM_SPACE 0xb000
+#endif
+
+/* Determine a location where we might be able to reliably allocate
+ SIZE bytes. FD is the PCH file, though we should return with the
+ file unmapped. */
+
+static void *
+netbsd_gt_pch_get_address (size_t size, int fd)
+{
+ void *addr;
+
+ addr = mmap ((void *) TRY_EMPTY_VM_SPACE, size, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_FIXED, fd, 0);
+
+ /* If we failed the map, that means there's *no* free space. */
+ if (addr == (void *) MAP_FAILED)
+return NULL;
+ /* Unmap the area before returning. */
+ munmap (addr, size);
+
+ return addr;
+}
+
+/* Map SIZE bytes of FD+OFFSET at BASE. Return 1 if we succeeded at
+ mapping the data at BASE, -1 if we couldn't. */
+
+static int
+netbsd_gt_pch_use_address (void *base, size_t size, int fd, size_t offset)
+{
+ void *addr;
+
+ /* We're called with size == 0 if we're not planning to load a PCH
+ file at all. This allows the hook to free any static space that
+ we might have allocated at link time. */
+ if (size == 0)
+return -1;
+
+ addr = mmap (base, size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED, fd, offset);
+
+ return addr == base ? 1 : -1;
+}
+
+
+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER;
Index: src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h
diff -u /dev/null src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h:1.1
--- /dev/null Sat Mar 1 09:26:01 2014
+++ src/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h Sat Mar 1 09:26:00 2014
@@ -0,0 +1,56 @@
+/* Definitions for stdint.h types for NetBSD systems.
+ Copyright (C) 2009 Free Software Foundation, Inc.
+ Contributed by Gerald Pfeifer ger...@pfeifer.com.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 3, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied
CVS commit: src/external/gpl3/gcc/dist
Module Name:src Committed By: mrg Date: Sat Mar 1 09:44:51 UTC 2014 Modified Files: src/external/gpl3/gcc/dist: config.guess configure configure.ac src/external/gpl3/gcc/dist/gcc: config.host cppdefault.c ggc-common.c output.h system.h tree-ssa-ccp.c src/external/gpl3/gcc/dist/gcc/config/alpha: alpha.h netbsd.h src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-eabi.h t-arm src/external/gpl3/gcc/dist/gcc/config/ia64: netbsd.h src/external/gpl3/gcc/dist/gcc/config/m68k: t-opts src/external/gpl3/gcc/dist/gcc/config/mips: mips.c netbsd64.h src/external/gpl3/gcc/dist/gcc/config/pa: pa-netbsd.h t-netbsd src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h netbsd64.h t-rs6000 src/external/gpl3/gcc/dist/gcc/config/sh: t-sh src/external/gpl3/gcc/dist/gcc/config/sparc: constraints.md predicates.md src/external/gpl3/gcc/dist/gcc/config/vax: constraints.md vax.md src/external/gpl3/gcc/dist/libcpp: configure configure.ac files.c src/external/gpl3/gcc/dist/libgcc: config.host unwind-dw2-fde-dip.c src/external/gpl3/gcc/dist/libgcc/config/arm: t-netbsd src/external/gpl3/gcc/dist/libgcc/config/m68k: fpgnulib.c src/external/gpl3/gcc/dist/libgomp: Makefile.am Makefile.in configure configure.ac src/external/gpl3/gcc/dist/libiberty: Makefile.in src/external/gpl3/gcc/dist/libitm: Makefile.am Makefile.in configure configure.ac src/external/gpl3/gcc/dist/libmudflap: Makefile.am Makefile.in configure configure.ac src/external/gpl3/gcc/dist/libstdc++-v3: Makefile.am Makefile.in configure src/external/gpl3/gcc/dist/libstdc++-v3/config/os/bsd/netbsd: ctype_configure_char.cc src/external/gpl3/gcc/dist/libstdc++-v3/libsupc++: eh_arm.cc Log Message: merge gcc 4.8.2 r206687 (part 3). To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/dist/config.guess cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/configure \ src/external/gpl3/gcc/dist/configure.ac cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gcc/dist/gcc/config.host \ src/external/gpl3/gcc/dist/gcc/cppdefault.c \ src/external/gpl3/gcc/dist/gcc/ggc-common.c \ src/external/gpl3/gcc/dist/gcc/system.h \ src/external/gpl3/gcc/dist/gcc/tree-ssa-ccp.c cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/output.h cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/gpl3/gcc/dist/gcc/config/alpha/alpha.h \ src/external/gpl3/gcc/dist/gcc/config/alpha/netbsd.h cvs rdiff -u -r1.11 -r1.12 \ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/config/arm/t-arm cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/dist/gcc/config/ia64/netbsd.h cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/gcc/config/m68k/t-opts cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/gcc/config/mips/mips.c \ src/external/gpl3/gcc/dist/gcc/config/mips/netbsd64.h cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/dist/gcc/config/pa/pa-netbsd.h \ src/external/gpl3/gcc/dist/gcc/config/pa/t-netbsd cvs rdiff -u -r1.4 -r1.5 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd.h \ src/external/gpl3/gcc/dist/gcc/config/rs6000/netbsd64.h cvs rdiff -u -r1.1.1.2 -r1.2 \ src/external/gpl3/gcc/dist/gcc/config/rs6000/t-rs6000 cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gcc/dist/gcc/config/sh/t-sh cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/dist/gcc/config/sparc/constraints.md \ src/external/gpl3/gcc/dist/gcc/config/sparc/predicates.md cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/dist/gcc/config/vax/constraints.md cvs rdiff -u -r1.5 -r1.6 src/external/gpl3/gcc/dist/gcc/config/vax/vax.md cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gcc/dist/libcpp/configure \ src/external/gpl3/gcc/dist/libcpp/configure.ac cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/libcpp/files.c cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/libgcc/config.host cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/libgcc/unwind-dw2-fde-dip.c cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/libgcc/config/arm/t-netbsd cvs rdiff -u -r1.1.1.1 -r1.2 \ src/external/gpl3/gcc/dist/libgcc/config/m68k/fpgnulib.c cvs rdiff -u -r1.1.1.2 -r1.2 src/external/gpl3/gcc/dist/libgomp/Makefile.am \ src/external/gpl3/gcc/dist/libgomp/Makefile.in \ src/external/gpl3/gcc/dist/libgomp/configure \ src/external/gpl3/gcc/dist/libgomp/configure.ac cvs rdiff -u -r1.3 -r1.4 src/external/gpl3/gcc/dist/libiberty/Makefile.in cvs rdiff -u -r1.1.1.1 -r1.2 src/external/gpl3/gcc/dist/libitm/Makefile.am \ src/external/gpl3/gcc/dist/libitm/Makefile.in \ src/external/gpl3/gcc/dist/libitm/configure \ src/external/gpl3/gcc/dist/libitm/configure.ac cvs rdiff -u -r1.1.1.2 -r1.2 \
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits
Module Name:src
Committed By: mrg
Date: Sat Mar 1 10:28:02 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
Log Message:
convert BUILDSYMLINKS to INCSNAME_*. one less step to take.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.8 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.9
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.8 Sat Mar 1 10:00:47 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Sat Mar 1 10:28:02 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2014/03/01 10:00:47 mrg Exp $
+# $NetBSD: Makefile,v 1.9 2014/03/01 10:28:02 mrg Exp $
.include bsd.own.mk
.include bsd.init.mk
@@ -9,12 +9,14 @@
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
-BUILDINCS= basic_file.h c++allocator.h c++io.h c++locale.h
-BUILDINCS+= messages_members.h time_members.h opt_random.h
+#BUILDINCS= basic_file.h c++allocator.h c++io.h c++locale.h
+#BUILDINCS+= messages_members.h time_members.h opt_random.h
INCS= ${G_bits_headers} ${G_c_base_headers_extra} ${G_host_headers}
INCS+= gthr.h gthr-single.h gthr-posix.h gthr-default.h
-INCS+= ${BUILDINCS}
+INCS+= ${G_BASIC_FILE_H} ${G_ALLOCATOR_H} ${G_CLOCALE_H}
+INCS+= ${G_CSTDIO_H} ${G_CMESSAGES_H} ${G_CTIME_H}
+INCS+= ${G_CPU_OPT_BITS_RANDOM}
# libsupc++
INCS+= nested_exception.h hash_bytes.h atomic_lockfree_defines.h
@@ -32,20 +34,13 @@ INCSDIR= /usr/include/g++/bits
CLEANFILES+= {BUILDINCS}
-opt_random.h: ${G_CPU_OPT_BITS_RANDOM}
- cp -p ${.ALLSRC} ${.TARGET}
-basic_file.h: ${G_BASIC_FILE_H}
- cp -p ${.ALLSRC} ${.TARGET}
-c++allocator.h: ${G_ALLOCATOR_H}
- cp -p ${.ALLSRC} ${.TARGET}
-c++locale.h: $(G_CLOCALE_H)
- cp -p ${.ALLSRC} ${.TARGET}
-c++io.h: $(G_CSTDIO_H)
- cp -p ${.ALLSRC} ${.TARGET}
-messages_members.h: $(G_CMESSAGES_H)
- cp -p ${.ALLSRC} ${.TARGET}
-time_members.h: $(G_CTIME_H)
- cp -p ${.ALLSRC} ${.TARGET}
+INCSNAME_${G_BASIC_FILE_H} = basic_file.h
+INCSNAME_${G_ALLOCATOR_H} = c++allocator.h
+INCSNAME_${G_CLOCALE_H} = c++locale.h
+INCSNAME_${G_CSTDIO_H} = c++io.h
+INCSNAME_${G_CMESSAGES_H} = messages_members.h
+INCSNAME_${G_CTIME_H} = time_members.h
+INCSNAME_${G_CPU_OPT_BITS_RANDOM} = opt_random.h
.PATH: ${.CURDIR}/../../arch/${GCC_MACHINE_ARCH} \
${DIST}/libstdc++-v3/include \
CVS import: src/external/bsd/dhcpcd/dist
Module Name:src Committed By: roy Date: Sat Mar 1 11:00:44 UTC 2014 Update of /cvsroot/src/external/bsd/dhcpcd/dist In directory ivanova.netbsd.org:/tmp/cvs-serv25930 Log Message: Import dhcpcd-6.3.1 with the following changes * all issuses reported by clang static analyser have been resolved. Status: Vendor Tag: roy Release Tags: dhcpcd-6-3-1 U src/external/bsd/dhcpcd/dist/common.c U src/external/bsd/dhcpcd/dist/control.c C src/external/bsd/dhcpcd/dist/dhcpcd.c U src/external/bsd/dhcpcd/dist/duid.c U src/external/bsd/dhcpcd/dist/eloop.c C src/external/bsd/dhcpcd/dist/if-options.c U src/external/bsd/dhcpcd/dist/if-pref.c U src/external/bsd/dhcpcd/dist/net.c C src/external/bsd/dhcpcd/dist/script.c U src/external/bsd/dhcpcd/dist/dhcp-common.c U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.c U src/external/bsd/dhcpcd/dist/bpf.c U src/external/bsd/dhcpcd/dist/if-bsd.c U src/external/bsd/dhcpcd/dist/platform-bsd.c U src/external/bsd/dhcpcd/dist/arp.c C src/external/bsd/dhcpcd/dist/dhcp.c U src/external/bsd/dhcpcd/dist/ipv4.c U src/external/bsd/dhcpcd/dist/ipv4ll.c U src/external/bsd/dhcpcd/dist/ipv6.c C src/external/bsd/dhcpcd/dist/ipv6nd.c U src/external/bsd/dhcpcd/dist/dhcp6.c U src/external/bsd/dhcpcd/dist/auth.c U src/external/bsd/dhcpcd/dist/dhcpcd.conf U src/external/bsd/dhcpcd/dist/dhcpcd-definitions.conf U src/external/bsd/dhcpcd/dist/arp.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.8.in U src/external/bsd/dhcpcd/dist/dhcpcd-run-hooks.in U src/external/bsd/dhcpcd/dist/dhcpcd.8.in U src/external/bsd/dhcpcd/dist/dhcpcd.conf.5.in U src/external/bsd/dhcpcd/dist/auth.h U src/external/bsd/dhcpcd/dist/bpf-filter.h U src/external/bsd/dhcpcd/dist/common.h U src/external/bsd/dhcpcd/dist/config.h U src/external/bsd/dhcpcd/dist/control.h U src/external/bsd/dhcpcd/dist/defs.h U src/external/bsd/dhcpcd/dist/dev.h U src/external/bsd/dhcpcd/dist/dhcp-common.h U src/external/bsd/dhcpcd/dist/dhcp.h U src/external/bsd/dhcpcd/dist/dhcp6.h U src/external/bsd/dhcpcd/dist/dhcpcd-embedded.h U src/external/bsd/dhcpcd/dist/dhcpcd.h U src/external/bsd/dhcpcd/dist/duid.h U src/external/bsd/dhcpcd/dist/eloop.h U src/external/bsd/dhcpcd/dist/if-options.h U src/external/bsd/dhcpcd/dist/if-pref.h U src/external/bsd/dhcpcd/dist/ipv4.h U src/external/bsd/dhcpcd/dist/ipv4ll.h U src/external/bsd/dhcpcd/dist/ipv6.h U src/external/bsd/dhcpcd/dist/ipv6nd.h U src/external/bsd/dhcpcd/dist/net.h U src/external/bsd/dhcpcd/dist/platform.h U src/external/bsd/dhcpcd/dist/script.h U src/external/bsd/dhcpcd/dist/crypt/hmac_md5.c U src/external/bsd/dhcpcd/dist/crypt/crypt.h U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/01-test U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/02-dump U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-mtu U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/10-wpa_supplicant U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/15-timezone U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/20-resolv.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/29-lookup-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/30-hostname U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ntp.conf U src/external/bsd/dhcpcd/dist/dhcpcd-hooks/50-ypbind 5 conflicts created by this import. Use the following command to help the merge: cvs checkout -jroy:yesterday -jroy src/external/bsd/dhcpcd/dist
CVS commit: src/external/bsd/dhcpcd/dist
Module Name:src
Committed By: roy
Date: Sat Mar 1 11:04:21 UTC 2014
Modified Files:
src/external/bsd/dhcpcd/dist: dhcp.c dhcpcd.c if-options.c ipv6nd.c
script.c
Log Message:
Sync
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/bsd/dhcpcd/dist/dhcp.c
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/dhcpcd/dist/dhcpcd.c
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/dhcpcd/dist/if-options.c
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/dhcpcd/dist/ipv6nd.c
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/dhcpcd/dist/script.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/dist/dhcp.c
diff -u src/external/bsd/dhcpcd/dist/dhcp.c:1.10 src/external/bsd/dhcpcd/dist/dhcp.c:1.11
--- src/external/bsd/dhcpcd/dist/dhcp.c:1.10 Tue Feb 25 13:20:23 2014
+++ src/external/bsd/dhcpcd/dist/dhcp.c Sat Mar 1 11:04:21 2014
@@ -1,5 +1,5 @@
#include sys/cdefs.h
- __RCSID($NetBSD: dhcp.c,v 1.10 2014/02/25 13:20:23 roy Exp $);
+ __RCSID($NetBSD: dhcp.c,v 1.11 2014/03/01 11:04:21 roy Exp $);
/*
* dhcpcd - DHCP client daemon
@@ -154,7 +154,9 @@ get_option(struct dhcpcd_ctx *ctx,
if (o == opt) {
if (op) {
if (!ctx-opt_buffer) {
- ctx-opt_buffer = malloc(sizeof(*dhcp));
+ ctx-opt_buffer =
+ malloc(DHCP_OPTION_LEN +
+ BOOTFILE_LEN + SERVERNAME_LEN);
if (ctx-opt_buffer == NULL)
return NULL;
}
@@ -975,9 +977,8 @@ ssize_t
write_lease(const struct interface *ifp, const struct dhcp_message *dhcp)
{
int fd;
- ssize_t bytes = sizeof(*dhcp);
- const uint8_t *p = dhcp-options;
- const uint8_t *e = p + sizeof(dhcp-options);
+ ssize_t bytes;
+ const uint8_t *e, *p;
uint8_t l;
uint8_t o = 0;
const struct dhcp_state *state = D_CSTATE(ifp);
@@ -996,6 +997,9 @@ write_lease(const struct interface *ifp,
return -1;
/* Only write as much as we need */
+ p = dhcp-options;
+ e = p + sizeof(dhcp-options);
+ bytes = sizeof(*dhcp);
while (p e) {
o = *p;
if (o == DHO_END) {
@@ -1452,8 +1456,8 @@ checksum(const void *data, uint16_t len)
return ~sum;
}
-static ssize_t
-dhcp_makeudppacket(uint8_t **p, const uint8_t *data, size_t length,
+static struct udp_dhcp_packet *
+dhcp_makeudppacket(ssize_t *sz, const uint8_t *data, size_t length,
struct in_addr source, struct in_addr dest)
{
struct udp_dhcp_packet *udpp;
@@ -1462,7 +1466,7 @@ dhcp_makeudppacket(uint8_t **p, const ui
udpp = calloc(1, sizeof(*udpp));
if (udpp == NULL)
- return -1;
+ return NULL;
ip = udpp-ip;
udp = udpp-udp;
@@ -1497,8 +1501,8 @@ dhcp_makeudppacket(uint8_t **p, const ui
ip-ip_len = htons(sizeof(*ip) + sizeof(*udp) + length);
ip-ip_sum = checksum(ip, sizeof(*ip));
- *p = (uint8_t *)udpp;
- return sizeof(*ip) + sizeof(*udp) + length;
+ *sz = sizeof(*ip) + sizeof(*udp) + length;
+ return udpp;
}
static void
@@ -1508,7 +1512,7 @@ send_message(struct interface *iface, in
struct dhcp_state *state = D_STATE(iface);
struct if_options *ifo = iface-options;
struct dhcp_message *dhcp;
- uint8_t *udp;
+ struct udp_dhcp_packet *udp;
ssize_t len, r;
struct in_addr from, to;
in_addr_t a = 0;
@@ -1567,11 +1571,15 @@ send_message(struct interface *iface, in
dhcp_close(iface);
}
} else {
- len = dhcp_makeudppacket(udp, (uint8_t *)dhcp, len, from, to);
- if (len == -1)
- return;
- r = ipv4_sendrawpacket(iface, ETHERTYPE_IP, udp, len);
- free(udp);
+ r = 0;
+ udp = dhcp_makeudppacket(r, (uint8_t *)dhcp, len, from, to);
+ if (udp == NULL) {
+ syslog(LOG_ERR, dhcp_makeudppacket: %m);
+ } else {
+ r = ipv4_sendrawpacket(iface, ETHERTYPE_IP,
+ (uint8_t *)udp, r);
+ free(udp);
+ }
/* If we failed to send a raw packet this normally means
* we don't have the ability to work beneath the IP layer
* for this interface.
Index: src/external/bsd/dhcpcd/dist/dhcpcd.c
diff -u src/external/bsd/dhcpcd/dist/dhcpcd.c:1.2 src/external/bsd/dhcpcd/dist/dhcpcd.c:1.3
--- src/external/bsd/dhcpcd/dist/dhcpcd.c:1.2 Tue Feb 25 14:10:09 2014
+++ src/external/bsd/dhcpcd/dist/dhcpcd.c Sat Mar 1 11:04:21 2014
@@ -1,5 +1,5 @@
#include sys/cdefs.h
- __RCSID($NetBSD: dhcpcd.c,v 1.2 2014/02/25 14:10:09 roy Exp $);
+ __RCSID($NetBSD: dhcpcd.c,v 1.3 2014/03/01 11:04:21 roy Exp $);
/*
* dhcpcd - DHCP client daemon
@@ -149,7 +149,7 @@ free_globals(struct dhcpcd_ctx *ctx)
}
if (ctx-ifdc) {
for (ctx-ifdc--; ctx-ifdc = 0; ctx-ifdc--)
- free(ctx-ifdv[ctx-ifac]);
+ free(ctx-ifdv[ctx-ifdc]);
free(ctx-ifdv);
ctx-ifdv = NULL;
}
@@ -660,7 +660,7 @@ static void
init_state(struct interface *ifp, int argc, char **argv)
{
struct if_options *ifo;
- const char *reason = NULL;
+ const char *reason;
configure_interface(ifp, argc, argv);
ifo = ifp-options;
@@ -674,9 +674,7 @@ init_state(struct interface *ifp, int ar
ifo-options = ~DHCPCD_IPV6RS;
}
- if (!(ifp-ctx-options DHCPCD_TEST))
-
CVS commit: src/doc
Module Name:src Committed By: roy Date: Sat Mar 1 11:08:11 UTC 2014 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note import of dhcpcd-6.3.1 To generate a diff of this commit: cvs rdiff -u -r1.1098 -r1.1099 src/doc/3RDPARTY cvs rdiff -u -r1.1894 -r1.1895 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.1098 src/doc/3RDPARTY:1.1099 --- src/doc/3RDPARTY:1.1098 Sat Mar 1 03:29:01 2014 +++ src/doc/3RDPARTY Sat Mar 1 11:08:11 2014 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1098 2014/03/01 03:29:01 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1099 2014/03/01 11:08:11 roy Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -302,8 +302,8 @@ Notes: Use the dhcp2netbsd script. Package: dhcpcd -Version: 6.3.0 -Current Vers: 6.3.0 +Version: 6.3.1 +Current Vers: 6.3.1 Maintainer: roy Archive Site: ftp://roy.marples.name/pub/dhcpcd/ Home Page: http://roy.marples.name/projects/dhcpcd/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1894 src/doc/CHANGES:1.1895 --- src/doc/CHANGES:1.1894 Sat Mar 1 03:29:01 2014 +++ src/doc/CHANGES Sat Mar 1 11:08:11 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1894 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1895 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -358,3 +358,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: mcp48x1dac(4): Add preliminary support for Microchip MCP48x1 family of Digital-to-Analog converters. [rkujawa 20140225] bind: update to 9.10.0b1 [christos 20130228] + dhcpcd(8): Import dhcpcd-6.3.1 [roy 20140301]
CVS commit: src/external/bsd/bind/dist/lib/dns/include/dns
Module Name:src Committed By: dsl Date: Sat Mar 1 12:12:57 UTC 2014 Modified Files: src/external/bsd/bind/dist/lib/dns/include/dns: rbt.h Log Message: Add missing #endif To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/dns/include/dns/rbt.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/bind/dist/lib/dns/include/dns/rbt.h diff -u src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h:1.8 src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h:1.9 --- src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h:1.8 Sat Mar 1 03:24:37 2014 +++ src/external/bsd/bind/dist/lib/dns/include/dns/rbt.h Sat Mar 1 12:12:57 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: rbt.h,v 1.8 2014/03/01 03:24:37 christos Exp $ */ +/* $NetBSD: rbt.h,v 1.9 2014/03/01 12:12:57 dsl Exp $ */ /* * Copyright (C) 2004-2009, 2012-2014 Internet Systems Consortium, Inc. (ISC) @@ -1035,6 +1035,7 @@ dns_rbtnode_refdecrement(dns_rbtnode_t * if ((refs) != NULL) \ (*refs) = (node)-references; \ } while (/*CONSTCOND*/0) +#endif #endif /* DNS_RBT_USEISCREFCOUNT */ ISC_LANG_ENDDECLS
CVS commit: src/sys/arch/zaurus/conf
Module Name:src Committed By: joerg Date: Sat Mar 1 12:40:50 UTC 2014 Modified Files: src/sys/arch/zaurus/conf: INSTALL Log Message: Typo To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/zaurus/conf/INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/zaurus/conf/INSTALL diff -u src/sys/arch/zaurus/conf/INSTALL:1.20 src/sys/arch/zaurus/conf/INSTALL:1.21 --- src/sys/arch/zaurus/conf/INSTALL:1.20 Fri Sep 13 15:00:47 2013 +++ src/sys/arch/zaurus/conf/INSTALL Sat Mar 1 12:40:50 2014 @@ -1,4 +1,4 @@ -# $NetBSD: INSTALL,v 1.20 2013/09/13 15:00:47 christos Exp $ +# $NetBSD: INSTALL,v 1.21 2014/03/01 12:40:50 joerg Exp $ # # INSTALL config file (GENERIC with memory disk root) # @@ -13,7 +13,7 @@ options MEMORY_DISK_ROOT_SIZE=4424 # si options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode # for reduce kernel size. -# kernei size must be less than 5MB. +# kernel size must be less than 5MB. # - see src/sys/arch/zaurus/stand/zbsdmod/zbsdmod.c:bsdimage[] makeoptions COPTS=-Os
CVS commit: src/sys/arch/hpcarm/hpcarm
Module Name:src Committed By: joerg Date: Sat Mar 1 12:48:38 UTC 2014 Modified Files: src/sys/arch/hpcarm/hpcarm: locore.S Log Message: Modernize asm syntax To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hpcarm/hpcarm/locore.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/hpcarm/hpcarm/locore.S diff -u src/sys/arch/hpcarm/hpcarm/locore.S:1.16 src/sys/arch/hpcarm/hpcarm/locore.S:1.17 --- src/sys/arch/hpcarm/hpcarm/locore.S:1.16 Sat Feb 22 19:16:06 2014 +++ src/sys/arch/hpcarm/hpcarm/locore.S Sat Mar 1 12:48:38 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.16 2014/02/22 19:16:06 matt Exp $ */ +/* $NetBSD: locore.S,v 1.17 2014/03/01 12:48:38 joerg Exp $ */ /* * Copyright (C) 1994-1997 Mark Brinicombe @@ -63,7 +63,7 @@ ASENTRY_NP(start) /* Disable PID virtual address mapping */ mov r4, #0 - mcr 15, 0, r4, c13, c0, 0 + mcr p15, 0, r4, c13, c0, 0 #if defined(CPU_XSCALE_PXA250) || defined(CPU_XSCALE_PXA270) /* @@ -211,8 +211,8 @@ ENTRY_NP(cpu_reset) * Hurl ourselves into the ROM */ mov r0, #(CPU_CONTROL_32BP_ENABLE | CPU_CONTROL_32BD_ENABLE) - mcr 15, 0, r0, c1, c0, 0 - mcr 15, 0, r0, c8, c7, 0 + mcr p15, 0, r0, c1, c0, 0 + mcr p15, 0, r0, c8, c7, 0 mov pc, r4 /*
CVS commit: src/sys/netipsec
Module Name:src Committed By: joerg Date: Sat Mar 1 12:55:23 UTC 2014 Modified Files: src/sys/netipsec: key.c Log Message: Remove modification of an unused uninitialized variable. To generate a diff of this commit: cvs rdiff -u -r1.85 -r1.86 src/sys/netipsec/key.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/netipsec/key.c diff -u src/sys/netipsec/key.c:1.85 src/sys/netipsec/key.c:1.86 --- src/sys/netipsec/key.c:1.85 Tue Feb 25 18:30:12 2014 +++ src/sys/netipsec/key.c Sat Mar 1 12:55:23 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: key.c,v 1.85 2014/02/25 18:30:12 pooka Exp $ */ +/* $NetBSD: key.c,v 1.86 2014/03/01 12:55:23 joerg Exp $ */ /* $FreeBSD: src/sys/netipsec/key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */ /* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */ @@ -32,7 +32,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: key.c,v 1.85 2014/02/25 18:30:12 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: key.c,v 1.86 2014/03/01 12:55:23 joerg Exp $); /* * This code is referd to RFC 2367 @@ -6997,7 +6997,6 @@ key_setdump_chain(u_int8_t req_satype, i u_int8_t state; int cnt; struct mbuf *m, *n, *prev; - int totlen; *lenp = 0; @@ -7057,7 +7056,6 @@ key_setdump_chain(u_int8_t req_satype, i return (NULL); } -totlen += n-m_pkthdr.len; if (!m) m = n; else
CVS commit: src/sys/kern
Module Name:src
Committed By: riastradh
Date: Sat Mar 1 14:15:15 UTC 2014
Modified Files:
src/sys/kern: kern_rndsink.c
Log Message:
Kick on-demand entropy sources in rndsinks_distribute.
Partial workaround for indefinite hangs when entropy is scarce or
buffered up. We need to do more to handle entropy that has been
buffered up -- see the comment for details -- but this will help for
now.
Problem noted by pooka.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/kern/kern_rndsink.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_rndsink.c
diff -u src/sys/kern/kern_rndsink.c:1.7 src/sys/kern/kern_rndsink.c:1.8
--- src/sys/kern/kern_rndsink.c:1.7 Fri Oct 25 11:35:55 2013
+++ src/sys/kern/kern_rndsink.c Sat Mar 1 14:15:15 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_rndsink.c,v 1.7 2013/10/25 11:35:55 martin Exp $ */
+/* $NetBSD: kern_rndsink.c,v 1.8 2014/03/01 14:15:15 riastradh Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_rndsink.c,v 1.7 2013/10/25 11:35:55 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_rndsink.c,v 1.8 2014/03/01 14:15:15 riastradh Exp $);
#include sys/param.h
#include sys/types.h
@@ -210,7 +210,20 @@ rndsinks_enqueue(struct rndsink *rndsink
KASSERT(mutex_owned(rndsinks_lock));
- /* XXX Kick any on-demand entropy sources too. */
+ /*
+ * XXX This should request only rndsink-rs_bytes bytes of
+ * entropy, but that might get buffered up indefinitely because
+ * kern_rndq has no bound on the duration before it will
+ * process queued entropy samples. For now, request refilling
+ * the pool altogether so that the buffer will fill up and get
+ * processed. Later, we ought to (a) bound the duration before
+ * queued entropy samples get processed, and (b) add a target
+ * or something -- as soon as we get that much from the entropy
+ * sources, distribute it.
+ */
+ mutex_spin_enter(rndpool_mtx);
+ rnd_getmore(RND_POOLBITS / NBBY);
+ mutex_spin_exit(rndpool_mtx);
switch (rndsink-rsink_state) {
case RNDSINK_IDLE:
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: dsl Date: Sat Mar 1 15:41:00 UTC 2014 Modified Files: src/distrib/sets/lists/base: ad.arm ad.mips md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/debug: ad.arm ad.mips md.amd64 md.sparc64 shl.mi Log Message: Replace all the libbind9.so.7 with libbind9.so.8. Hmm... why isn't the list of 32bit compat libs based on the normal list? To generate a diff of this commit: cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/base/ad.arm cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/base/ad.mips cvs rdiff -u -r1.226 -r1.227 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.213 -r1.214 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.691 -r1.692 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/debug/ad.arm cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/debug/ad.mips cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/debug/md.amd64 \ src/distrib/sets/lists/debug/md.sparc64 cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.arm diff -u src/distrib/sets/lists/base/ad.arm:1.36 src/distrib/sets/lists/base/ad.arm:1.37 --- src/distrib/sets/lists/base/ad.arm:1.36 Sat Mar 1 03:28:06 2014 +++ src/distrib/sets/lists/base/ad.arm Sat Mar 1 15:41:00 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.36 2014/03/01 03:28:06 christos Exp $ +# $NetBSD: ad.arm,v 1.37 2014/03/01 15:41:00 dsl Exp $ ./lib/oabi base-compat-shlib compat ./lib/oabi/npf base-npf-shlib compat ./lib/oabi/npf/ext_log.so base-npf-shlib compat,pic @@ -81,8 +81,8 @@ ./usr/lib/oabi/libatf-c.so.0.0 base-compat-shlib compat,pic,atf ./usr/lib/oabi/libbfd.so.13 base-compat-shlib compat,pic,binutils ./usr/lib/oabi/libbfd.so.13.0 base-compat-shlib compat,pic,binutils -./usr/lib/oabi/libbind9.so.7 base-compat-shlib compat,pic -./usr/lib/oabi/libbind9.so.7.0 base-compat-shlib compat,pic +./usr/lib/oabi/libbind9.so.8 base-compat-shlib compat,pic +./usr/lib/oabi/libbind9.so.8.0 base-compat-shlib compat,pic ./usr/lib/oabi/libbluetooth.so.4 base-compat-shlib compat,pic ./usr/lib/oabi/libbluetooth.so.4.2 base-compat-shlib compat,pic ./usr/lib/oabi/libbsdmalloc.so.0 base-compat-shlib compat,pic Index: src/distrib/sets/lists/base/ad.mips diff -u src/distrib/sets/lists/base/ad.mips:1.32 src/distrib/sets/lists/base/ad.mips:1.33 --- src/distrib/sets/lists/base/ad.mips:1.32 Sat Mar 1 03:28:06 2014 +++ src/distrib/sets/lists/base/ad.mips Sat Mar 1 15:41:00 2014 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips,v 1.32 2014/03/01 03:28:06 christos Exp $ +# $NetBSD: ad.mips,v 1.33 2014/03/01 15:41:00 dsl Exp $ ./lib/64 base-compat-shlib compat,arch64 ./lib/64/npf base-npf-shlib compat,arch64 ./lib/64/npf/ext_log.sobase-npf-shlib compat,pic,arch64 @@ -83,8 +83,8 @@ ./usr/lib/64/libatf-c.so.0.0 base-compat-shlib compat,pic,atf,arch64 ./usr/lib/64/libbfd.so.13 base-compat-shlib compat,pic,binutils,arch64 ./usr/lib/64/libbfd.so.13.0 base-compat-shlib compat,pic,binutils,arch64 -./usr/lib/64/libbind9.so.7 base-compat-shlib compat,pic,arch64 -./usr/lib/64/libbind9.so.7.0 base-compat-shlib compat,pic,arch64 +./usr/lib/64/libbind9.so.8 base-compat-shlib compat,pic,arch64 +./usr/lib/64/libbind9.so.8.0 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libbluetooth.so.4 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libbluetooth.so.4.2 base-compat-shlib compat,pic,arch64 ./usr/lib/64/libbsdmalloc.so.0 base-compat-shlib compat,pic,arch64 @@ -423,8 +423,8 @@ ./usr/lib/o32/libatf-c.so.0.0 base-compat-shlib compat,pic,atf,arch64 ./usr/lib/o32/libbfd.so.13 base-compat-shlib compat,pic,binutils,arch64 ./usr/lib/o32/libbfd.so.13.0 base-compat-shlib compat,pic,binutils,arch64 -./usr/lib/o32/libbind9.so.7 base-compat-shlib compat,pic,arch64 -./usr/lib/o32/libbind9.so.7.0 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libbind9.so.8 base-compat-shlib compat,pic,arch64 +./usr/lib/o32/libbind9.so.8.0 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libbluetooth.so.4 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libbluetooth.so.4.2 base-compat-shlib compat,pic,arch64 ./usr/lib/o32/libbsdmalloc.so.0 base-compat-shlib compat,pic,arch64 Index: src/distrib/sets/lists/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.226 src/distrib/sets/lists/base/md.amd64:1.227 --- src/distrib/sets/lists/base/md.amd64:1.226 Sat Mar 1 03:28:06 2014 +++ src/distrib/sets/lists/base/md.amd64 Sat Mar 1 15:41:00 2014 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.226 2014/03/01 03:28:06 christos Exp $ +# $NetBSD: md.amd64,v 1.227 2014/03/01 15:41:00 dsl Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./lib/i386 base-compat-shlib compat @@ -75,8 +75,8 @@ ./usr/lib/i386/libatf-c.so.0.0
CVS commit: src/sys/netinet
Module Name:src Committed By: maxv Date: Sat Mar 1 16:46:14 UTC 2014 Modified Files: src/sys/netinet: tcp_input.c Log Message: ';;' - ';' no functional change spotted by my code scanner ok christos@ To generate a diff of this commit: cvs rdiff -u -r1.330 -r1.331 src/sys/netinet/tcp_input.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/netinet/tcp_input.c diff -u src/sys/netinet/tcp_input.c:1.330 src/sys/netinet/tcp_input.c:1.331 --- src/sys/netinet/tcp_input.c:1.330 Tue Nov 12 09:02:05 2013 +++ src/sys/netinet/tcp_input.c Sat Mar 1 16:46:14 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: tcp_input.c,v 1.330 2013/11/12 09:02:05 kefren Exp $ */ +/* $NetBSD: tcp_input.c,v 1.331 2014/03/01 16:46:14 maxv Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -148,7 +148,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: tcp_input.c,v 1.330 2013/11/12 09:02:05 kefren Exp $); +__KERNEL_RCSID(0, $NetBSD: tcp_input.c,v 1.331 2014/03/01 16:46:14 maxv Exp $); #include opt_inet.h #include opt_ipsec.h @@ -1100,7 +1100,7 @@ static void tcp_vtw_input(struct tcphdr /* We only support this in the !NOFDREF case, which * is to say: not here. */ -goto dropwithreset;; +goto dropwithreset; } /* * If window is closed can only take segments at
CVS commit: src/sys/dev/acpi
Module Name:src
Committed By: maxv
Date: Sat Mar 1 16:59:42 UTC 2014
Modified Files:
src/sys/dev/acpi: tpm_acpi.c
Log Message:
Some {} are missing. The behavior is thus wrong: the code always jumps to
out1.
Spotted by my code scanner.
ok christos@
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/tpm_acpi.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/acpi/tpm_acpi.c
diff -u src/sys/dev/acpi/tpm_acpi.c:1.3 src/sys/dev/acpi/tpm_acpi.c:1.4
--- src/sys/dev/acpi/tpm_acpi.c:1.3 Sun Jan 22 20:25:25 2012
+++ src/sys/dev/acpi/tpm_acpi.c Sat Mar 1 16:59:41 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: tpm_acpi.c,v 1.3 2012/01/22 20:25:25 christos Exp $ */
+/* $NetBSD: tpm_acpi.c,v 1.4 2014/03/01 16:59:41 maxv Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tpm_acpi.c,v 1.3 2012/01/22 20:25:25 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: tpm_acpi.c,v 1.4 2014/03/01 16:59:41 maxv Exp $);
#include sys/param.h
#include sys/device.h
@@ -185,9 +185,10 @@ tpm_acpi_attach(device_t parent, device_
else
inum = irq-ar_irq;
- if ((rv = (*sc-sc_init)(sc, inum, device_xname(sc-sc_dev))) != 0)
+ if ((rv = (*sc-sc_init)(sc, inum, device_xname(sc-sc_dev))) != 0) {
aprint_error_dev(sc-sc_dev, cannot init device %d\n, rv);
goto out1;
+ }
if (inum != -1
(sc-sc_ih = isa_intr_establish(aa-aa_ic, irq-ar_irq,
CVS commit: src/sys/kern
Module Name:src
Committed By: dsl
Date: Sat Mar 1 17:27:48 UTC 2014
Modified Files:
src/sys/kern: kern_sysctl.c
Log Message:
When converting out of range 64bit sysctl values to 'int' (because of
an 'int' sized read) don't assume that sizeof (int) is 4.
To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 src/sys/kern/kern_sysctl.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_sysctl.c
diff -u src/sys/kern/kern_sysctl.c:1.247 src/sys/kern/kern_sysctl.c:1.248
--- src/sys/kern/kern_sysctl.c:1.247 Thu Feb 27 22:50:52 2014
+++ src/sys/kern/kern_sysctl.c Sat Mar 1 17:27:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sysctl.c,v 1.247 2014/02/27 22:50:52 dsl Exp $ */
+/* $NetBSD: kern_sysctl.c,v 1.248 2014/03/01 17:27:48 dsl Exp $ */
/*-
* Copyright (c) 2003, 2007, 2008 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: kern_sysctl.c,v 1.247 2014/02/27 22:50:52 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: kern_sysctl.c,v 1.248 2014/03/01 17:27:48 dsl Exp $);
#include opt_defcorename.h
#include ksyms.h
@@ -1513,7 +1513,7 @@ sysctl_lookup(SYSCTLFN_ARGS)
switch (SYSCTL_TYPE(rnode-sysctl_flags)) {
case CTLTYPE_INT:
/* Allow for 64bit read of 32bit value */
- if (*oldlenp == sizeof (uint64_t)) {
+ if (*oldlenp != sz *oldlenp == sizeof (uint64_t)) {
qval = *(int *)d;
d_out = qval;
sz = sizeof (uint64_t);
@@ -1521,9 +1521,12 @@ sysctl_lookup(SYSCTLFN_ARGS)
break;
case CTLTYPE_QUAD:
/* Allow for 32bit read of 64bit value */
- if (*oldlenp == sizeof (int)) {
+ if (*oldlenp != sz *oldlenp == sizeof (int)) {
qval = *(uint64_t *)d;
- ival = qval 0x1 ? qval : 0x;
+ ival = qval;
+ /* Replace out of range values with -1 */
+ if (ival != qval)
+ival = -1;
d_out = ival;
sz = sizeof (int);
}
CVS commit: src/sys/uvm
Module Name:src
Committed By: christos
Date: Sat Mar 1 18:32:01 UTC 2014
Modified Files:
src/sys/uvm: uvm_pager.c
Log Message:
only check that npages fit, if we are going to add npages to swpgonly.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/uvm/uvm_pager.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/uvm/uvm_pager.c
diff -u src/sys/uvm/uvm_pager.c:1.109 src/sys/uvm/uvm_pager.c:1.110
--- src/sys/uvm/uvm_pager.c:1.109 Fri Oct 25 16:27:29 2013
+++ src/sys/uvm/uvm_pager.c Sat Mar 1 13:32:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: uvm_pager.c,v 1.109 2013/10/25 20:27:29 martin Exp $ */
+/* $NetBSD: uvm_pager.c,v 1.110 2014/03/01 18:32:01 christos Exp $ */
/*
* Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uvm_pager.c,v 1.109 2013/10/25 20:27:29 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: uvm_pager.c,v 1.110 2014/03/01 18:32:01 christos Exp $);
#include opt_uvmhist.h
#include opt_readahead.h
@@ -468,9 +468,10 @@ uvm_aio_aiodone_pages(struct vm_page **p
/* these pages are now only in swap. */
mutex_enter(uvm_swap_data_lock);
- KASSERT(uvmexp.swpgonly + npages = uvmexp.swpginuse);
- if (error != ENOMEM)
+ if (error != ENOMEM) {
+ KASSERT(uvmexp.swpgonly + npages = uvmexp.swpginuse);
uvmexp.swpgonly += npages;
+ }
mutex_exit(uvm_swap_data_lock);
if (error) {
if (error != ENOMEM)
CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k
Module Name:src
Committed By: tsutsui
Date: Sat Mar 1 19:39:04 UTC 2014
Added Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile
Log Message:
Add a reachover Makefile to build X11R7'fied MD X68k server.
See my post on port-x68k@ for details:
http://mail-index.netbsd.org/port-x68k/2014/02/27/msg43.html
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u /dev/null src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.1
--- /dev/null Sat Mar 1 19:39:04 2014
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile Sat Mar 1 19:39:03 2014
@@ -0,0 +1,94 @@
+# $NetBSD: Makefile,v 1.1 2014/03/01 19:39:03 tsutsui Exp $
+
+.include bsd.own.mk
+
+PROG= X68k
+BINMODE= 4711
+
+SYMLINKS= ${X11BINDIR}/X68k ${X11BINDIR}/X
+
+FILES= X68kConfig
+FILESDIR= ${X11ETCDIR}
+
+.include ../../../Makefile.serverlib
+.include ../../../Makefile.servermod
+
+WARNS?= 2
+
+.PATH: ${X11SRCDIR.xorg-server}/hw/netbsd/x68k
+SRCS= x68kInit.c x68kConfig.c x68kIo.c x68kMouse.c x68kKbd.c x68kKeyMap.c \
+ x68kFb.c x68kGraph.c x68kText.c
+
+.PATH: ${X11SRCDIR.xorg-server}/Xext
+SRCS+= dpmsstubs.c
+
+.PATH: ${X11SRCDIR.xorg-server}/Xi
+SRCS+= stubs.c
+
+.PATH: ${X11SRCDIR.xorg-server}/mi
+SRCS+= miinitext.c
+
+.PATH: ${X11SRCDIR.xorg-server}/fb
+SRCS+= fbcmap_mi.c
+
+CPPFLAGS+= -I${X11SRCDIR.xorg-server}/include \
+ -I${X11SRCDIR.xorg-server}/hw/netbsd/x68k \
+ -I${X11SRCDIR.xorg-server}/fb \
+ -I${X11SRCDIR.xorg-server}/mi \
+ -I${X11SRCDIR.xorg-server}/render \
+ -I${DESTDIR}${X11INCDIR}/X11 \
+
+CPPFLAGS+= -UXFree86LOADER -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \
+ -UXF86DRI -UXF86BIGFONT
+
+CPPFLAGS.x68kConfig.c= -DX11_LIBDIR=\${X11ETCDIR}\
+
+.include ../../../Makefile.Xserver
+
+LDADD+= ${LDADD.dix} \
+ ${LDADD.fb} \
+ ${LDADD.mi} \
+ ${LDADD.xkb} \
+ ${LDADD.xkbstubs} \
+ ${LDADD.randr} \
+ ${LDADD.Xext} \
+ ${LDADD.composite} \
+ ${LDADD.render} \
+ ${LDADD.os} \
+ ${LDADD.xfixes} \
+ ${LDADD.damageext} \
+ ${LDADD.miext/damage} \
+ ${LDADD.miext/shadow} \
+ ${LDADD.miext/sync} \
+ ${LDADD.Xi} \
+ -lXfont \
+ -lpixman-1 \
+ -lXext \
+ -lX11 \
+ -lz \
+ -lm
+
+DPADD+= ${LDADD.dix} \
+ ${DPADD.fb} \
+ ${DPADD.mi} \
+ ${DPADD.xkb} \
+ ${DPADD.randr} \
+ ${DPADD.Xext} \
+ ${DPADD.composite} \
+ ${DPADD.render} \
+ ${DPADD.os} \
+ ${DPADD.xfixes} \
+ ${DPADD.damageext} \
+ ${DPADD.miext/damage} \
+ ${DPADD.miext/shadow} \
+ ${DPADD.miext/sync} \
+ ${DPADD.Xi} \
+ ${LIBXFONT} \
+ ${LIBPIXMAN-1} \
+ ${LIBXEXT} \
+ ${LIBX11} \
+ ${LIBZ} \
+ ${LIBM}
+
+.include bsd.x11.mk
+.include bsd.prog.mk
CVS commit: src/external/mit/xorg/server/xorg-server/hw
Module Name:src
Committed By: tsutsui
Date: Sat Mar 1 19:45:29 UTC 2014
Modified Files:
src/external/mit/xorg/server/xorg-server/hw: Makefile
Log Message:
Enable SUBDIR+=netbsd/x68k if ${XSERVER_X68K} != no.
Now we've got it after this glue Makefile was initially added back in 2008.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/server/xorg-server/hw/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/mit/xorg/server/xorg-server/hw/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/Makefile:1.4 src/external/mit/xorg/server/xorg-server/hw/Makefile:1.5
--- src/external/mit/xorg/server/xorg-server/hw/Makefile:1.4 Sat Feb 14 10:46:06 2009
+++ src/external/mit/xorg/server/xorg-server/hw/Makefile Sat Mar 1 19:45:29 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2009/02/14 10:46:06 abs Exp $
+# $NetBSD: Makefile,v 1.5 2014/03/01 19:45:29 tsutsui Exp $
.include ../Makefile.common
@@ -7,11 +7,11 @@ SUBDIR= xnest vfb
SUBDIR+= xfree86
.endif
-.if 0
.if ${XSERVER_X68K} != no
SUBDIR+=netbsd/x68k
.endif
+.if 0
.if ${XSERVER_XALPHANETBSD} != no
SUBDIR+=netbsd/alpha
.endif
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: tsutsui Date: Sat Mar 1 19:46:43 UTC 2014 Modified Files: src/distrib/sets/lists/xetc: md.x68k src/distrib/sets/lists/xserver: md.x68k Log Message: Add X11R7 X68k server stuff. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xetc/md.x68k cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xserver/md.x68k 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/xetc/md.x68k diff -u src/distrib/sets/lists/xetc/md.x68k:1.3 src/distrib/sets/lists/xetc/md.x68k:1.4 --- src/distrib/sets/lists/xetc/md.x68k:1.3 Tue Sep 2 02:24:12 2008 +++ src/distrib/sets/lists/xetc/md.x68k Sat Mar 1 19:46:43 2014 @@ -1,2 +1,3 @@ -# $NetBSD: md.x68k,v 1.3 2008/09/02 02:24:12 lukem Exp $ +# $NetBSD: md.x68k,v 1.4 2014/03/01 19:46:43 tsutsui Exp $ ./etc/X11/X68kConfig -unknown- x11 +./etc/X11/X68kConfig -unknown- xorg Index: src/distrib/sets/lists/xserver/md.x68k diff -u src/distrib/sets/lists/xserver/md.x68k:1.17 src/distrib/sets/lists/xserver/md.x68k:1.18 --- src/distrib/sets/lists/xserver/md.x68k:1.17 Mon Feb 9 16:28:54 2009 +++ src/distrib/sets/lists/xserver/md.x68k Sat Mar 1 19:46:43 2014 @@ -1,6 +1,11 @@ -# $NetBSD: md.x68k,v 1.17 2009/02/09 16:28:54 abs Exp $ +# $NetBSD: md.x68k,v 1.18 2014/03/01 19:46:43 tsutsui Exp $ ./usr/X11R6/bin/X -unknown- x11 ./usr/X11R6/bin/X68k -unknown- x11 ./usr/X11R6/man/cat1/X68k.0-unknown- .cat,x11 ./usr/X11R6/man/html1/X68k.html-unknown- html,x11 ./usr/X11R6/man/man1/X68k.1-unknown- .man,x11 +./usr/X11R7/bin/X -unknown- xorg +./usr/X11R7/bin/X68k -unknown- xorg +./usr/X11R7/man/cat1/X68k.0-unknown- .cat,xorg +./usr/X11R7/man/html1/X68k.html-unknown- html,xorg +./usr/X11R7/man/man1/X68k.1-unknown- .man,xorg
CVS commit: src/share/mk
Module Name:src
Committed By: tsutsui
Date: Sat Mar 1 20:34:17 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Switch x68k to X11FLAVOUR=Xorg, including a working monolithic X68k server.
Confirmed that build.sh -m x68k -x release gets no error.
To generate a diff of this commit:
cvs rdiff -u -r1.773 -r1.774 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.773 src/share/mk/bsd.own.mk:1.774
--- src/share/mk/bsd.own.mk:1.773 Fri Feb 28 09:42:33 2014
+++ src/share/mk/bsd.own.mk Sat Mar 1 20:34:17 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.773 2014/02/28 09:42:33 martin Exp $
+# $NetBSD: bsd.own.mk,v 1.774 2014/03/01 20:34:17 tsutsui Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -973,8 +973,7 @@ ${var}?=no
${MACHINE} == amiga || \
${MACHINE} == mac68k || \
${MACHINE} == pmax || \
-${MACHINE} == sun3 || \
-${MACHINE} == x68k
+${MACHINE} == sun3
X11FLAVOUR?= XFree86
.else
X11FLAVOUR?= Xorg
CVS commit: src/doc
Module Name:src Committed By: tsutsui Date: Sat Mar 1 20:58:04 UTC 2014 Modified Files: src/doc: CHANGES Log Message: Note x68k is now using Xorg. Also note (untested) ews4800mips and newsmips Xorg switch. To generate a diff of this commit: cvs rdiff -u -r1.1895 -r1.1896 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/CHANGES diff -u src/doc/CHANGES:1.1895 src/doc/CHANGES:1.1896 --- src/doc/CHANGES:1.1895 Sat Mar 1 11:08:11 2014 +++ src/doc/CHANGES Sat Mar 1 20:58:04 2014 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1895 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1896 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -345,6 +345,8 @@ Changes from NetBSD 6.0 to NetBSD 7.0: [mlelstv 20140121] ohci(4): Support the National Semiconductor PC87560 as found in many hppa machines. [skrll 20140128] + ews4800mips: Switch to X11FLAVOUR=Xorg. Untested. [tsutsui 20140131] + newsmips: Switch to X11FLAVOUR=Xorg. Untested. [tsutsui 20140131] npf: Added support for CDB based tables. [rmind 20140206] npf: Added support for static (stateless) NAT. [rmind 20140207] atf(7): Import atf 0.19. [jmmv 20140208] @@ -359,3 +361,5 @@ Changes from NetBSD 6.0 to NetBSD 7.0: Digital-to-Analog converters. [rkujawa 20140225] bind: update to 9.10.0b1 [christos 20130228] dhcpcd(8): Import dhcpcd-6.3.1 [roy 20140301] + x68k: Switch to X11FLAVOUR=Xorg, including X68k monolithic server. + [tsutsui 20140301]
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits
Module Name:src
Committed By: mrg
Date: Sat Mar 1 21:03:01 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
Log Message:
revert the previous; it doesn't work.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.9 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.10
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.9 Sat Mar 1 10:28:02 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Sat Mar 1 21:03:01 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2014/03/01 10:28:02 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2014/03/01 21:03:01 mrg Exp $
.include bsd.own.mk
.include bsd.init.mk
@@ -9,14 +9,12 @@
DIST= ${NETBSDSRCDIR}/external/gpl3/gcc/dist
-#BUILDINCS= basic_file.h c++allocator.h c++io.h c++locale.h
-#BUILDINCS+= messages_members.h time_members.h opt_random.h
+BUILDINCS= basic_file.h c++allocator.h c++io.h c++locale.h
+BUILDINCS+= messages_members.h time_members.h opt_random.h
INCS= ${G_bits_headers} ${G_c_base_headers_extra} ${G_host_headers}
INCS+= gthr.h gthr-single.h gthr-posix.h gthr-default.h
-INCS+= ${G_BASIC_FILE_H} ${G_ALLOCATOR_H} ${G_CLOCALE_H}
-INCS+= ${G_CSTDIO_H} ${G_CMESSAGES_H} ${G_CTIME_H}
-INCS+= ${G_CPU_OPT_BITS_RANDOM}
+INCS+= ${BUILDINCS}
# libsupc++
INCS+= nested_exception.h hash_bytes.h atomic_lockfree_defines.h
@@ -34,13 +32,20 @@ INCSDIR= /usr/include/g++/bits
CLEANFILES+= {BUILDINCS}
-INCSNAME_${G_BASIC_FILE_H} = basic_file.h
-INCSNAME_${G_ALLOCATOR_H} = c++allocator.h
-INCSNAME_${G_CLOCALE_H} = c++locale.h
-INCSNAME_${G_CSTDIO_H} = c++io.h
-INCSNAME_${G_CMESSAGES_H} = messages_members.h
-INCSNAME_${G_CTIME_H} = time_members.h
-INCSNAME_${G_CPU_OPT_BITS_RANDOM} = opt_random.h
+opt_random.h: ${G_CPU_OPT_BITS_RANDOM}
+ cp -p ${.ALLSRC} ${.TARGET}
+basic_file.h: ${G_BASIC_FILE_H}
+ cp -p ${.ALLSRC} ${.TARGET}
+c++allocator.h: ${G_ALLOCATOR_H}
+ cp -p ${.ALLSRC} ${.TARGET}
+c++locale.h: $(G_CLOCALE_H)
+ cp -p ${.ALLSRC} ${.TARGET}
+c++io.h: $(G_CSTDIO_H)
+ cp -p ${.ALLSRC} ${.TARGET}
+messages_members.h: $(G_CMESSAGES_H)
+ cp -p ${.ALLSRC} ${.TARGET}
+time_members.h: $(G_CTIME_H)
+ cp -p ${.ALLSRC} ${.TARGET}
.PATH: ${.CURDIR}/../../arch/${GCC_MACHINE_ARCH} \
${DIST}/libstdc++-v3/include \
CVS commit: src/tests/lib/libm
Module Name:src
Committed By: dsl
Date: Sat Mar 1 21:08:39 UTC 2014
Modified Files:
src/tests/lib/libm: t_acos.c
Log Message:
Some of the acos() tests seem to fail on some systems.
Sorting out why isn't helped by the tests not reporting the erronous value.
Change the 'boilerplate' pattern used so that all the values are output.
Reduce the amount of faffy red tape as well.
Some of these reductions could be shared with other libm tests, but for
the moment they are defined in this file.
All these tests pass on my amd64 system, and when I run amd64 qemu.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/lib/libm/t_acos.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/lib/libm/t_acos.c
diff -u src/tests/lib/libm/t_acos.c:1.4 src/tests/lib/libm/t_acos.c:1.5
--- src/tests/lib/libm/t_acos.c:1.4 Tue Apr 9 12:11:04 2013
+++ src/tests/lib/libm/t_acos.c Sat Mar 1 21:08:39 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_acos.c,v 1.4 2013/04/09 12:11:04 isaki Exp $ */
+/* $NetBSD: t_acos.c,v 1.5 2014/03/01 21:08:39 dsl Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -32,188 +32,100 @@
#include atf-c.h
#include math.h
-static const struct {
- double x;
- double y;
-} values[] = {
- { -1,M_PI, },
- { -0.99, 3.53180265366, },
- { -0.5, 2.094395102393195, },
- { -0.1, 1.670963747956456, },
- { 0,M_PI / 2, },
- { 0.1, 1.47062890567, },
- { 0.5, 1.047197551196598, },
- { 0.99, 0.141539473324427, },
-};
-
/*
- * acos(3)
+ * Check result of fn(arg) is correct within the bounds.
+ * Should be ok to do the checks using 'double' for 'float' functions.
*/
-ATF_TC(acos_nan);
-ATF_TC_HEAD(acos_nan, tc)
-{
- atf_tc_set_md_var(tc, descr, Test acos(NaN) == NaN);
-}
-
-ATF_TC_BODY(acos_nan, tc)
-{
-#ifndef __vax__
- const double x = 0.0L / 0.0L;
-
- if (isnan(acos(x)) == 0)
- atf_tc_fail_nonfatal(acos(NaN) != NaN);
-#endif
-}
-
-ATF_TC(acos_inf_neg);
-ATF_TC_HEAD(acos_inf_neg, tc)
-{
- atf_tc_set_md_var(tc, descr, Test acos(-Inf) == NaN);
-}
-
-ATF_TC_BODY(acos_inf_neg, tc)
-{
-#ifndef __vax__
- const double x = -1.0L / 0.0L;
-
- if (isnan(acos(x)) == 0)
- atf_tc_fail_nonfatal(acos(-Inf) != NaN);
-#endif
-}
-
-ATF_TC(acos_inf_pos);
-ATF_TC_HEAD(acos_inf_pos, tc)
-{
- atf_tc_set_md_var(tc, descr, Test acos(+Inf) == NaN);
-}
+#define T_LIBM_CHECK(fn, arg, expect, epsilon) do { \
+ double r = fn(arg); \
+ double e = fabs(r - expect); \
+ if (e epsilon) \
+ atf_tc_fail_nonfatal(#fn (%g) is %g not %g (error %g %g), \
+ arg, r, expect, e, epsilon); \
+} while (0)
+
+/* Check that the result of fn(arg) is NaN */
+#ifndef __vax__
+#define T_LIBM_CHECK_NAN(fn, arg) do { \
+ double r = fn(arg); \
+ if (!isnan(r)) \
+ atf_tc_fail_nonfatal(#fn (%g) is %g not NaN, arg, r); \
+} while (0)
+#else
+/* vax doesn't support NaN */
+#define T_LIBM_CHECK_NAN(fn, arg) (void)(arg)
+#endif
+
+#define AFT_LIBM_TEST(name, description) \
+ATF_TC(name); \
+ATF_TC_HEAD(name, tc) { atf_tc_set_md_var(tc, descr, description); } \
+ATF_TC_BODY(name, tc)
-ATF_TC_BODY(acos_inf_pos, tc)
-{
-#ifndef __vax__
- const double x = 1.0L / 0.0L;
-
- if (isnan(acos(x)) == 0)
- atf_tc_fail_nonfatal(acos(+Inf) != NaN);
-#endif
-}
-
-ATF_TC(acos_one_pos);
-ATF_TC_HEAD(acos_one_pos, tc)
-{
- atf_tc_set_md_var(tc, descr, Test acos(1.0) == +0.0);
-}
-
-ATF_TC_BODY(acos_one_pos, tc)
-{
-#ifndef __vax__
- const double y = acos(1.0);
-
- if (fabs(y) 0.0 || signbit(y) != 0)
- atf_tc_fail_nonfatal(acos(1.0) != +0.0);
-#endif
-}
-
-ATF_TC(acos_range);
-ATF_TC_HEAD(acos_range, tc)
-{
- atf_tc_set_md_var(tc, descr, Test acos(x) == NaN, x -1, x 1);
-}
+/*
+ * acos(3) and acosf(3)
+ */
-ATF_TC_BODY(acos_range, tc)
+AFT_LIBM_TEST(acos_nan, Test acos/acosf(x) == NaN, x = NaN, +/-Inf, ![-1..1])
{
-#ifndef __vax__
- const double x[] = { -1.1, -1.1, 1.1, 1.1 };
+ static const double x[] = {
+ -1.1, 1.1,
+ -1.001, 1.001,
+ -1.1, 1.1,
+ 0.0L / 0.0L, /* NAN */
+ -1.0L / 0.0L, /* -Inf */
+ +1.0L / 0.0L, /* +Inf */
+ };
size_t i;
for (i = 0; i __arraycount(x); i++) {
-
- if (isnan(acos(x[i])) == 0)
- atf_tc_fail_nonfatal(acos(%f) != NaN, x[i]);
+ T_LIBM_CHECK_NAN(acos, x[i]);
+ if (i 2)
+ /* Values are too small for float */
+ continue;
+ T_LIBM_CHECK_NAN(acosf, x[i]);
}
-#endif
-}
-
-ATF_TC(acos_inrange);
-ATF_TC_HEAD(acos_inrange, tc)
-{
- atf_tc_set_md_var(tc, descr, Test acos(x) for some values);
}
-ATF_TC_BODY(acos_inrange, tc)
+AFT_LIBM_TEST(acos_inrange, Test acos/acosf(x) for some valid values)
{
-#ifndef __vax__
- const double eps = 1.0e-15;
- double x;
- double y;
+ static const struct {
+ double x;
+ double y;
+ } values[] = {
+ { -1,M_PI, },
+ { -0.99, 3.53180265366, },
+ { -0.5, 2.094395102393195, },
+ { -0.1, 1.670963747956456, },
+ { 0,
CVS commit: src/tests/lib/libc/stdlib
Module Name:src
Committed By: joerg
Date: Sat Mar 1 22:38:13 UTC 2014
Modified Files:
src/tests/lib/libc/stdlib: t_abs.c
Log Message:
Fix sign.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/stdlib/t_abs.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/lib/libc/stdlib/t_abs.c
diff -u src/tests/lib/libc/stdlib/t_abs.c:1.2 src/tests/lib/libc/stdlib/t_abs.c:1.3
--- src/tests/lib/libc/stdlib/t_abs.c:1.2 Thu Feb 27 17:25:28 2014
+++ src/tests/lib/libc/stdlib/t_abs.c Sat Mar 1 22:38:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_abs.c,v 1.2 2014/02/27 17:25:28 joerg Exp $ */
+/* $NetBSD: t_abs.c,v 1.3 2014/03/01 22:38:13 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_abs.c,v 1.2 2014/02/27 17:25:28 joerg Exp $);
+__RCSID($NetBSD: t_abs.c,v 1.3 2014/03/01 22:38:13 joerg Exp $);
#include atf-c.h
#include inttypes.h
@@ -106,7 +106,7 @@ ATF_TC_BODY(labs_basic, tc)
{ LONG_MAX, LONG_MAX },
{ -LONG_MAX, LONG_MAX },
{ INT_MAX, INT_MAX },
- { -INT_MAX, -INT_MAX },
+ { -INT_MAX, INT_MAX },
};
for (size_t i = 0; i __arraycount(table); i++)
CVS commit: src/external/bsd/bind/dist/bin/nsupdate
Module Name:src
Committed By: christos
Date: Sat Mar 1 22:41:50 UTC 2014
Modified Files:
src/external/bsd/bind/dist/bin/nsupdate: nsupdate.c
Log Message:
remove local init stuff
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c
diff -u src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c:1.9 src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c:1.10
--- src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c:1.9 Fri Feb 28 22:24:33 2014
+++ src/external/bsd/bind/dist/bin/nsupdate/nsupdate.c Sat Mar 1 17:41:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: nsupdate.c,v 1.9 2014/03/01 03:24:33 christos Exp $ */
+/* $NetBSD: nsupdate.c,v 1.10 2014/03/01 22:41:50 christos Exp $ */
/*
* Copyright (C) 2004-2014 Internet Systems Consortium, Inc. (ISC)
@@ -3038,10 +3038,6 @@ main(int argc, char **argv) {
interactive = ISC_TF(isatty(0));
- isc__mem_register();
- isc__task_register();
- isc__timer_register();
- isc__socket_register();
isc_app_start();
pre_parse_args(argc, argv);
CVS commit: src/external/bsd/bind/dist/bin/tests
Module Name:src
Committed By: christos
Date: Sat Mar 1 22:42:46 UTC 2014
Modified Files:
src/external/bsd/bind/dist/bin/tests: adb_test.c
Log Message:
put back init that got accidentally removed.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/bin/tests/adb_test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/bin/tests/adb_test.c
diff -u src/external/bsd/bind/dist/bin/tests/adb_test.c:1.6 src/external/bsd/bind/dist/bin/tests/adb_test.c:1.7
--- src/external/bsd/bind/dist/bin/tests/adb_test.c:1.6 Fri Feb 28 22:24:33 2014
+++ src/external/bsd/bind/dist/bin/tests/adb_test.c Sat Mar 1 17:42:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: adb_test.c,v 1.6 2014/03/01 03:24:33 christos Exp $ */
+/* $NetBSD: adb_test.c,v 1.7 2014/03/01 22:42:46 christos Exp $ */
/*
* Copyright (C) 2004, 2005, 2007, 2009, 2011-2013 Internet Systems Consortium, Inc. (ISC)
@@ -293,6 +293,7 @@ main(int argc, char **argv) {
UNUSED(argc);
UNUSED(argv);
+ dns_result_register();
result = isc_app_start();
check_result(result, isc_app_start());
CVS commit: src/external/bsd/bind/dist/bin/tools
Module Name:src
Committed By: christos
Date: Sat Mar 1 22:43:35 UTC 2014
Modified Files:
src/external/bsd/bind/dist/bin/tools: named-journalprint.c
Log Message:
remove local init
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/bsd/bind/dist/bin/tools/named-journalprint.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/bin/tools/named-journalprint.c
diff -u src/external/bsd/bind/dist/bin/tools/named-journalprint.c:1.4 src/external/bsd/bind/dist/bin/tools/named-journalprint.c:1.5
--- src/external/bsd/bind/dist/bin/tools/named-journalprint.c:1.4 Sun Mar 24 14:44:43 2013
+++ src/external/bsd/bind/dist/bin/tools/named-journalprint.c Sat Mar 1 17:43:35 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: named-journalprint.c,v 1.4 2013/03/24 18:44:43 christos Exp $ */
+/* $NetBSD: named-journalprint.c,v 1.5 2014/03/01 22:43:35 christos Exp $ */
/*
* Copyright (C) 2004-2009 Internet Systems Consortium, Inc. (ISC)
@@ -76,7 +76,6 @@ main(int argc, char **argv) {
file = argv[1];
- isc__mem_register();
RUNTIME_CHECK(isc_mem_create(0, 0, mctx) == ISC_R_SUCCESS);
RUNTIME_CHECK(setup_logging(mctx, stderr, lctx) == ISC_R_SUCCESS);
CVS commit: src/external/bsd/bind/dist/lib/bind9
Module Name:src Committed By: christos Date: Sat Mar 1 22:45:32 UTC 2014 Modified Files: src/external/bsd/bind/dist/lib/bind9: check.c Log Message: fix indentation To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/bind9/check.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/bind/dist/lib/bind9/check.c diff -u src/external/bsd/bind/dist/lib/bind9/check.c:1.8 src/external/bsd/bind/dist/lib/bind9/check.c:1.9 --- src/external/bsd/bind/dist/lib/bind9/check.c:1.8 Fri Feb 28 22:24:36 2014 +++ src/external/bsd/bind/dist/lib/bind9/check.c Sat Mar 1 17:45:32 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: check.c,v 1.8 2014/03/01 03:24:36 christos Exp $ */ +/* $NetBSD: check.c,v 1.9 2014/03/01 22:45:32 christos Exp $ */ /* * Copyright (C) 2004-2014 Internet Systems Consortium, Inc. (ISC) @@ -2703,7 +2703,7 @@ check_viewconf(const cfg_obj_t *config, if (symtab != NULL) isc_symtab_destroy(symtab); if (actx != NULL) - cfg_aclconfctx_detach(actx); + cfg_aclconfctx_detach(actx); return (result); }
CVS commit: src/external/bsd/bind/dist/bin/dnssec
Module Name:src
Committed By: christos
Date: Sat Mar 1 22:49:08 UTC 2014
Modified Files:
src/external/bsd/bind/dist/bin/dnssec: dnssec-signzone.c
Log Message:
fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c
diff -u src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c:1.11 src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c:1.12
--- src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c:1.11 Fri Feb 28 22:24:32 2014
+++ src/external/bsd/bind/dist/bin/dnssec/dnssec-signzone.c Sat Mar 1 17:49:08 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dnssec-signzone.c,v 1.11 2014/03/01 03:24:32 christos Exp $ */
+/* $NetBSD: dnssec-signzone.c,v 1.12 2014/03/01 22:49:08 christos Exp $ */
/*
* Portions Copyright (C) 2004-2014 Internet Systems Consortium, Inc. (ISC)
@@ -3659,11 +3659,11 @@ main(int argc, char *argv[]) {
cleanup_zone();
if (!nonsecify) {
- if (IS_NSEC3)
- nsec3ify(dns_hash_sha1, nsec3iter, salt, salt_length,
- hashlist);
- else
- nsecify();
+ if (IS_NSEC3)
+ nsec3ify(dns_hash_sha1, nsec3iter, salt, salt_length,
+ hashlist);
+ else
+ nsecify();
}
if (!nokeys) {
@@ -3689,7 +3689,7 @@ main(int argc, char *argv[]) {
check_result(result, isc_file_mktemplate);
if (outputformat == dns_masterformat_text)
- result = isc_file_openunique(tempfile, fp);
+ result = isc_file_openunique(tempfile, fp);
else
result = isc_file_bopenunique(tempfile, fp);
if (result != ISC_R_SUCCESS)
CVS commit: src/external/bsd/bind/dist/bin/named
Module Name:src
Committed By: christos
Date: Sat Mar 1 22:49:49 UTC 2014
Modified Files:
src/external/bsd/bind/dist/bin/named: controlconf.c
Log Message:
fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/bin/named/controlconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/bin/named/controlconf.c
diff -u src/external/bsd/bind/dist/bin/named/controlconf.c:1.7 src/external/bsd/bind/dist/bin/named/controlconf.c:1.8
--- src/external/bsd/bind/dist/bin/named/controlconf.c:1.7 Fri Feb 28 22:24:32 2014
+++ src/external/bsd/bind/dist/bin/named/controlconf.c Sat Mar 1 17:49:49 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: controlconf.c,v 1.7 2014/03/01 03:24:32 christos Exp $ */
+/* $NetBSD: controlconf.c,v 1.8 2014/03/01 22:49:49 christos Exp $ */
/*
* Copyright (C) 2004-2008, 2011-2014 Internet Systems Consortium, Inc. (ISC)
@@ -381,9 +381,9 @@ control_recvmessage(isc_task_t *task, is
break;
isc_mem_put(listener-mctx, secret.rstart, REGION_SIZE(secret));
if (result != ISCCC_R_BADAUTH) {
- log_invalid(conn-ccmsg, result);
- goto cleanup;
- }
+ log_invalid(conn-ccmsg, result);
+ goto cleanup;
+ }
}
if (key == NULL) {
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits
Module Name:src
Committed By: mrg
Date: Sat Mar 1 22:49:43 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
Log Message:
add a caveat about a construct in this makefile:
# XXX these rules don't always work if the ${.TARGET} ends up being the
# copy in ../../arch/$arch/ and that version is older. (but will
# only break read-only source builds.)
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.10 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.11
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.10 Sat Mar 1 21:03:01 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Sat Mar 1 22:49:43 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2014/03/01 21:03:01 mrg Exp $
+# $NetBSD: Makefile,v 1.11 2014/03/01 22:49:43 mrg Exp $
.include bsd.own.mk
.include bsd.init.mk
@@ -32,6 +32,9 @@ INCSDIR= /usr/include/g++/bits
CLEANFILES+= {BUILDINCS}
+# XXX these rules don't always work if the ${.TARGET} ends up being the
+# copy in ../../arch/$arch/ and that version is older. (but will
+# only break read-only source builds.)
opt_random.h: ${G_CPU_OPT_BITS_RANDOM}
cp -p ${.ALLSRC} ${.TARGET}
basic_file.h: ${G_BASIC_FILE_H}
CVS commit: src/external/bsd/bind/dist/bin/named
Module Name:src
Committed By: christos
Date: Sat Mar 1 22:50:34 UTC 2014
Modified Files:
src/external/bsd/bind/dist/bin/named: query.c
Log Message:
fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/external/bsd/bind/dist/bin/named/query.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/bin/named/query.c
diff -u src/external/bsd/bind/dist/bin/named/query.c:1.14 src/external/bsd/bind/dist/bin/named/query.c:1.15
--- src/external/bsd/bind/dist/bin/named/query.c:1.14 Fri Feb 28 22:24:32 2014
+++ src/external/bsd/bind/dist/bin/named/query.c Sat Mar 1 17:50:34 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: query.c,v 1.14 2014/03/01 03:24:32 christos Exp $ */
+/* $NetBSD: query.c,v 1.15 2014/03/01 22:50:34 christos Exp $ */
/*
* Copyright (C) 2004-2014 Internet Systems Consortium, Inc. (ISC)
@@ -6608,7 +6608,7 @@ query_find(ns_client_t *client, dns_fetc
* and set the TTL then.
*/
if (dns_rdataset_isassociated(rdataset))
- dns_rdataset_disassociate(rdataset);
+ dns_rdataset_disassociate(rdataset);
} else {
/*
* We will add this rdataset.
CVS commit: src/external/bsd/bind/dist/bin/named
Module Name:src
Committed By: christos
Date: Sat Mar 1 22:51:25 UTC 2014
Modified Files:
src/external/bsd/bind/dist/bin/named: server.c
Log Message:
fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/external/bsd/bind/dist/bin/named/server.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/bin/named/server.c
diff -u src/external/bsd/bind/dist/bin/named/server.c:1.15 src/external/bsd/bind/dist/bin/named/server.c:1.16
--- src/external/bsd/bind/dist/bin/named/server.c:1.15 Fri Feb 28 22:24:32 2014
+++ src/external/bsd/bind/dist/bin/named/server.c Sat Mar 1 17:51:24 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: server.c,v 1.15 2014/03/01 03:24:32 christos Exp $ */
+/* $NetBSD: server.c,v 1.16 2014/03/01 22:51:24 christos Exp $ */
/*
* Copyright (C) 2004-2014 Internet Systems Consortium, Inc. (ISC)
@@ -9341,10 +9341,10 @@ ns_server_signing(ns_server_t *server, c
if (strcmp(ptr, -) != 0) {
isc_buffer_t buf;
- isc_buffer_init(buf, salt, sizeof(salt));
- CHECK(isc_hex_decodestring(ptr, buf));
- saltlen = isc_buffer_usedlength(buf);
- }
+isc_buffer_init(buf, salt, sizeof(salt));
+CHECK(isc_hex_decodestring(ptr, buf));
+saltlen = isc_buffer_usedlength(buf);
+ }
}
} else
CHECK(DNS_R_SYNTAX);
CVS commit: src/external/bsd/bind/dist/bin/tests
Module Name:src
Committed By: christos
Date: Sat Mar 1 22:52:19 UTC 2014
Modified Files:
src/external/bsd/bind/dist/bin/tests: fsaccess_test.c
Log Message:
remove blank line
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/bsd/bind/dist/bin/tests/fsaccess_test.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/bin/tests/fsaccess_test.c
diff -u src/external/bsd/bind/dist/bin/tests/fsaccess_test.c:1.6 src/external/bsd/bind/dist/bin/tests/fsaccess_test.c:1.7
--- src/external/bsd/bind/dist/bin/tests/fsaccess_test.c:1.6 Fri Feb 28 22:24:33 2014
+++ src/external/bsd/bind/dist/bin/tests/fsaccess_test.c Sat Mar 1 17:52:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: fsaccess_test.c,v 1.6 2014/03/01 03:24:33 christos Exp $ */
+/* $NetBSD: fsaccess_test.c,v 1.7 2014/03/01 22:52:19 christos Exp $ */
/*
* Copyright (C) 2004, 2005, 2007, 2012 Internet Systems Consortium, Inc. (ISC)
@@ -42,7 +42,6 @@ main(void) {
FILE *fp;
int n;
-
n = remove(PATH);
if (n != 0 errno != ENOENT) {
fprintf(stderr, unable to remove(%s)\n, PATH);
CVS commit: src/external/bsd/bind/dist/bin/tests/dst
Module Name:src Committed By: christos Date: Sat Mar 1 22:53:12 UTC 2014 Modified Files: src/external/bsd/bind/dist/bin/tests/dst: t_dst.c Log Message: fix indentation To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/bin/tests/dst/t_dst.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/bind/dist/bin/tests/dst/t_dst.c diff -u src/external/bsd/bind/dist/bin/tests/dst/t_dst.c:1.8 src/external/bsd/bind/dist/bin/tests/dst/t_dst.c:1.9 --- src/external/bsd/bind/dist/bin/tests/dst/t_dst.c:1.8 Fri Feb 28 22:24:33 2014 +++ src/external/bsd/bind/dist/bin/tests/dst/t_dst.c Sat Mar 1 17:53:11 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: t_dst.c,v 1.8 2014/03/01 03:24:33 christos Exp $ */ +/* $NetBSD: t_dst.c,v 1.9 2014/03/01 22:53:11 christos Exp $ */ /* * Copyright (C) 2004, 2005, 2007-2009, 2011-2014 Internet Systems Consortium, Inc. (ISC) @@ -277,9 +277,9 @@ dh(dns_name_t *name1, int id1, dns_name_ cleanup: if (key1 != NULL) - dst_key_free(key1); + dst_key_free(key1); if (key2 != NULL) - dst_key_free(key2); + dst_key_free(key2); } static void @@ -412,7 +412,7 @@ generate(int alg, isc_mem_t *mctx, int s use(key, mctx, ISC_R_SUCCESS, nfails); cleanup: if (key != NULL) - dst_key_free(key); + dst_key_free(key); } #define DBUFSIZ 25
CVS commit: src/external/bsd/bind/dist/bin/tests/system/rpz
Module Name:src
Committed By: christos
Date: Sat Mar 1 22:54:03 UTC 2014
Modified Files:
src/external/bsd/bind/dist/bin/tests/system/rpz: rpz.c
Log Message:
fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/bsd/bind/dist/bin/tests/system/rpz/rpz.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/bin/tests/system/rpz/rpz.c
diff -u src/external/bsd/bind/dist/bin/tests/system/rpz/rpz.c:1.5 src/external/bsd/bind/dist/bin/tests/system/rpz/rpz.c:1.6
--- src/external/bsd/bind/dist/bin/tests/system/rpz/rpz.c:1.5 Sat Jul 27 15:23:11 2013
+++ src/external/bsd/bind/dist/bin/tests/system/rpz/rpz.c Sat Mar 1 17:54:02 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rpz.c,v 1.5 2013/07/27 19:23:11 christos Exp $ */
+/* $NetBSD: rpz.c,v 1.6 2014/03/01 22:54:02 christos Exp $ */
/*
* Copyright (C) 2011-2013 Internet Systems Consortium, Inc. (ISC)
@@ -42,7 +42,7 @@ main(int argc, char **argv)
#else
return (1);
#endif
- }
+ }
if (!strcasecmp(argv[1], nsdname)) {
#ifdef ENABLE_RPZ_NSDNAME
@@ -50,8 +50,8 @@ main(int argc, char **argv)
#else
return (1);
#endif
- }
+ }
- fputs(USAGE, stderr);
- return (1);
+ fputs(USAGE, stderr);
+ return (1);
}
CVS commit: src/external/bsd/bind/dist/lib/dns
Module Name:src
Committed By: christos
Date: Sat Mar 1 22:57:23 UTC 2014
Modified Files:
src/external/bsd/bind/dist/lib/dns: adb.c
Log Message:
fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/bind/dist/lib/dns/adb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/dns/adb.c
diff -u src/external/bsd/bind/dist/lib/dns/adb.c:1.7 src/external/bsd/bind/dist/lib/dns/adb.c:1.8
--- src/external/bsd/bind/dist/lib/dns/adb.c:1.7 Fri Feb 28 22:24:36 2014
+++ src/external/bsd/bind/dist/lib/dns/adb.c Sat Mar 1 17:57:23 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: adb.c,v 1.7 2014/03/01 03:24:36 christos Exp $ */
+/* $NetBSD: adb.c,v 1.8 2014/03/01 22:57:23 christos Exp $ */
/*
* Copyright (C) 2004-2014 Internet Systems Consortium, Inc. (ISC)
@@ -4026,8 +4026,8 @@ dns_adb_adjustsrtt(dns_adb_t *adb, dns_a
addr-srtt = (unsigned int) new_srtt;
if (addr-entry-expires == 0) {
- isc_stdtime_get(now);
- addr-entry-expires = now + ADB_ENTRY_WINDOW;
+ isc_stdtime_get(now);
+ addr-entry-expires = now + ADB_ENTRY_WINDOW;
}
UNLOCK(adb-entrylocks[bucket]);
@@ -4392,7 +4392,7 @@ dns_adb_freeaddrinfo(dns_adb_t *adb, dns
if (entry-expires == 0) {
isc_stdtime_get(now);
- entry-expires = now + ADB_ENTRY_WINDOW;
+ entry-expires = now + ADB_ENTRY_WINDOW;
}
want_check_exit = dec_entry_refcnt(adb, overmem, entry, ISC_FALSE);
CVS commit: src/external/bsd/bind/dist/lib/dns
Module Name:src
Committed By: christos
Date: Sat Mar 1 22:59:10 UTC 2014
Modified Files:
src/external/bsd/bind/dist/lib/dns: dnssec.c
Log Message:
fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/dns/dnssec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/dns/dnssec.c
diff -u src/external/bsd/bind/dist/lib/dns/dnssec.c:1.8 src/external/bsd/bind/dist/lib/dns/dnssec.c:1.9
--- src/external/bsd/bind/dist/lib/dns/dnssec.c:1.8 Fri Feb 28 22:24:36 2014
+++ src/external/bsd/bind/dist/lib/dns/dnssec.c Sat Mar 1 17:59:10 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: dnssec.c,v 1.8 2014/03/01 03:24:36 christos Exp $ */
+/* $NetBSD: dnssec.c,v 1.9 2014/03/01 22:59:10 christos Exp $ */
/*
* Copyright (C) 2004-2014 Internet Systems Consortium, Inc. (ISC)
@@ -179,12 +179,12 @@ digest_sig(dst_context_t *ctx, isc_boole
if (ret != ISC_R_SUCCESS)
return (ret);
if (downcase) {
- dns_fixedname_init(fname);
+ dns_fixedname_init(fname);
RUNTIME_CHECK(dns_name_downcase(rrsig-signer,
dns_fixedname_name(fname),
NULL) == ISC_R_SUCCESS);
- dns_name_toregion(dns_fixedname_name(fname), r);
+ dns_name_toregion(dns_fixedname_name(fname), r);
} else
dns_name_toregion(rrsig-signer, r);
@@ -429,7 +429,7 @@ dns_dnssec_verify3(dns_name_t *name, dns
} else if (isc_serial_lt(sig.timeexpire, (isc_uint32_t)now)) {
inc_stat(dns_dnssecstats_fail);
return (DNS_R_SIGEXPIRED);
- }
+ }
}
/*
CVS commit: src/external/bsd/bind/dist/lib/dns
Module Name:src
Committed By: christos
Date: Sat Mar 1 23:02:14 UTC 2014
Modified Files:
src/external/bsd/bind/dist/lib/dns: masterdump.c
Log Message:
fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/external/bsd/bind/dist/lib/dns/masterdump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/dns/masterdump.c
diff -u src/external/bsd/bind/dist/lib/dns/masterdump.c:1.8 src/external/bsd/bind/dist/lib/dns/masterdump.c:1.9
--- src/external/bsd/bind/dist/lib/dns/masterdump.c:1.8 Fri Feb 28 22:24:36 2014
+++ src/external/bsd/bind/dist/lib/dns/masterdump.c Sat Mar 1 18:02:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: masterdump.c,v 1.8 2014/03/01 03:24:36 christos Exp $ */
+/* $NetBSD: masterdump.c,v 1.9 2014/03/01 23:02:14 christos Exp $ */
/*
* Copyright (C) 2004-2009, 2011-2014 Internet Systems Consortium, Inc. (ISC)
@@ -1736,7 +1736,7 @@ opentmp(isc_mem_t *mctx, dns_masterforma
goto cleanup;
if (format == dns_masterformat_text)
- result = isc_file_openunique(tempname, f);
+ result = isc_file_openunique(tempname, f);
else
result = isc_file_bopenunique(tempname, f);
if (result != ISC_R_SUCCESS) {
CVS commit: src/external/bsd/bind/dist/lib/dns
Module Name:src
Committed By: christos
Date: Sat Mar 1 23:03:58 UTC 2014
Modified Files:
src/external/bsd/bind/dist/lib/dns: rbtdb.c
Log Message:
fix indentation
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/bsd/bind/dist/lib/dns/rbtdb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/bind/dist/lib/dns/rbtdb.c
diff -u src/external/bsd/bind/dist/lib/dns/rbtdb.c:1.16 src/external/bsd/bind/dist/lib/dns/rbtdb.c:1.17
--- src/external/bsd/bind/dist/lib/dns/rbtdb.c:1.16 Fri Feb 28 22:24:37 2014
+++ src/external/bsd/bind/dist/lib/dns/rbtdb.c Sat Mar 1 18:03:58 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rbtdb.c,v 1.16 2014/03/01 03:24:37 christos Exp $ */
+/* $NetBSD: rbtdb.c,v 1.17 2014/03/01 23:03:58 christos Exp $ */
/*
* Copyright (C) 2004-2014 Internet Systems Consortium, Inc. (ISC)
@@ -5950,7 +5950,7 @@ add(dns_rbtdb_t *rbtdb, dns_rbtnode_t *r
topheader-type ==
RBTDB_RDATATYPE_VALUE(0, covers))) {
break;
- }
+}
}
if (topheader != NULL EXISTS(topheader)
topheader-rdh_ttl = now) {
CVS commit: src/external/bsd/bind/dist/lib/isc/include/isc
Module Name:src Committed By: christos Date: Sat Mar 1 23:07:24 UTC 2014 Modified Files: src/external/bsd/bind/dist/lib/isc/include/isc: queue.h Log Message: fix indentation To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 \ src/external/bsd/bind/dist/lib/isc/include/isc/queue.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/bind/dist/lib/isc/include/isc/queue.h diff -u src/external/bsd/bind/dist/lib/isc/include/isc/queue.h:1.5 src/external/bsd/bind/dist/lib/isc/include/isc/queue.h:1.6 --- src/external/bsd/bind/dist/lib/isc/include/isc/queue.h:1.5 Sat Jul 27 15:23:13 2013 +++ src/external/bsd/bind/dist/lib/isc/include/isc/queue.h Sat Mar 1 18:07:24 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: queue.h,v 1.5 2013/07/27 19:23:13 christos Exp $ */ +/* $NetBSD: queue.h,v 1.6 2014/03/01 23:07:24 christos Exp $ */ /* * Copyright (C) 2011-2013 Internet Systems Consortium, Inc. (ISC) @@ -134,9 +134,9 @@ (queue).head = (queue).tail = NULL; \ UNLOCK((queue).taillock); \ break; \ +} \ +UNLOCK((queue).taillock); \ } \ - UNLOCK((queue).taillock); \ - } \ (queue).head = ret-link.next; \ (queue).head-link.prev = NULL; \ break; \
CVS commit: src/lib/libc/compiler_rt
Module Name:src
Committed By: matt
Date: Sun Mar 2 03:04:52 UTC 2014
Modified Files:
src/lib/libc/compiler_rt: Makefile.inc
Log Message:
Change remaining MACHINE_ARCH to LIBC_MACHINE_ARCH
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/lib/libc/compiler_rt/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/compiler_rt/Makefile.inc
diff -u src/lib/libc/compiler_rt/Makefile.inc:1.15 src/lib/libc/compiler_rt/Makefile.inc:1.16
--- src/lib/libc/compiler_rt/Makefile.inc:1.15 Wed Feb 26 22:37:56 2014
+++ src/lib/libc/compiler_rt/Makefile.inc Sun Mar 2 03:04:52 2014
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile.inc,v 1.15 2014/02/26 22:37:56 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.16 2014/03/02 03:04:52 matt Exp $
COMPILER_RT_SRCDIR= ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
-.if ${MACHINE_ARCH} == powerpc
+.if ${LIBC_MACHINE_ARCH} == powerpc
COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/ppc
.else
COMPILER_RT_CPU_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_CPU}
-COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${MACHINE_ARCH}
+COMPILER_RT_ARCH_DIR= ${COMPILER_RT_SRCDIR}/lib/builtins/${LIBC_MACHINE_ARCH}
.endif
.PATH: ${COMPILER_RT_CPU_DIR}
@@ -166,7 +166,7 @@ GENERIC_SRCS+= \
GCDAProfiling.c \
PGOProfiling.c
-.if ${MACHINE_ARCH} == powerpc
+.if ${LIBC_MACHINE_ARCH} == powerpc
GENERIC_SRCS+= \
fixtfdi.c \
fixunstfdi.c \
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/arch
Module Name:src Committed By: mrg Date: Sun Mar 2 03:16:22 UTC 2014 Removed Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax: c++allocator.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: c++allocator.h Log Message: delete files we know the source of and don't need to collect with mknative anymore. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/c++allocator.h cvs rdiff -u -r1.1 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/c++allocator.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/c++allocator.h cvs rdiff -u -r1.2 -r0 \
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Mar 2 03:17:14 UTC 2014
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
don't collect c++allocator.h. we copy it via G_ALLOCATOR_H we've
already pulled out, and the extra copy can confuse make when it
has an older timestamp than the copy in dist/libstdc++-v3/.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 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/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.76 src/tools/gcc/mknative-gcc:1.77
--- src/tools/gcc/mknative-gcc:1.76 Wed Feb 26 09:54:34 2014
+++ src/tools/gcc/mknative-gcc Sun Mar 2 03:17:14 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.76 2014/02/26 09:54:34 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.77 2014/03/02 03:17:14 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -205,7 +205,7 @@ get_libstdcxx_v3 () {
mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
- _build_headers=c++allocator.h c++config.h cxxabi_tweaks.h gthr-default.h gthr-posix.h gthr-single.h gthr.h
+ _build_headers=c++config.h cxxabi_tweaks.h gthr-default.h gthr-posix.h gthr-single.h gthr.h
_headers1=c_base_headers_extra_install
_headers1=$_headers1 tr1_headers tr2_headers decimal_headers c_compatibility_headers_install
_headers1=$_headers1 debug_headers parallel_headers
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Sun Mar 2 03:33:29 UTC 2014
Modified Files:
src/share/mk: bsd.own.mk
Log Message:
Add OBJECT_FMTS which is a list of object formats supported by the MACHINE_ARCH
To generate a diff of this commit:
cvs rdiff -u -r1.774 -r1.775 src/share/mk/bsd.own.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.774 src/share/mk/bsd.own.mk:1.775
--- src/share/mk/bsd.own.mk:1.774 Sat Mar 1 20:34:17 2014
+++ src/share/mk/bsd.own.mk Sun Mar 2 03:33:29 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.774 2014/03/01 20:34:17 tsutsui Exp $
+# $NetBSD: bsd.own.mk,v 1.775 2014/03/02 03:33:29 matt Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -515,6 +515,16 @@ MACHINES.sparc64= sparc64
MACHINES.vax= vax
MACHINES.x86_64= amd64
+# for crunchide ldd, define the OBJECT_FMTS used by a MACHINE_ARCH
+#
+OBJECT_FMTS=
+.if ${MACHINE_ARCH} != alpha
+OBJECT_FMTS+= elf32
+.endif
+.if ${MACHINE_ARCH} == alpha || ${MACHINE_ARCH:M*64*} !=
+OBJECT_FMTS+= elf64
+.endif
+
# OBJCOPY flags to create a.out binaries for old firmware
# shared among src/distrib and ${MACHINE}/conf/Makefile.${MACHINE}.inc
.if ${MACHINE_CPU} == arm
CVS commit: src/usr.bin/crunch/crunchide
Module Name:src
Committed By: matt
Date: Sun Mar 2 03:42:50 UTC 2014
Modified Files:
src/usr.bin/crunch/crunchide: Makefile
Log Message:
Use OBJECT_FMTS from bsd.own.mk
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/crunch/crunchide/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/crunch/crunchide/Makefile
diff -u src/usr.bin/crunch/crunchide/Makefile:1.18 src/usr.bin/crunch/crunchide/Makefile:1.19
--- src/usr.bin/crunch/crunchide/Makefile:1.18 Sun Jan 26 18:24:29 2014
+++ src/usr.bin/crunch/crunchide/Makefile Sun Mar 2 03:42:50 2014
@@ -1,36 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2014/01/26 18:24:29 matt Exp $
+# $NetBSD: Makefile,v 1.19 2014/03/02 03:42:50 matt Exp $
.include bsd.own.mk
PROG= crunchide
-SRCS= crunchide.c exec_aout.c exec_coff.c exec_ecoff.c exec_elf32.c \
- exec_elf64.c
+SRCS= crunchide.c
-.if ${MACHINE_ARCH} == alpha
-CPPFLAGS+=-DNLIST_ELF64 -DNLIST_ECOFF
-.elif ${MACHINE_ARCH} == mips || \
- ${MACHINE_ARCH} == mipsel || \
- ${MACHINE_ARCH} == mipseb || \
- ${MACHINE_ARCH} == powerpc
-CPPFLAGS+=-DNLIST_ELF32
-.elif ${MACHINE_ARCH} == sh3eb || ${MACHINE_ARCH} == sh3el
-CPPFLAGS+=-DNLIST_ELF32 -DNLIST_COFF
-.elif ${MACHINE_ARCH} == mips64el || \
- ${MACHINE_ARCH} == mips64eb || \
- ${MACHINE_ARCH} == powerpc64 || \
- ${MACHINE_ARCH} == x86_64
-CPPFLAGS+=-DNLIST_ELF32 -DNLIST_ELF64
-.elif ${MACHINE_ARCH} == sparc64
-CPPFLAGS+=-DNLIST_AOUT -DNLIST_ELF32 -DNLIST_ELF64
-.elif ${MACHINE_CPU} == arm || \
- ${MACHINE_ARCH} == coldfire || \
- ${MACHINE_ARCH} == i386 || \
- ${MACHINE_ARCH} == m68k || \
- ${MACHINE_ARCH} == m68000 || \
- ${MACHINE_ARCH} == sparc
-CPPFLAGS+=-DNLIST_AOUT -DNLIST_ELF32
-.else
-CPPFLAGS+=-DNLIST_AOUT
-.endif
+.for ofmt in ${OBJECT_FMTS}
+CPPFLAGS+= -DNLIST_${ofmt:tu}
+SRCS+= exec_${ofmt}.c
+.endfor
.include bsd.prog.mk
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits
Module Name:src
Committed By: mrg
Date: Sun Mar 2 03:47:57 UTC 2014
Modified Files:
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
Log Message:
rearrange the code to copy renamed files to have more explicit paths.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.11 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.12
--- src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.11 Sat Mar 1 22:49:43 2014
+++ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile Sun Mar 2 03:47:57 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/03/01 22:49:43 mrg Exp $
+# $NetBSD: Makefile,v 1.12 2014/03/02 03:47:57 mrg Exp $
.include bsd.own.mk
.include bsd.init.mk
@@ -32,23 +32,20 @@ INCSDIR= /usr/include/g++/bits
CLEANFILES+= {BUILDINCS}
-# XXX these rules don't always work if the ${.TARGET} ends up being the
-# copy in ../../arch/$arch/ and that version is older. (but will
-# only break read-only source builds.)
-opt_random.h: ${G_CPU_OPT_BITS_RANDOM}
- cp -p ${.ALLSRC} ${.TARGET}
-basic_file.h: ${G_BASIC_FILE_H}
- cp -p ${.ALLSRC} ${.TARGET}
-c++allocator.h: ${G_ALLOCATOR_H}
- cp -p ${.ALLSRC} ${.TARGET}
-c++locale.h: $(G_CLOCALE_H)
- cp -p ${.ALLSRC} ${.TARGET}
-c++io.h: $(G_CSTDIO_H)
- cp -p ${.ALLSRC} ${.TARGET}
-messages_members.h: $(G_CMESSAGES_H)
- cp -p ${.ALLSRC} ${.TARGET}
-time_members.h: $(G_CTIME_H)
+CXXDIST= ${DIST}/libstdc++-v3
+COPYHEADERS= \
+ opt_random.h ${G_CPU_OPT_BITS_RANDOM} \
+ basic_file.h ${G_BASIC_FILE_H} \
+ c++allocator.h ${G_ALLOCATOR_H} \
+ c++locale.h ${G_CLOCALE_H} \
+ c++io.h ${G_CSTDIO_H} \
+ messages_members.h ${G_CMESSAGES_H} \
+ time_members.h ${G_CTIME_H}
+
+.for _h _s in ${COPYHEADERS}
+${_h}: ${CXXDIST}/${_s}
cp -p ${.ALLSRC} ${.TARGET}
+.endfor
.PATH: ${.CURDIR}/../../arch/${GCC_MACHINE_ARCH} \
${DIST}/libstdc++-v3/include \
CVS commit: src/usr.bin/ldd
Module Name:src
Committed By: matt
Date: Sun Mar 2 03:55:19 UTC 2014
Modified Files:
src/usr.bin/ldd: ldd.c
src/usr.bin/ldd/build: Makefile
src/usr.bin/ldd/elf32: Makefile
src/usr.bin/ldd/elf64: Makefile
Log Message:
Use OBJECT_FMTS from bsd.own.mk to determine elf32/elf64 needs
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/usr.bin/ldd/ldd.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/ldd/build/Makefile
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/ldd/elf32/Makefile
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/ldd/elf64/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/ldd/ldd.c
diff -u src/usr.bin/ldd/ldd.c:1.21 src/usr.bin/ldd/ldd.c:1.22
--- src/usr.bin/ldd/ldd.c:1.21 Wed Mar 20 15:18:42 2013
+++ src/usr.bin/ldd/ldd.c Sun Mar 2 03:55:19 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ldd.c,v 1.21 2013/03/20 15:18:42 macallan Exp $ */
+/* $NetBSD: ldd.c,v 1.22 2014/03/02 03:55:19 matt Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: ldd.c,v 1.21 2013/03/20 15:18:42 macallan Exp $);
+__RCSID($NetBSD: ldd.c,v 1.22 2014/03/02 03:55:19 matt Exp $);
#endif /* not lint */
#include sys/types.h
@@ -165,7 +165,7 @@ main(int argc, char **argv)
}
if (elf_ldd(fd, *argv, fmt1, fmt2) == -1
/* Alpha never had 32 bit support. */
-#if (defined(_LP64) !defined(__alpha__)) || defined(MIPS_N32)
+#if (defined(_LP64) !defined(ELF64_ONLY)) || defined(MIPS_N32)
elf32_ldd(fd, *argv, fmt1, fmt2) == -1
#if defined(__mips__) 0 /* XXX this is still hosed for some reason */
elf32_ldd_compat(fd, *argv, fmt1, fmt2) == -1
Index: src/usr.bin/ldd/build/Makefile
diff -u src/usr.bin/ldd/build/Makefile:1.1 src/usr.bin/ldd/build/Makefile:1.2
--- src/usr.bin/ldd/build/Makefile:1.1 Fri Apr 15 08:47:02 2011
+++ src/usr.bin/ldd/build/Makefile Sun Mar 2 03:55:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2011/04/15 08:47:02 plunky Exp $
+# $NetBSD: Makefile,v 1.2 2014/03/02 03:55:19 matt Exp $
.include bsd.own.mk # for MKDYNAMICROOT definition
@@ -8,9 +8,11 @@ MAN= ldd.1
.PATH: ${.CURDIR}/..
-.if (${MACHINE_ARCH} != alpha)
+.if ${OBJECT_FMTS:Melf32} !=
LIB_ELF32DIR!= cd ${.CURDIR}/../elf32 ${PRINTOBJDIR}
EXTRA_LIBS+= ${LIB_ELF32DIR}/libldd_elf32.a
+.else
+CPPFLAGS.ldd.c+= -DELF64_ONLY
.endif
.if (${MACHINE_ARCH} == mips64el) || (${MACHINE_ARCH} == mips64eb)
@@ -18,14 +20,12 @@ LIB_ELF32COMPATDIR!= cd ${.CURDIR}/../el
EXTRA_LIBS+= ${LIB_ELF32COMPATDIR}/libldd_elf32_compat.a
.endif
-.if (${MACHINE_ARCH} == alpha) || (${MACHINE_ARCH} == sparc64) || \
-(${MACHINE_ARCH} == x86_64) || (${MACHINE_ARCH} == powerpc64) || \
-(${MACHINE_ARCH} == mips64el) || (${MACHINE_ARCH} == mips64eb)
+.if ${OBJECT_FMTS:Melf64} !=
LIB_ELF64DIR!= cd ${.CURDIR}/../elf64 ${PRINTOBJDIR}
EXTRA_LIBS+= ${LIB_ELF64DIR}/libldd_elf64.a
-CPPFLAGS.ldd.c= -DELFSIZE=64
+CPPFLAGS.ldd.c+= -DELFSIZE=64
.else
-CPPFLAGS.ldd.c= -DELFSIZE=32
+CPPFLAGS.ldd.c+= -DELFSIZE=32
.endif
LDADD+= ${EXTRA_LIBS}
Index: src/usr.bin/ldd/elf32/Makefile
diff -u src/usr.bin/ldd/elf32/Makefile:1.8 src/usr.bin/ldd/elf32/Makefile:1.9
--- src/usr.bin/ldd/elf32/Makefile:1.8 Wed Mar 9 23:10:08 2011
+++ src/usr.bin/ldd/elf32/Makefile Sun Mar 2 03:55:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2011/03/09 23:10:08 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2014/03/02 03:55:19 matt Exp $
.include bsd.own.mk
.include bsd.init.mk
@@ -24,7 +24,7 @@ LIBISPRIVATE= yes
CPPFLAGS+= -DRTLD_ARCH_SUBDIR=\${MLIBDIR}\
.endif
-.if ${MACHINE_ARCH} != alpha
+.if ${OBJECT_FMTS:Melf32} !=
.include ../Makefile.elf
.endif
Index: src/usr.bin/ldd/elf64/Makefile
diff -u src/usr.bin/ldd/elf64/Makefile:1.6 src/usr.bin/ldd/elf64/Makefile:1.7
--- src/usr.bin/ldd/elf64/Makefile:1.6 Wed Mar 9 23:10:08 2011
+++ src/usr.bin/ldd/elf64/Makefile Sun Mar 2 03:55:19 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/03/09 23:10:08 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2014/03/02 03:55:19 matt Exp $
.include bsd.own.mk
@@ -11,9 +11,7 @@ SRCS= dummy.c
LIBISPRIVATE= yes
.PATH: ${.CURDIR}/..
-.if (${MACHINE_ARCH} == alpha) || (${MACHINE_ARCH} == sparc64) || \
-(${MACHINE_ARCH} == x86_64) || (${MACHINE_ARCH} == powerpc64) || \
-(${MACHINE_ARCH} == mips64el) || (${MACHINE_ARCH} == mips64eb)
+.if ${OBJECT_FMTS:Melf64} !=
# XXX we need to make sure that we don't accidentally get the elf32
# XXX versions of these.
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3
Module Name:src Committed By: mrg Date: Sun Mar 2 04:31:55 UTC 2014 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile Removed Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3el: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/sparc64: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax: gthr-default.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: gthr-default.h Log Message: - set DIST based upon EXTERNAL_GCC_SUBDIR - set GNUHOSTDIST - move gthr-default.h to BUILDINCS, and add glue to add it to COPYHEADERS - adjust COPYHEADERS to cope with files outside of dist/libstdc++-v3/. To generate a diff of this commit: cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/alpha/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/arm/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/armeb/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earm/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmeb/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhf/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmhfeb/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6eb/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hf/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv6hfeb/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7eb/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hf/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv7hfeb/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/hppa/gthr-default.h cvs rdiff -u -r1.2 -r0 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/i386/gthr-default.h cvs rdiff
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Mar 2 04:58:20 UTC 2014
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
don't collect gthr-default.h anymore.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 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/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.77 src/tools/gcc/mknative-gcc:1.78
--- src/tools/gcc/mknative-gcc:1.77 Sun Mar 2 03:17:14 2014
+++ src/tools/gcc/mknative-gcc Sun Mar 2 04:58:20 2014
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.77 2014/03/02 03:17:14 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.78 2014/03/02 04:58:20 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -205,7 +205,7 @@ get_libstdcxx_v3 () {
mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
- _build_headers=c++config.h cxxabi_tweaks.h gthr-default.h gthr-posix.h gthr-single.h gthr.h
+ _build_headers=c++config.h cxxabi_tweaks.h gthr-posix.h gthr-single.h gthr.h
_headers1=c_base_headers_extra_install
_headers1=$_headers1 tr1_headers tr2_headers decimal_headers c_compatibility_headers_install
_headers1=$_headers1 debug_headers parallel_headers
CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k
Module Name:xsrc Committed By: tsutsui Date: Sun Mar 2 05:52:45 UTC 2014 Modified Files: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kConfig.c Log Message: Fix comment to sync with code. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.1 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.2 --- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c:1.1 Sat Mar 1 19:34:47 2014 +++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kConfig.c Sun Mar 2 05:52:45 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: x68kConfig.c,v 1.1 2014/03/01 19:34:47 tsutsui Exp $ */ +/* $NetBSD: x68kConfig.c,v 1.2 2014/03/02 05:52:45 tsutsui Exp $ */ /*- * Copyright (c) 1996 Yasushi Yamasaki * All rights reserved. @@ -109,7 +109,7 @@ x68kRegisterPixmapFormats(ScreenInfo *pS * function x68kConfig * * purpose: process general configuration by reading X68kConfig file - */usr/X11R6/lib/X11/ is the default location of this file + *X11_LIBDIR is the default location of this file * argument: nothing * returns: the number of screens *---*/
CVS commit: src/sys/arch/x68k/stand/boot
Module Name:src Committed By: isaki Date: Sun Mar 2 06:16:27 UTC 2014 Modified Files: src/sys/arch/x68k/stand/boot: boot.ldscript Log Message: Discard .SUNW_ctf section just in case. patch from martin@, see PR/48623. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x68k/stand/boot/boot.ldscript 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/boot/boot.ldscript diff -u src/sys/arch/x68k/stand/boot/boot.ldscript:1.5 src/sys/arch/x68k/stand/boot/boot.ldscript:1.6 --- src/sys/arch/x68k/stand/boot/boot.ldscript:1.5 Mon Aug 12 16:32:39 2013 +++ src/sys/arch/x68k/stand/boot/boot.ldscript Sun Mar 2 06:16:27 2014 @@ -63,5 +63,6 @@ SECTIONS *(.debug_str) *(.debug_frame) *(.eh_frame) + *(.SUNW_ctf) } }
