CVS commit: src/distrib/notes/common
Module Name:src Committed By: isaki Date: Sat Jan 21 04:43:54 UTC 2012 Modified Files: src/distrib/notes/common: legal.common Log Message: Remove my (isaki@) acknowledgement. To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/distrib/notes/common/legal.common Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/legal.common diff -u src/distrib/notes/common/legal.common:1.91 src/distrib/notes/common/legal.common:1.92 --- src/distrib/notes/common/legal.common:1.91 Fri Mar 25 00:03:27 2011 +++ src/distrib/notes/common/legal.common Sat Jan 21 04:43:54 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: legal.common,v 1.91 2011/03/25 00:03:27 rmind Exp $ +.\" $NetBSD: legal.common,v 1.92 2012/01/21 04:43:54 isaki Exp $ .\" .\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -362,8 +362,6 @@ for the NetBSD Project. .It This product includes software developed by Terrence R. Lambert. .It -This product includes software developed by Tetsuya Isaki. -.It This product includes software developed by TooLs GmbH. .It This product includes software developed by Trimble Navigation, Ltd.
CVS commit: src/share/man/man4/man4.x68k
Module Name:src Committed By: isaki Date: Sat Jan 21 03:01:04 UTC 2012 Modified Files: src/share/man/man4/man4.x68k: bmd.4 Log Message: Switch mine to 2-clause license. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/man4.x68k/bmd.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.x68k/bmd.4 diff -u src/share/man/man4/man4.x68k/bmd.4:1.4 src/share/man/man4/man4.x68k/bmd.4:1.5 --- src/share/man/man4/man4.x68k/bmd.4:1.4 Mon Mar 9 19:24:30 2009 +++ src/share/man/man4/man4.x68k/bmd.4 Sat Jan 21 03:01:03 2012 @@ -1,4 +1,4 @@ -.\" $NetBSD: bmd.4,v 1.4 2009/03/09 19:24:30 joerg Exp $ +.\" $NetBSD: bmd.4,v 1.5 2012/01/21 03:01:03 isaki Exp $ .\" .\" Copyright (c) 2002 Tetsuya Isaki. All rights reserved. .\" @@ -10,11 +10,6 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\"notice, this list of conditions and the following disclaimer in the .\"documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\"must display the following acknowledgement: -.\" This product includes software developed by Tetsuya Isaki. -.\" 4. The name of the author may not be used to endorse or promote products -.\"derived from this software without specific prior written permission .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
CVS commit: src
Module Name:src Committed By: isaki Date: Sat Jan 21 02:52:50 UTC 2012 Modified Files: src/etc: MAKEDEV.tmpl src/etc/etc.x68k: MAKEDEV.conf src/share/man/man8: MAKEDEV.8 Log Message: Clean up pow(4) (which I had removed in Nov 2011). To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/etc/MAKEDEV.tmpl cvs rdiff -u -r1.11 -r1.12 src/etc/etc.x68k/MAKEDEV.conf cvs rdiff -u -r1.42 -r1.43 src/share/man/man8/MAKEDEV.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/MAKEDEV.tmpl diff -u src/etc/MAKEDEV.tmpl:1.148 src/etc/MAKEDEV.tmpl:1.149 --- src/etc/MAKEDEV.tmpl:1.148 Sat Nov 19 16:41:55 2011 +++ src/etc/MAKEDEV.tmpl Sat Jan 21 02:52:50 2012 @@ -1,5 +1,5 @@ #!/bin/sh - -# $NetBSD: MAKEDEV.tmpl,v 1.148 2011/11/19 16:41:55 agc Exp $ +# $NetBSD: MAKEDEV.tmpl,v 1.149 2012/01/21 02:52:50 isaki Exp $ # # Copyright (c) 2003,2007,2008 The NetBSD Foundation, Inc. # All rights reserved. @@ -262,7 +262,6 @@ # pad* Pseudo-audio device driver # pci* PCI bus access devices # pf PF packet filter -# pow* power management device (x68k) # putter Pass-to-Userspace Transporter # px* PixelStamp Xserver access # radio* radio devices @@ -2022,21 +2021,6 @@ sram) mkdev sram c %sram_chr% 0 644 ;; -pow[0-9]*) - unit=${i#pow} - case $unit in - 0|1) - mkdev pow${unit} c %pow_chr% ${unit} 644 - if [ $unit = 0 ]; then - lndev pow${unit} pow - fi - ;; - *) - warn "bad unit for pow in: $i" - ;; - esac - ;; - ttyS[0-9]*) unit=${i#ttyS} mkdev ttyS$unit c %sacom_chr% $(($unit + $dialin )) "" "" $u_uucp Index: src/etc/etc.x68k/MAKEDEV.conf diff -u src/etc/etc.x68k/MAKEDEV.conf:1.11 src/etc/etc.x68k/MAKEDEV.conf:1.12 --- src/etc/etc.x68k/MAKEDEV.conf:1.11 Tue Oct 11 12:08:20 2011 +++ src/etc/etc.x68k/MAKEDEV.conf Sat Jan 21 02:52:50 2012 @@ -1,4 +1,4 @@ -# $NetBSD: MAKEDEV.conf,v 1.11 2011/10/11 12:08:20 tsutsui Exp $ +# $NetBSD: MAKEDEV.conf,v 1.12 2012/01/21 02:52:50 isaki Exp $ all_md) makedev std_x68k st0 st1 ttye0 ttye1 mouse0 mouse1 @@ -7,7 +7,7 @@ all_md) makedev vnd4 vnd5 vnd6 makedev cd0 ss0 fd0 fd1 fd2 fd3 makedev par0 - makedev sram audio pow0 bell + makedev sram audio bell makedev bmd0 bmd1 ch0 uk0 uk1 ss0 makedev scsibus0 scsibus1 scsibus2 scsibus3 makedev ses0 ses1 ses2 ses3 Index: src/share/man/man8/MAKEDEV.8 diff -u src/share/man/man8/MAKEDEV.8:1.42 src/share/man/man8/MAKEDEV.8:1.43 --- src/share/man/man8/MAKEDEV.8:1.42 Fri Dec 2 08:50:18 2011 +++ src/share/man/man8/MAKEDEV.8 Sat Jan 21 02:52:50 2012 @@ -6,7 +6,7 @@ .\" *** DO NOT EDIT - any changes will be lost!!! .\" *** -- .\" -.\" $NetBSD: MAKEDEV.8,v 1.42 2011/12/02 08:50:18 njoly Exp $ +.\" $NetBSD: MAKEDEV.8,v 1.43 2012/01/21 02:52:50 isaki Exp $ .\" .\" Copyright (c) 2001, 2003, 2007, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -35,7 +35,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd December 2, 2011 +.Dd January 21, 2012 .Dt MAKEDEV 8 .Os .Sh NAME @@ -798,8 +798,6 @@ PCI bus access devices, see .Xr \&pci 4 . It Ar pf PF packet filter -. It Ar pow# -Power management device (x68k) . It Ar putter Pass-to-Userspace Transporter . It Ar px#
CVS commit: src/sys/dev/stbi
Module Name:src Committed By: jmcneill Date: Fri Jan 20 23:13:47 UTC 2012 Modified Files: src/sys/dev/stbi: stb_image.c Log Message: reduce stack usage of stbi_gif_load_from_memory when STBI_SMALL_STACK is defined To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/stbi/stb_image.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/stbi/stb_image.c diff -u src/sys/dev/stbi/stb_image.c:1.1 src/sys/dev/stbi/stb_image.c:1.2 --- src/sys/dev/stbi/stb_image.c:1.1 Sun Feb 6 23:13:04 2011 +++ src/sys/dev/stbi/stb_image.c Fri Jan 20 23:13:47 2012 @@ -430,7 +430,7 @@ extern int stbi_gif_info_from_file #endif #ifdef _KERNEL #include -__KERNEL_RCSID(0, "$NetBSD: stb_image.c,v 1.1 2011/02/06 23:13:04 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: stb_image.c,v 1.2 2012/01/20 23:13:47 jmcneill Exp $"); #include #include #include @@ -4601,16 +4601,30 @@ stbi_uc *stbi_gif_load_from_memory (stbi { uint8 *u = 0; stbi s; + stbi_gif *pg; + + #ifdef STBI_SMALL_STACK + pg = (stbi_gif *) MALLOC(sizeof(*pg)); + if (pg == NULL) + return NULL; + #else stbi_gif g; + pg = &g; + #endif - memset(&g, 0, sizeof(g)); + memset(pg, 0, sizeof(*pg)); start_mem(&s, buffer, len); - u = stbi_gif_load_next(&s, &g, comp, req_comp); + u = stbi_gif_load_next(&s, pg, comp, req_comp); if (u == (void *) 1) u = 0; // end of animated gif marker if (u) { - *x = g.w; - *y = g.h; + *x = pg->w; + *y = pg->h; } + + #ifdef STBI_SMALL_STACK + FREE(pg); + #endif + return u; }
CVS commit: src/tools
Module Name:src Committed By: christos Date: Fri Jan 20 23:01:05 UTC 2012 Modified Files: src/tools: Makefile.gmakehost Makefile.gnuhost Log Message: Merge the two Makefiles that were mostly copies of each others. The reason to do this was to add support for cleaning up the config.cache files when the build environment (as determined by uname -srm) changes. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tools/Makefile.gmakehost cvs rdiff -u -r1.35 -r1.36 src/tools/Makefile.gnuhost Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/Makefile.gmakehost diff -u src/tools/Makefile.gmakehost:1.6 src/tools/Makefile.gmakehost:1.7 --- src/tools/Makefile.gmakehost:1.6 Wed Nov 25 06:49:36 2009 +++ src/tools/Makefile.gmakehost Fri Jan 20 18:01:05 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.gmakehost,v 1.6 2009/11/25 11:49:36 uebayasi Exp $ +# $NetBSD: Makefile.gmakehost,v 1.7 2012/01/20 23:01:05 christos Exp $ # # Rules used when building a GNU host package. Expects MODULE to be set. # This version runs ${TOOL_GMAKE} instead of ${MAKE} @@ -17,109 +17,5 @@ # since the last install in the current directory. .include - -# Disable use of pre-compiled headers on Darwin. -BUILD_OSTYPE!= uname -s -.if ${BUILD_OSTYPE} == "Darwin" -HOST_CFLAGS+=-O2 -no-cpp-precomp -.endif - -GNUHOSTDIST?= ${.CURDIR}/../../gnu/dist/${MODULE} - -FIND_ARGS+= \! \( -type d \( \ - -name 'CVS' -o \ - -name 'config' -o \ - -name 'doc' -o \ - -name 'po' -o \ - -name 'nbsd.mt' -o \ - -name 'tests*' \ - \) -prune \) - -# Do this "find" only if actually building something. -.if (${USETOOLS} == "yes") && empty(.MAKEFLAGS:M-V*) && \ -(make(all) || make(realall) || (!make(clean) && !make(cleandir) && !make(obj))) && \ -!defined(_GNU_CFGSRC) - -_GNU_CFGSRC!= find ${GNUHOSTDIST} ${FIND_ARGS} \ - -type f \( -name 'config*' -o -name '*.in' \) -print -.MAKEOVERRIDES+= _GNU_CFGSRC -.endif - -CONFIGURE_ENV+= \ - AR=${HOST_AR:Q} \ - AWK=${TOOL_AWK:Q} \ - CC=${HOST_CC:Q} \ - CFLAGS=${HOST_CFLAGS:Q} \ - CPPFLAGS=${HOST_CPPFLAGS:Q} \ - CXX=${HOST_CXX:Q} \ - CXXFLAGS=${HOST_CXXFLAGS:Q} \ - INSTALL=${HOST_INSTALL_FILE:Q} \ - LDFLAGS=${HOST_LDFLAGS:Q} \ - LEX=${LEX:Q} \ - MAKE=${TOOL_GMAKE:Q} \ - PATH="${TOOLDIR}/bin:$$PATH" \ - RANLIB=${HOST_RANLIB:Q} \ - YACC=${YACC:Q} - -BUILD_ENV+= ${CONFIGURE_ENV} - -CONFIGURE_ARGS+=--prefix=${TOOLDIR} -.if ${MKPIC} == "no" -CONFIGURE_ARGS+=--disable-shared -.endif - -# don't need this for gmake? i hope. might need gmake equiv of -X? -##.ifndef _NOWRAPPER -### Some systems have a small ARG_MAX. On such systems, prevent Make -### variables set on the command line from being exported in the -### environment (they will still be set in MAKEOVERRIDES). -##BUILD_OSTYPE!= uname -s -##.if ${BUILD_OSTYPE} == "Darwin" || ${BUILD_OSTYPE} == "FreeBSD" -##__noenvexport= -X -##.endif -##MAKE_ARGS:= ${__noenvexport} -f ${.PARSEDIR}/Makefile.gnuwrap ${MAKE_ARGS} -##.else -##MAKE_ARGS+= _NOWRAPPER=1 -##.endif - -MAKE_ARGS+= BISON=true DESTDIR= INSTALL=${HOST_INSTALL_FILE:Q} - -ALL_TARGET?= all -INSTALL_TARGET?=install - -.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile - @mkdir build 2>/dev/null || true - @(cd build && /usr/bin/env ${CONFIGURE_ENV} ${HOST_SH} ${GNUHOSTDIST}/configure ${CONFIGURE_ARGS}) - @touch $@ - -# The .build_done timestamp is only updated if a file actually changes -# in the build tree during "make all". This way, if nothing has changed, -# a "make install MKUPDATE=yes" will do nothing. - -# gmake version of this puts MAKE_ARGS in the environment to be sure that -# sub-gmake's get them, otherwise tools/gcc tries to build libgcc and -# fails. it also uses "env -i" to entirely clear out MAKEFLAGS. - -GMAKE_J_ARGS?= ${MAKEFLAGS:[*]:M*-j*:C/.*(-j ?[0-9]*).*/\1/W} - -.build_done: .configure_done - @(cd build && /usr/bin/env -i ${BUILD_ENV} ${MAKE_ARGS} ${TOOL_GMAKE} ${GMAKE_J_ARGS} -e ${MAKE_ARGS} ${ALL_TARGET}) - @if [ ! -f $@ ] || [ -n "$$(find build -type f -newer .build_done -print)" ]; \ - then touch $@; fi - -.install_done! ${BUILD:D.build_done} - @(cd ${.OBJDIR}/build && /usr/bin/env -i ${BUILD_ENV} ${MAKE_ARGS} ${TOOL_GMAKE} -e ${MAKE_ARGS} ${INSTALL_TARGET}) - @touch $@ - -# Mapping to standard targets. - -.if ${USETOOLS} == "yes" -realall: .build_done -realinstall: .install_done -.endif - -clean: clean.gnu -clean.gnu: - -rm -r -f .*_done build - -.include +MAKE_PROGRAM=${TOOL_GMAKE} +.include "Makefile.gnuhost" Index: src/tools/Makefile.gnuhost diff -u src/tools/Makefile.gnuhost:1.35 src/tools/Makefile.gnuhost:1.36 --- src/tools/Makefile.gnuhost:1.35 Mon Nov 21 08:46:37 2011 +++ src/tools/Makefile.gnuhost Fri Jan 20 18:01:05 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.gnuhost,v 1.35 2011/11/21 13:46:37 tsutsui Exp $ +# $NetBSD: Makefile.gnuhost,v 1.36 2012/01/20 23:01:05 christos Exp $ # # Rules used when building a GNU host pack
CVS commit: src/usr.sbin/puffs/mount_psshfs
Module Name:src Committed By: jakllsch Date: Fri Jan 20 22:07:58 UTC 2012 Modified Files: src/usr.sbin/puffs/mount_psshfs: node.c Log Message: Ensure psshfs_node_read() completely reads all data before return. Fixes file corruption in psshfs exposed with kernel MAXPHYS at 128KiB. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.64 src/usr.sbin/puffs/mount_psshfs/node.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/puffs/mount_psshfs/node.c diff -u src/usr.sbin/puffs/mount_psshfs/node.c:1.63 src/usr.sbin/puffs/mount_psshfs/node.c:1.64 --- src/usr.sbin/puffs/mount_psshfs/node.c:1.63 Fri Aug 12 04:14:00 2011 +++ src/usr.sbin/puffs/mount_psshfs/node.c Fri Jan 20 22:07:58 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: node.c,v 1.63 2011/08/12 04:14:00 riastradh Exp $ */ +/* $NetBSD: node.c,v 1.64 2012/01/20 22:07:58 jakllsch Exp $ */ /* * Copyright (c) 2006-2009 Antti Kantee. All Rights Reserved. @@ -27,7 +27,7 @@ #include #ifndef lint -__RCSID("$NetBSD: node.c,v 1.63 2011/08/12 04:14:00 riastradh Exp $"); +__RCSID("$NetBSD: node.c,v 1.64 2012/01/20 22:07:58 jakllsch Exp $"); #endif /* !lint */ #include @@ -525,6 +525,7 @@ psshfs_node_read(struct puffs_usermount goto farout; } +again: readlen = *resid; psbuf_req_data(pb, SSH_FXP_READ, reqid, psn->fhand_r, psn->fhand_r_len); psbuf_put_8(pb, offset); @@ -546,8 +547,11 @@ psshfs_node_read(struct puffs_usermount GETRESPONSE(pb, pctx->sshfd_data); rv = psbuf_do_data(pb, buf, &readlen); - if (rv == 0) + if (rv == 0) { *resid -= readlen; + buf += readlen; + offset += readlen; + } out: if (max_reads && --psn->readcount >= max_reads) { @@ -559,6 +563,12 @@ psshfs_node_read(struct puffs_usermount TAILQ_REMOVE(&psn->pw, pwp, pw_entries); } + if (rv == 0 && *resid > 0) { + reqid = NEXTREQ(pctx); + psbuf_recycleout(pb); + goto again; + } + farout: /* check if we need a lazyclose */ if (psn->stat & PSN_HANDLECLOSE && psn->fhand_r) {
CVS commit: src/sys/arch/x86/include
Module Name:src Committed By: hannken Date: Fri Jan 20 18:47:04 UTC 2012 Modified Files: src/sys/arch/x86/include: i82489reg.h Log Message: Revert revision 1.4 and change LAPIC_LEVEL_ASSERT / _MASK back to 0x4000. According to "Intel 64 and IA-32 Architectures Software Developer's Manual" Vol. 3, May 2011, Order Number: 325384-039US, Section 10.6.1: LEVEL_ASSERT is bit #14, bit #13 is reserved. With this change NetBSD now boots multiple processors under CentOS 6.2/kvm. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x86/include/i82489reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/include/i82489reg.h diff -u src/sys/arch/x86/include/i82489reg.h:1.10 src/sys/arch/x86/include/i82489reg.h:1.11 --- src/sys/arch/x86/include/i82489reg.h:1.10 Mon Nov 15 11:58:09 2010 +++ src/sys/arch/x86/include/i82489reg.h Fri Jan 20 18:47:04 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: i82489reg.h,v 1.10 2010/11/15 11:58:09 cegger Exp $ */ +/* $NetBSD: i82489reg.h,v 1.11 2012/01/20 18:47:04 hannken Exp $ */ /*- * Copyright (c) 1998, 2008 The NetBSD Foundation, Inc. @@ -92,8 +92,8 @@ # define LAPIC_DLSTAT_BUSY 0x1000 # define LAPIC_DLSTAT_IDLE 0x -# define LAPIC_LEVEL_MASK 0x2000 -# define LAPIC_LEVEL_ASSERT 0x2000 +# define LAPIC_LEVEL_MASK 0x4000 +# define LAPIC_LEVEL_ASSERT 0x4000 # define LAPIC_LEVEL_DEASSERT 0x # define LAPIC_TRIGGER_MASK 0x8000
CVS commit: src/sys/arch/sbmips/stand/common
Module Name:src Committed By: matt Date: Fri Jan 20 18:25:30 UTC 2012 Modified Files: src/sys/arch/sbmips/stand/common: boot.ldscript Log Message: Remove output emulation. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sbmips/stand/common/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/sbmips/stand/common/boot.ldscript diff -u src/sys/arch/sbmips/stand/common/boot.ldscript:1.1 src/sys/arch/sbmips/stand/common/boot.ldscript:1.2 --- src/sys/arch/sbmips/stand/common/boot.ldscript:1.1 Thu Jan 19 19:58:17 2012 +++ src/sys/arch/sbmips/stand/common/boot.ldscript Fri Jan 20 18:25:30 2012 @@ -1,6 +1,4 @@ /* Script for -N: mix text and data on same page; don't align data */ -OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", - "elf32-tradlittlemips") OUTPUT_ARCH(mips) ENTRY(__start) SEARCH_DIR("=/usr/lib");
CVS commit: src
Module Name:src Committed By: joerg Date: Fri Jan 20 16:31:30 UTC 2012 Modified Files: src/lib/libc: Makefile Makefile.inc src/lib/libc/iconv: Makefile.inc iconv.c src/lib/libc/locale: Makefile.inc global_locale.c rune.c setlocale.c src/lib/libc/nls: Makefile.inc catopen.c src/usr.bin/locale: Makefile locale.c Removed Files: src/lib/libc/locale: aliasname.c bsdctype.c bsdctype_file.h bsdctype_local.h iswctype_sb.c localeio.c localeio_lc_ctype.c localeio_lc_messages.c localeio_lc_monetary.c localeio_lc_numeric.c localeio_lc_time.c multibyte_sb.c Log Message: Remove code for CITRUS!=yes. To generate a diff of this commit: cvs rdiff -u -r1.148 -r1.149 src/lib/libc/Makefile cvs rdiff -u -r1.7 -r1.8 src/lib/libc/Makefile.inc cvs rdiff -u -r1.4 -r1.5 src/lib/libc/iconv/Makefile.inc cvs rdiff -u -r1.12 -r1.13 src/lib/libc/iconv/iconv.c cvs rdiff -u -r1.59 -r1.60 src/lib/libc/locale/Makefile.inc cvs rdiff -u -r1.4 -r0 src/lib/libc/locale/aliasname.c cvs rdiff -u -r1.10 -r0 src/lib/libc/locale/bsdctype.c cvs rdiff -u -r1.2 -r0 src/lib/libc/locale/bsdctype_file.h \ src/lib/libc/locale/bsdctype_local.h \ src/lib/libc/locale/localeio_lc_messages.c \ src/lib/libc/locale/localeio_lc_monetary.c \ src/lib/libc/locale/localeio_lc_numeric.c \ src/lib/libc/locale/localeio_lc_time.c cvs rdiff -u -r1.11 -r1.12 src/lib/libc/locale/global_locale.c cvs rdiff -u -r1.11 -r0 src/lib/libc/locale/iswctype_sb.c cvs rdiff -u -r1.6 -r0 src/lib/libc/locale/localeio.c \ src/lib/libc/locale/localeio_lc_ctype.c cvs rdiff -u -r1.5 -r0 src/lib/libc/locale/multibyte_sb.c cvs rdiff -u -r1.42 -r1.43 src/lib/libc/locale/rune.c cvs rdiff -u -r1.58 -r1.59 src/lib/libc/locale/setlocale.c cvs rdiff -u -r1.10 -r1.11 src/lib/libc/nls/Makefile.inc cvs rdiff -u -r1.28 -r1.29 src/lib/libc/nls/catopen.c cvs rdiff -u -r1.3 -r1.4 src/usr.bin/locale/Makefile cvs rdiff -u -r1.7 -r1.8 src/usr.bin/locale/locale.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/Makefile diff -u src/lib/libc/Makefile:1.148 src/lib/libc/Makefile:1.149 --- src/lib/libc/Makefile:1.148 Wed Aug 17 09:53:53 2011 +++ src/lib/libc/Makefile Fri Jan 20 16:31:29 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.148 2011/08/17 09:53:53 christos Exp $ +# $NetBSD: Makefile,v 1.149 2012/01/20 16:31:29 joerg Exp $ # @(#)Makefile 8.2 (Berkeley) 2/3/94 # # All library objects contain sccsid strings by default; they may be @@ -57,9 +57,7 @@ COMPATDIR=${.CURDIR}/compat .include "${.CURDIR}/atomic/Makefile.inc" .include "${.CURDIR}/cdb/Makefile.inc" .include "${.CURDIR}/db/Makefile.inc" -.if (${CITRUS} == "yes") .include "${.CURDIR}/citrus/Makefile.inc" -.endif .include "${.CURDIR}/compat-43/Makefile.inc" .include "${.CURDIR}/dlfcn/Makefile.inc" .include "${.CURDIR}/gdtoa/Makefile.inc" @@ -138,9 +136,7 @@ FILESDIR= /var/db # workaround for I18N stuffs: build singlebyte setlocale() for libc.a, # multibyte for libc.so. the quirk should be removed when we support # dlopen() from within statically linked binaries. -.if (${CITRUS} == "yes") CSHLIBFLAGS+= -D_I18N_DYNAMIC -.endif .include Index: src/lib/libc/Makefile.inc diff -u src/lib/libc/Makefile.inc:1.7 src/lib/libc/Makefile.inc:1.8 --- src/lib/libc/Makefile.inc:1.7 Thu Nov 10 00:36:54 2011 +++ src/lib/libc/Makefile.inc Fri Jan 20 16:31:29 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.7 2011/11/10 00:36:54 joerg Exp $ +# $NetBSD: Makefile.inc,v 1.8 2012/01/20 16:31:29 joerg Exp $ # @(#)Makefile 8.2 (Berkeley) 2/3/94 # # All library objects contain sccsid strings by default; they may be @@ -21,8 +21,6 @@ USE_FORT?= yes USE_SHLIBDIR= yes -CITRUS?= yes - .include WARNS=4 Index: src/lib/libc/iconv/Makefile.inc diff -u src/lib/libc/iconv/Makefile.inc:1.4 src/lib/libc/iconv/Makefile.inc:1.5 --- src/lib/libc/iconv/Makefile.inc:1.4 Sun Jan 11 02:46:28 2009 +++ src/lib/libc/iconv/Makefile.inc Fri Jan 20 16:31:29 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.4 2009/01/11 02:46:28 christos Exp $ +# $NetBSD: Makefile.inc,v 1.5 2012/01/20 16:31:29 joerg Exp $ .PATH: ${ARCHDIR}/iconv ${.CURDIR}/iconv @@ -6,8 +6,4 @@ SRCS+= iconv.c MAN+= iconv.3 MLINKS+=iconv.3 iconv_open.3 iconv.3 iconv_close.3 -.if ${CITRUS} == "yes" -CPPFLAGS.iconv.c+= -DHAVE_CITRUS -I${LIBCDIR}/citrus -.else -CPPFLAGS.iconv.c+= -UHAVE_CITRUS -.endif +CPPFLAGS.iconv.c+= -I${LIBCDIR}/citrus Index: src/lib/libc/iconv/iconv.c diff -u src/lib/libc/iconv/iconv.c:1.12 src/lib/libc/iconv/iconv.c:1.13 --- src/lib/libc/iconv/iconv.c:1.12 Wed Aug 5 15:17:02 2009 +++ src/lib/libc/iconv/iconv.c Fri Jan 20 16:31:29 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: iconv.c,v 1.12 2009/08/05 15:17:02 joerg Exp $ */ +/* $NetBSD: iconv.c,v 1.13 2012/01/20 16:31:29 joerg Exp $ */ /*- * Copyright (c)2003 Citrus Project, @@ -28,7 +28,7 @@ #include #
CVS commit: src/tests/lib/libppath
Module Name:src Committed By: tsutsui Date: Fri Jan 20 15:06:47 UTC 2012 Modified Files: src/tests/lib/libppath: Makefile Log Message: Invoke a shell script via ${HOST_SH} rather than assuming exec bits. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libppath/Makefile 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/libppath/Makefile diff -u src/tests/lib/libppath/Makefile:1.2 src/tests/lib/libppath/Makefile:1.3 --- src/tests/lib/libppath/Makefile:1.2 Sat Aug 27 18:55:52 2011 +++ src/tests/lib/libppath/Makefile Fri Jan 20 15:06:47 2012 @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.2 2011/08/27 18:55:52 dyoung Exp $ +# $Id: Makefile,v 1.3 2012/01/20 15:06:47 tsutsui Exp $ .include @@ -16,7 +16,7 @@ CPPFLAGS+=-I$(.OBJDIR) echo "extern const char " ${.TARGET:S,.h$,,} "[];" > ${.TARGET} .plist.c: - ${.CURDIR}/plist_to_c ${.TARGET:S,.c$,,} < ${.IMPSRC} > ${.TARGET} + ${HOST_SH} ${.CURDIR}/plist_to_c ${.TARGET:S,.c$,,} < ${.IMPSRC} > ${.TARGET} CLEANFILES+=personnel.c personnel.h
CVS commit: src/sys/arch/zaurus
Module Name:src Committed By: nonaka Date: Fri Jan 20 15:00:27 UTC 2012 Modified Files: src/sys/arch/zaurus/conf: Makefile.zaurus.inc std.zaurus src/sys/arch/zaurus/zaurus: kloader_machdep.c machdep.c Added Files: src/sys/arch/zaurus/conf: ldscript.zaurus Removed Files: src/sys/arch/zaurus/conf: ldscript Log Message: Kernel load address can be changed now. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/conf/Makefile.zaurus.inc \ src/sys/arch/zaurus/conf/std.zaurus cvs rdiff -u -r1.1 -r0 src/sys/arch/zaurus/conf/ldscript cvs rdiff -u -r0 -r1.3 src/sys/arch/zaurus/conf/ldscript.zaurus cvs rdiff -u -r1.4 -r1.5 src/sys/arch/zaurus/zaurus/kloader_machdep.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/zaurus/zaurus/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/zaurus/conf/Makefile.zaurus.inc diff -u src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.3 src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.4 --- src/sys/arch/zaurus/conf/Makefile.zaurus.inc:1.3 Thu May 5 09:07:59 2011 +++ src/sys/arch/zaurus/conf/Makefile.zaurus.inc Fri Jan 20 15:00:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.zaurus.inc,v 1.3 2011/05/05 09:07:59 nonaka Exp $ +# $NetBSD: Makefile.zaurus.inc,v 1.4 2012/01/20 15:00:27 nonaka Exp $ MACHINE_ARCH= arm CPPFLAGS+= -D${MACHINE} @@ -6,10 +6,6 @@ CPPFLAGS+= -D${MACHINE} SYSTEM_FIRST_OBJ= zaurus_start.o SYSTEM_FIRST_SFILE= ${THISARM}/zaurus/zaurus_start.S -LINKFLAGS= -T ${THISARM}/conf/ldscript - -EXTRA_CLEAN+= netbsd.map assym.d - SYSTEM_LD_TAIL_EXTRA+=; \ echo "Checking kernel size..."; \ size=`wc -c "$@" | ${TOOL_AWK} '{ print $$1 }'`; \ @@ -20,3 +16,17 @@ SYSTEM_LD_TAIL_EXTRA+=; \ echo "Fatal: kernel size: $$size, max kernel size: $$maxsize"; \ false; \ fi + +KERNEL_BASE_VIRT= $(LOADADDRESS) + +LINKFLAGS= -T ldscript + +EXTRA_CLEAN+= netbsd.map assym.d ldscript tmp + +netbsd: ldscript # XXX + +# generate ldscript from common template +ldscript: ${THISARM}/conf/ldscript.zaurus ${THISARM}/conf/Makefile.zaurus.inc Makefile + ${TOOL_SED} -e 's/@KERNEL_BASE_PHYS@/${KERNEL_BASE_PHYS}/' \ + -e 's/@KERNEL_BASE_VIRT@/${KERNEL_BASE_VIRT}/' \ + ${THISARM}/conf/ldscript.zaurus > tmp && mv tmp $@ Index: src/sys/arch/zaurus/conf/std.zaurus diff -u src/sys/arch/zaurus/conf/std.zaurus:1.3 src/sys/arch/zaurus/conf/std.zaurus:1.4 --- src/sys/arch/zaurus/conf/std.zaurus:1.3 Sun Jan 27 12:37:12 2008 +++ src/sys/arch/zaurus/conf/std.zaurus Fri Jan 20 15:00:27 2012 @@ -1,4 +1,4 @@ -# $NetBSD: std.zaurus,v 1.3 2008/01/27 12:37:12 chris Exp $ +# $NetBSD: std.zaurus,v 1.4 2012/01/20 15:00:27 nonaka Exp $ # # standard NetBSD/zaurus options @@ -13,7 +13,8 @@ options EXEC_SCRIPT # To support easy transit to ../arch/arm/arm32 options ARM32 -#options ARM32_NEW_VM_LAYOUT # Not yet ready for prime-time +makeoptions KERNEL_BASE_PHYS="0xa020" +makeoptions LOADADDRESS="0xc020" options ARM_INTR_IMPL="" Index: src/sys/arch/zaurus/zaurus/kloader_machdep.c diff -u src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.4 src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.5 --- src/sys/arch/zaurus/zaurus/kloader_machdep.c:1.4 Sun Nov 20 04:07:50 2011 +++ src/sys/arch/zaurus/zaurus/kloader_machdep.c Fri Jan 20 15:00:27 2012 @@ -1,7 +1,7 @@ -/* $NetBSD: kloader_machdep.c,v 1.4 2011/11/20 04:07:50 nonaka Exp $ */ +/* $NetBSD: kloader_machdep.c,v 1.5 2012/01/20 15:00:27 nonaka Exp $ */ /*- - * Copyright (c) 2009 NONAKA Kimihiro + * Copyright (c) 2009-2012 NONAKA Kimihiro * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kloader_machdep.c,v 1.4 2011/11/20 04:07:50 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kloader_machdep.c,v 1.5 2012/01/20 15:00:27 nonaka Exp $"); #include "debug_kloader.h" @@ -44,9 +44,7 @@ __KERNEL_RCSID(0, "$NetBSD: kloader_mach #include -#ifndef KERNEL_BASE -#define KERNEL_BASE 0xc000 -#endif +#define KERNEL_TEXT_BASE ((vaddr_t)&KERNEL_BASE_virt) kloader_jumpfunc_t kloader_zaurus_jump __attribute__((__noreturn__)); kloader_bootfunc_t kloader_zaurus_boot __attribute__((__noreturn__)); @@ -78,8 +76,9 @@ kloader_zaurus_jump(kloader_bootfunc_t f struct kloader_bootinfo *kbi, struct kloader_page_tag *tag) { extern int kloader_howto; - void (*bootinfop)(void *, void *) = (void *)(0xc020 - PAGE_SIZE); - uint32_t *bootmagicp = (uint32_t *)(0xc020 - BOOTARGS_BUFSIZ); + extern char KERNEL_BASE_virt[]; + void (*bootinfop)(void *, void *); + uint32_t *bootmagicp; vaddr_t top, ptr; struct bootinfo *bootinfo; struct btinfo_howto *bi_howto; @@ -88,11 +87,13 @@ kloader_zaurus_jump(kloader_bootfunc_t f disable_interrupts(I32_bit|F32_bit); /* copy 2nd boot-loader to va=pa page */ + bootinfop = (void *)(KERNEL_TEXT_BASE - PAGE_
CVS commit: src
Module Name:src Committed By: joerg Date: Fri Jan 20 14:08:07 UTC 2012 Modified Files: src/external/bsd/tmux/dist/compat: imsg-buffer.c imsg.c src/external/ibm-public/postfix/dist/src/util: unix_recv_fd.c unix_send_fd.c src/lib/libc/compat/net: Makefile.inc src/lib/libc/net: Makefile.inc src/sys/arch/alpha/include: cdefs.h param.h src/sys/arch/amd64/include: cdefs.h param.h src/sys/arch/arm/include: cdefs.h param.h src/sys/arch/hppa/include: cdefs.h param.h src/sys/arch/i386/include: cdefs.h param.h src/sys/arch/ia64/include: cdefs.h param.h src/sys/arch/m68k/include: cdefs.h param.h src/sys/arch/mips/include: cdefs.h mips_param.h src/sys/arch/powerpc/include: cdefs.h param.h src/sys/arch/sh3/include: cdefs.h param.h src/sys/arch/sparc/include: cdefs.h param.h src/sys/arch/sparc64/include: param.h src/sys/arch/vax/include: cdefs.h param.h src/sys/compat/linux/common: linux_socket.c src/sys/compat/netbsd32: netbsd32_socket.c netbsd32_sysctl.c src/sys/sys: socket.h Added Files: src/lib/libc/compat/net: __cmsg_alignbytes.c Removed Files: src/common/lib/libc/net: __cmsg_alignbytes.c Log Message: Change CMSG_SPACE and CMSG_LEN to provide Integer Constant Expressions again. This was changed in sys/socket.h r1.51 to work around fallout from the IPv6 aux data migration. It broke the historic ABI on some platforms. This commit restores compatibility for netbsd32 code on such platforms and provides a template for future changes to the CMSG_* alignment. Revert PCC/Clang workarounds in postfix and tmux. To generate a diff of this commit: cvs rdiff -u -r1.3 -r0 src/common/lib/libc/net/__cmsg_alignbytes.c cvs rdiff -u -r1.4 -r1.5 src/external/bsd/tmux/dist/compat/imsg-buffer.c \ src/external/bsd/tmux/dist/compat/imsg.c cvs rdiff -u -r1.6 -r1.7 \ src/external/ibm-public/postfix/dist/src/util/unix_recv_fd.c cvs rdiff -u -r1.5 -r1.6 \ src/external/ibm-public/postfix/dist/src/util/unix_send_fd.c cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/net/Makefile.inc cvs rdiff -u -r0 -r1.1 src/lib/libc/compat/net/__cmsg_alignbytes.c cvs rdiff -u -r1.80 -r1.81 src/lib/libc/net/Makefile.inc cvs rdiff -u -r1.11 -r1.12 src/sys/arch/alpha/include/cdefs.h cvs rdiff -u -r1.38 -r1.39 src/sys/arch/alpha/include/param.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/include/cdefs.h cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/include/param.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/include/cdefs.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/include/param.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/hppa/include/cdefs.h cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/include/param.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/i386/include/cdefs.h cvs rdiff -u -r1.72 -r1.73 src/sys/arch/i386/include/param.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ia64/include/cdefs.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/include/param.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/m68k/include/cdefs.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/m68k/include/param.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mips/include/cdefs.h cvs rdiff -u -r1.30 -r1.31 src/sys/arch/mips/include/mips_param.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/cdefs.h cvs rdiff -u -r1.24 -r1.25 src/sys/arch/powerpc/include/param.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sh3/include/cdefs.h cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sh3/include/param.h cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/include/cdefs.h cvs rdiff -u -r1.67 -r1.68 src/sys/arch/sparc/include/param.h cvs rdiff -u -r1.45 -r1.46 src/sys/arch/sparc64/include/param.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/vax/include/cdefs.h cvs rdiff -u -r1.58 -r1.59 src/sys/arch/vax/include/param.h cvs rdiff -u -r1.111 -r1.112 src/sys/compat/linux/common/linux_socket.c cvs rdiff -u -r1.38 -r1.39 src/sys/compat/netbsd32/netbsd32_socket.c cvs rdiff -u -r1.32 -r1.33 src/sys/compat/netbsd32/netbsd32_sysctl.c cvs rdiff -u -r1.103 -r1.104 src/sys/sys/socket.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/tmux/dist/compat/imsg-buffer.c diff -u src/external/bsd/tmux/dist/compat/imsg-buffer.c:1.4 src/external/bsd/tmux/dist/compat/imsg-buffer.c:1.5 --- src/external/bsd/tmux/dist/compat/imsg-buffer.c:1.4 Wed Aug 31 20:13:31 2011 +++ src/external/bsd/tmux/dist/compat/imsg-buffer.c Fri Jan 20 14:08:04 2012 @@ -1,4 +1,4 @@ -/* $Id: imsg-buffer.c,v 1.4 2011/08/31 20:13:31 plunky Exp $ */ +/* $Id: imsg-buffer.c,v 1.5 2012/01/20 14:08:04 joerg Exp $ */ /* $OpenBSD: imsg-buffer.c,v 1.3 2010/05/26 13:56:07 nicm Exp $ */ /* @@ -228,11 +228,7 @@ msgbuf_write(struct msgbuf *msgbuf) struct cmsghdr *cmsg; union { struct cmsghdr hdr; -#if defined(__clang__) || defined(__PCC__) - char buf[128]; -#else char buf[CMSG_SPACE(sizeof(int))]; -#endi