CVS commit: src/sys/ufs/ext2fs
Module Name:src
Committed By: hannken
Date: Tue Jan 21 07:53:38 UTC 2014
Modified Files:
src/sys/ufs/ext2fs: ext2fs_vnops.c
Log Message:
Move VOP_UNLOCK() after setting type to VNON like all other UFS file systems.
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/sys/ufs/ext2fs/ext2fs_vnops.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/ext2fs/ext2fs_vnops.c
diff -u src/sys/ufs/ext2fs/ext2fs_vnops.c:1.108 src/sys/ufs/ext2fs/ext2fs_vnops.c:1.109
--- src/sys/ufs/ext2fs/ext2fs_vnops.c:1.108 Fri Jan 17 10:55:03 2014
+++ src/sys/ufs/ext2fs/ext2fs_vnops.c Tue Jan 21 07:53:38 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: ext2fs_vnops.c,v 1.108 2014/01/17 10:55:03 hannken Exp $ */
+/* $NetBSD: ext2fs_vnops.c,v 1.109 2014/01/21 07:53:38 hannken Exp $ */
/*
* Copyright (c) 1982, 1986, 1989, 1993
@@ -65,7 +65,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.108 2014/01/17 10:55:03 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ext2fs_vnops.c,v 1.109 2014/01/21 07:53:38 hannken Exp $");
#include
#include
@@ -184,8 +184,8 @@ ext2fs_mknod(void *v)
* checked to see if it is an alias of an existing entry in
* the inode cache.
*/
- VOP_UNLOCK(*vpp);
(*vpp)->v_type = VNON;
+ VOP_UNLOCK(*vpp);
vgone(*vpp);
error = VFS_VGET(mp, ino, vpp);
if (error != 0) {
CVS commit: src/usr.bin/gcore
Module Name:src Committed By: reed Date: Tue Jan 21 02:53:30 UTC 2014 Modified Files: src/usr.bin/gcore: gcore.1 Log Message: use macro for OS name when first introduced To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/usr.bin/gcore/gcore.1 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/gcore/gcore.1 diff -u src/usr.bin/gcore/gcore.1:1.14 src/usr.bin/gcore/gcore.1:1.15 --- src/usr.bin/gcore/gcore.1:1.14 Thu Mar 22 07:58:19 2012 +++ src/usr.bin/gcore/gcore.1 Tue Jan 21 02:53:30 2014 @@ -1,4 +1,4 @@ -.\" $NetBSD: gcore.1,v 1.14 2012/03/22 07:58:19 wiz Exp $ +.\" $NetBSD: gcore.1,v 1.15 2014/01/21 02:53:30 reed Exp $ .\" .\" Copyright (c) 2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -66,7 +66,9 @@ The core image. .Xr sysctl 8 .Sh HISTORY .Nm -appeared in BSD 4.2, disappeared in +appeared in +.Bx 4.2 , +disappeared in .Nx 1.2 , and reappeared in .Nx 2.0 .
CVS commit: src/sys/dev/wscons
Module Name:src Committed By: mlelstv Date: Tue Jan 21 00:36:11 UTC 2014 Modified Files: src/sys/dev/wscons: wsdisplay_vcons.c Log Message: fix build To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/dev/wscons/wsdisplay_vcons.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/wscons/wsdisplay_vcons.c diff -u src/sys/dev/wscons/wsdisplay_vcons.c:1.30 src/sys/dev/wscons/wsdisplay_vcons.c:1.31 --- src/sys/dev/wscons/wsdisplay_vcons.c:1.30 Tue Jan 21 00:10:46 2014 +++ src/sys/dev/wscons/wsdisplay_vcons.c Tue Jan 21 00:36:11 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: wsdisplay_vcons.c,v 1.30 2014/01/21 00:10:46 mlelstv Exp $ */ +/* $NetBSD: wsdisplay_vcons.c,v 1.31 2014/01/21 00:36:11 mlelstv Exp $ */ /*- * Copyright (c) 2005, 2006 Michael Lorenz @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.30 2014/01/21 00:10:46 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.31 2014/01/21 00:36:11 mlelstv Exp $"); #include #include @@ -940,7 +940,7 @@ vcons_copyrows_noread(void *cookie, int vd->attrs[ppos] = scr->scr_attrs[pos]; } #else -scr->scr_vd->putchar(cookie, l, c, scr->scr_chars[pos], +vd->putchar(cookie, l, c, scr->scr_chars[pos], scr->scr_attrs[pos]); #endif pos++;
CVS commit: src/tests/lib/libc/locale
Module Name:src
Committed By: yamt
Date: Tue Jan 21 00:32:16 UTC 2014
Modified Files:
src/tests/lib/libc/locale: t_io.c
Log Message:
fix comment typos pointed out by uebayasi
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/lib/libc/locale/t_io.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/locale/t_io.c
diff -u src/tests/lib/libc/locale/t_io.c:1.3 src/tests/lib/libc/locale/t_io.c:1.4
--- src/tests/lib/libc/locale/t_io.c:1.3 Mon Jan 20 14:14:56 2014
+++ src/tests/lib/libc/locale/t_io.c Tue Jan 21 00:32:16 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_io.c,v 1.3 2014/01/20 14:14:56 yamt Exp $ */
+/* $NetBSD: t_io.c,v 1.4 2014/01/21 00:32:16 yamt Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2011\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_io.c,v 1.3 2014/01/20 14:14:56 yamt Exp $");
+__RCSID("$NetBSD: t_io.c,v 1.4 2014/01/21 00:32:16 yamt Exp $");
#include
#include
@@ -53,7 +53,7 @@ ATF_TC_HEAD(bad_big5_wprintf, tc)
ATF_TC_BODY(bad_big5_wprintf, tc)
{
- /* XXX implementation detail knowledge (wchat_t encoding) */
+ /* XXX implementation detail knowledge (wchar_t encoding) */
wchar_t ibuf[] = { 0xcf10, 0 };
setlocale(LC_CTYPE, "zh_TW.Big5");
ATF_REQUIRE_ERRNO(EILSEQ, wprintf(L"%ls\n", ibuf) < 0);
@@ -68,7 +68,7 @@ ATF_TC_HEAD(bad_big5_swprintf, tc)
ATF_TC_BODY(bad_big5_swprintf, tc)
{
- /* XXX implementation detail knowledge (wchat_t encoding) */
+ /* XXX implementation detail knowledge (wchar_t encoding) */
wchar_t ibuf[] = { 0xcf10, 0 };
wchar_t obuf[20];
setlocale(LC_CTYPE, "zh_TW.Big5");
@@ -84,7 +84,7 @@ ATF_TC_HEAD(good_big5_wprintf, tc)
ATF_TC_BODY(good_big5_wprintf, tc)
{
- /* XXX implementation detail knowledge (wchat_t encoding) */
+ /* XXX implementation detail knowledge (wchar_t encoding) */
wchar_t ibuf[] = { 0xcf40, 0 };
setlocale(LC_CTYPE, "zh_TW.Big5");
ATF_REQUIRE_EQ(wprintf(L"%ls\n", ibuf), 2);
@@ -98,7 +98,7 @@ ATF_TC_HEAD(good_big5_swprintf, tc)
ATF_TC_BODY(good_big5_swprintf, tc)
{
- /* XXX implementation detail knowledge (wchat_t encoding) */
+ /* XXX implementation detail knowledge (wchar_t encoding) */
wchar_t ibuf[] = { 0xcf40, 0 };
wchar_t obuf[20];
setlocale(LC_CTYPE, "zh_TW.Big5");
@@ -139,7 +139,7 @@ ATF_TC_BODY(good_big5_getwc, tc)
ATF_REQUIRE(fp != NULL);
setlocale(LC_CTYPE, "zh_TW.Big5");
- /* XXX implementation detail knowledge (wchat_t encoding) */
+ /* XXX implementation detail knowledge (wchar_t encoding) */
ATF_REQUIRE_EQ(getwc(fp), 0xcf40);
fclose(fp);
}
CVS commit: src/sys/dev/wscons
Module Name:src
Committed By: mlelstv
Date: Tue Jan 21 00:10:46 UTC 2014
Modified Files:
src/sys/dev/wscons: wsdisplay_vcons.c
Log Message:
keep track of VCONS_DRAW_INTR screen cache also in erasecols/rows and
copycols/rows methods.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/wscons/wsdisplay_vcons.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/wscons/wsdisplay_vcons.c
diff -u src/sys/dev/wscons/wsdisplay_vcons.c:1.29 src/sys/dev/wscons/wsdisplay_vcons.c:1.30
--- src/sys/dev/wscons/wsdisplay_vcons.c:1.29 Sun Sep 15 16:12:00 2013
+++ src/sys/dev/wscons/wsdisplay_vcons.c Tue Jan 21 00:10:46 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_vcons.c,v 1.29 2013/09/15 16:12:00 martin Exp $ */
+/* $NetBSD: wsdisplay_vcons.c,v 1.30 2014/01/21 00:10:46 mlelstv Exp $ */
/*-
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.29 2013/09/15 16:12:00 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.30 2014/01/21 00:10:46 mlelstv Exp $");
#include
#include
@@ -89,6 +89,8 @@ static void vcons_copyrows(void *, int,
static void vcons_eraserows(void *, int, int, long);
static void vcons_putchar(void *, int, int, u_int, long);
#ifdef VCONS_DRAW_INTR
+static void vcons_erasecols_cached(void *, int, int, int, long);
+static void vcons_eraserows_cached(void *, int, int, long);
static void vcons_putchar_cached(void *, int, int, u_int, long);
#endif
static void vcons_cursor(void *, int, int, int);
@@ -731,6 +733,9 @@ vcons_copycols(void *cookie, int row, in
vcons_lock(scr);
if (SCREEN_IS_VISIBLE(scr) && SCREEN_CAN_DRAW(scr)) {
scr->scr_vd->copycols(cookie, row, srccol, dstcol, ncols);
+#if defined(VCONS_DRAW_INTR)
+ vcons_invalidate_cache(scr->scr_vd);
+#endif
}
vcons_unlock(scr);
}
@@ -742,6 +747,7 @@ vcons_copycols_noread(void *cookie, int
struct vcons_screen *scr = ri->ri_hw;
struct vcons_data *vd = scr->scr_vd;
+ vcons_lock(scr);
if (SCREEN_IS_VISIBLE(scr) && SCREEN_CAN_DRAW(scr)) {
int pos, c, offset, ppos;
@@ -769,6 +775,7 @@ vcons_copycols_noread(void *cookie, int
ppos++;
}
}
+ vcons_unlock(scr);
}
static void
@@ -832,8 +839,8 @@ vcons_erasecols(void *cookie, int row, i
vcons_lock(scr);
if (SCREEN_IS_VISIBLE(scr) && SCREEN_CAN_DRAW(scr)) {
#ifdef VCONS_DRAW_INTR
- vcons_erasecols_cached(cookie, row, startcol, ncols,
- fillattr);
+ vcons_erasecols_cached(cookie, row, startcol, ncols,
+ fillattr);
#else
scr->scr_vd->erasecols(cookie, row, startcol, ncols, fillattr);
#endif
@@ -897,6 +904,9 @@ vcons_copyrows(void *cookie, int srcrow,
vcons_lock(scr);
if (SCREEN_IS_VISIBLE(scr) && SCREEN_CAN_DRAW(scr)) {
scr->scr_vd->copyrows(cookie, srcrow, dstrow, nrows);
+#if defined(VCONS_DRAW_INTR)
+ vcons_invalidate_cache(scr->scr_vd);
+#endif
}
vcons_unlock(scr);
}
@@ -908,6 +918,7 @@ vcons_copyrows_noread(void *cookie, int
struct vcons_screen *scr = ri->ri_hw;
struct vcons_data *vd = scr->scr_vd;
+ vcons_lock(scr);
if (SCREEN_IS_VISIBLE(scr) && SCREEN_CAN_DRAW(scr)) {
int pos, l, c, offset, ppos;
@@ -929,7 +940,7 @@ vcons_copyrows_noread(void *cookie, int
vd->attrs[ppos] = scr->scr_attrs[pos];
}
#else
-vd->putchar(cookie, l, c, scr->scr_chars[pos],
+scr->scr_vd->putchar(cookie, l, c, scr->scr_chars[pos],
scr->scr_attrs[pos]);
#endif
pos++;
@@ -937,6 +948,7 @@ vcons_copyrows_noread(void *cookie, int
}
}
}
+ vcons_unlock(scr);
}
static void
@@ -967,6 +979,23 @@ vcons_eraserows_buffer(void *cookie, int
#endif
}
+#ifdef VCONS_DRAW_INTR
+static void
+vcons_eraserows_cached(void *cookie, int row, int nrows, long fillattr)
+{
+ struct rasops_info *ri = cookie;
+ struct vcons_screen *scr = ri->ri_hw;
+ struct vcons_data *vd = scr->scr_vd;
+ int i, pos = row * ri->ri_cols, end = (row+nrows) * ri->ri_cols;
+
+ for (i = pos; i < end; i++) {
+ vd->chars[i] = 0x20;
+ vd->attrs[i] = fillattr;
+ }
+ vd->eraserows(cookie, row, nrows, fillattr);
+}
+#endif
+
static void
vcons_eraserows(void *cookie, int row, int nrows, long fillattr)
{
@@ -982,7 +1011,11 @@ vcons_eraserows(void *cookie, int row, i
vcons_lock(scr);
if (SCREEN_IS_VISIBLE(scr) && SCREEN_CAN_DRAW(scr)) {
+#ifdef VCONS_DRAW_INTR
+ vcons_eraserows_cached(cookie, row, nrows, fillattr);
+#else
scr->scr_vd->eraserows(cookie, row, nrows, fillattr);
+#endif
}
vcons_unlock(scr);
}
@@ -1262,10 +1295,15 @@ vcons_softintr(void *cookie)
struct vcons_screen *scr = vd->active;
unsigned int dirty;
- if (scr && vd->use_intr == 1) {
+ if (scr && vd->use_intr) {
if (!SCREEN_IS_BUSY(scr)) {
dirty = atomic_swap_uint(&scr->scr_dirty, 0);
- if (dirty > 0) {
+ if (vd->use_intr == 2) {
+if ((scr->scr_flags & VCONS_NO_REDRAW) == 0) {
+ vd->use_intr = 1;
+
CVS commit: src/sys/dev/wscons
Module Name:src
Committed By: mlelstv
Date: Tue Jan 21 00:08:28 UTC 2014
Modified Files:
src/sys/dev/wscons: wsdisplay.c wsdisplayvar.h
Log Message:
add function to detach wscons from a console. This allows to
switch the console to a different driver.
To generate a diff of this commit:
cvs rdiff -u -r1.135 -r1.136 src/sys/dev/wscons/wsdisplay.c
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/wscons/wsdisplayvar.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/dev/wscons/wsdisplay.c
diff -u src/sys/dev/wscons/wsdisplay.c:1.135 src/sys/dev/wscons/wsdisplay.c:1.136
--- src/sys/dev/wscons/wsdisplay.c:1.135 Thu Feb 2 13:11:25 2012
+++ src/sys/dev/wscons/wsdisplay.c Tue Jan 21 00:08:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay.c,v 1.135 2012/02/02 13:11:25 drochner Exp $ */
+/* $NetBSD: wsdisplay.c,v 1.136 2014/01/21 00:08:27 mlelstv Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.135 2012/02/02 13:11:25 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay.c,v 1.136 2014/01/21 00:08:27 mlelstv Exp $");
#include "opt_wsdisplay_compat.h"
#include "opt_wsmsgattrs.h"
@@ -884,6 +884,15 @@ wsdisplay_preattach(const struct wsscree
wsdisplay_console_initted = 1;
}
+void
+wsdisplay_cndetach(void)
+{
+ KASSERT(wsdisplay_console_initted == 2);
+
+ cn_tab = NULL;
+ wsdisplay_console_initted = 0;
+}
+
/*
* Tty and cdevsw functions.
*/
Index: src/sys/dev/wscons/wsdisplayvar.h
diff -u src/sys/dev/wscons/wsdisplayvar.h:1.50 src/sys/dev/wscons/wsdisplayvar.h:1.51
--- src/sys/dev/wscons/wsdisplayvar.h:1.50 Thu Jan 31 10:57:30 2013
+++ src/sys/dev/wscons/wsdisplayvar.h Tue Jan 21 00:08:27 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplayvar.h,v 1.50 2013/01/31 10:57:30 macallan Exp $ */
+/* $NetBSD: wsdisplayvar.h,v 1.51 2014/01/21 00:08:27 mlelstv Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -163,6 +163,7 @@ void wsdisplay_cnattach(const struct wss
long);
void wsdisplay_preattach(const struct wsscreen_descr *, void *, int, int,
long);
+void wsdisplay_cndetach(void);
int wsdisplaydevprint(void *, const char *);
int wsemuldisplaydevprint(void *, const char *);
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: jdc
Date: Mon Jan 20 22:02:32 UTC 2014
Modified Files:
src/sys/dev/ic: pcf8584.c
Log Message:
Remove the check for (cmdlen > 0) when writing. When i2cscan sends a
quick_write, the command length is 0, so we were previously returning
success for every address in this case.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/dev/ic/pcf8584.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/ic/pcf8584.c
diff -u src/sys/dev/ic/pcf8584.c:1.10 src/sys/dev/ic/pcf8584.c:1.11
--- src/sys/dev/ic/pcf8584.c:1.10 Sun Sep 15 09:17:28 2013
+++ src/sys/dev/ic/pcf8584.c Mon Jan 20 22:02:32 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pcf8584.c,v 1.10 2013/09/15 09:17:28 martin Exp $ */
+/* $NetBSD: pcf8584.c,v 1.11 2014/01/20 22:02:32 jdc Exp $ */
/* $OpenBSD: pcf8584.c,v 1.9 2007/10/20 18:46:21 kettenis Exp $ */
/*
@@ -175,9 +175,8 @@ pcfiic_i2c_exec(void *arg, i2c_op_t op,
if (sc->sc_master)
pcfiic_choose_bus(sc, addr >> 7);
- if (cmdlen > 0)
- if (pcfiic_xmit(sc, addr & 0x7f, cmdbuf, cmdlen) != 0)
- return (1);
+ if (pcfiic_xmit(sc, addr & 0x7f, cmdbuf, cmdlen) != 0)
+ return (1);
if (len > 0) {
if (I2C_OP_WRITE_P(op))
CVS commit: src/external/bsd/ntp/dist/libntp
Module Name:src
Committed By: kardel
Date: Mon Jan 20 19:03:33 UTC 2014
Modified Files:
src/external/bsd/ntp/dist/libntp: work_fork.c
Log Message:
fix voluntary self-destruct (kill(0, SIGUP)) after successful int_res run and
interface change
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ntp/dist/libntp/work_fork.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/ntp/dist/libntp/work_fork.c
diff -u src/external/bsd/ntp/dist/libntp/work_fork.c:1.1.1.1 src/external/bsd/ntp/dist/libntp/work_fork.c:1.2
--- src/external/bsd/ntp/dist/libntp/work_fork.c:1.1.1.1 Fri Dec 27 23:30:48 2013
+++ src/external/bsd/ntp/dist/libntp/work_fork.c Mon Jan 20 19:03:33 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: work_fork.c,v 1.1.1.1 2013/12/27 23:30:48 christos Exp $ */
+/* $NetBSD: work_fork.c,v 1.2 2014/01/20 19:03:33 kardel Exp $ */
/*
* work_fork.c - fork implementation for blocking worker child.
@@ -100,8 +100,10 @@ interrupt_worker_sleep(void)
for (idx = 0; idx < blocking_children_alloc; idx++) {
c = blocking_children[idx];
- if (NULL == c)
+
+ if (NULL == c || c->reusable == TRUE)
continue;
+
rc = kill(c->pid, SIGHUP);
if (rc < 0)
msyslog(LOG_ERR,
CVS commit: src/lib/libc/arch/sh3/gen
Module Name:src Committed By: joerg Date: Mon Jan 20 17:14:38 UTC 2014 Modified Files: src/lib/libc/arch/sh3/gen: Makefile.inc Removed Files: src/lib/libc/arch/sh3/gen: fabs.c Log Message: Use fabs_ieee754.c. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/lib/libc/arch/sh3/gen/Makefile.inc cvs rdiff -u -r1.3 -r0 src/lib/libc/arch/sh3/gen/fabs.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/arch/sh3/gen/Makefile.inc diff -u src/lib/libc/arch/sh3/gen/Makefile.inc:1.25 src/lib/libc/arch/sh3/gen/Makefile.inc:1.26 --- src/lib/libc/arch/sh3/gen/Makefile.inc:1.25 Sun Dec 6 07:12:17 2009 +++ src/lib/libc/arch/sh3/gen/Makefile.inc Mon Jan 20 17:14:38 2014 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.25 2009/12/06 07:12:17 uebayasi Exp $ +# $NetBSD: Makefile.inc,v 1.26 2014/01/20 17:14:38 joerg Exp $ SRCS+= setjmp.S _setjmp.S sigsetjmp.S @@ -6,7 +6,7 @@ SRCS+= makecontext.c resumecontext.c swa SRCS+= _lwp.c -SRCS+= fabs.c flt_rounds.c bswap16.c bswap32.c bswap64.c +SRCS+= fabs_ieee754.c flt_rounds.c bswap16.c bswap32.c bswap64.c # Common ieee754 constants and functions SRCS+= infinityf_ieee754.c infinity_ieee754.c infinityl_dbl_ieee754.c
CVS commit: src/sys/arch/alpha/conf
Module Name:src Committed By: tsutsui Date: Mon Jan 20 15:32:23 UTC 2014 Modified Files: src/sys/arch/alpha/conf: GENERIC Log Message: Add and enable radeonfb(4) at pci with options RADEONFB_DEPTH_32. Requested and tested (with wsfb Xorg server) by Naruaki Etomi in PR/48431. To generate a diff of this commit: cvs rdiff -u -r1.356 -r1.357 src/sys/arch/alpha/conf/GENERIC 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/alpha/conf/GENERIC diff -u src/sys/arch/alpha/conf/GENERIC:1.356 src/sys/arch/alpha/conf/GENERIC:1.357 --- src/sys/arch/alpha/conf/GENERIC:1.356 Mon Dec 23 13:08:00 2013 +++ src/sys/arch/alpha/conf/GENERIC Mon Jan 20 15:32:23 2014 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.356 2013/12/23 13:08:00 skrll Exp $ +# $NetBSD: GENERIC,v 1.357 2014/01/20 15:32:23 tsutsui Exp $ # # This machine description file is used to generate the default NetBSD # kernel. @@ -19,7 +19,7 @@ include "arch/alpha/conf/std.alpha" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -ident "GENERIC-$Revision: 1.356 $" +ident "GENERIC-$Revision: 1.357 $" maxusers 32 @@ -359,6 +359,8 @@ pcn* at pci? dev ? function ? # AMD PCn pcscp* at pci? dev ? function ? # AMD Am53c974 PCscsi-PCI ppb* at pci? dev ? function ? # PCI-PCI Bridges puc* at pci? dev ? function ? # PCI "universal" comm. cards +radeonfb* at pci? dev ? function ? # ATI/AMD Radeon Graphics +options RADEONFB_DEPTH_32 re* at pci? dev ? function ? # Realtek 8169 Ethernet rtk* at pci? dev ? function ? # Realtek 8129/8139 Ethernet sio* at pci? dev ? function ? # Intel PCI-ISA Bridges @@ -695,6 +697,7 @@ wsdisplay* at sfb? #wsdisplay* at sfbp? wsdisplay* at px? wsdisplay* at pxg? +wsdisplay* at radeonfb? wsdisplay* at vga? wsdisplay* at tga? wskbd* at lkkbd? console ?
CVS commit: src/sys/arch/alpha
Module Name:src
Committed By: tsutsui
Date: Mon Jan 20 15:05:14 UTC 2014
Modified Files:
src/sys/arch/alpha/alpha: autoconf.c
src/sys/arch/alpha/include: pci_machdep.h
src/sys/arch/alpha/pci: pci_machdep.c
Log Message:
Check and set "is_console" property to PCI displays for framebuffer drivers.
Tested on DS15 with radeonfb(4) and XP1000 with vga(4)
by Naruaki Etomi in PR/48431.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/alpha/alpha/autoconf.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/alpha/include/pci_machdep.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/alpha/pci/pci_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/alpha/alpha/autoconf.c
diff -u src/sys/arch/alpha/alpha/autoconf.c:1.52 src/sys/arch/alpha/alpha/autoconf.c:1.53
--- src/sys/arch/alpha/alpha/autoconf.c:1.52 Sun Jul 29 18:05:39 2012
+++ src/sys/arch/alpha/alpha/autoconf.c Mon Jan 20 15:05:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.52 2012/07/29 18:05:39 mlelstv Exp $ */
+/* $NetBSD: autoconf.c,v 1.53 2014/01/20 15:05:13 tsutsui Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -42,7 +42,9 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.52 2012/07/29 18:05:39 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.53 2014/01/20 15:05:13 tsutsui Exp $");
+
+#include "pci.h"
#include
#include
@@ -53,6 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
#include
#include
+#include
+
#include
#include
#include
@@ -172,6 +176,13 @@ atoi(const char *s)
void
device_register(device_t dev, void *aux)
{
+#if NPCI > 0
+ device_t parent = device_parent(dev);
+
+ if (parent != NULL && device_is_a(parent, "pci"))
+ device_pci_register(dev, aux);
+#endif
+
if (bootdev_data == NULL) {
/*
* There is no hope.
Index: src/sys/arch/alpha/include/pci_machdep.h
diff -u src/sys/arch/alpha/include/pci_machdep.h:1.15 src/sys/arch/alpha/include/pci_machdep.h:1.16
--- src/sys/arch/alpha/include/pci_machdep.h:1.15 Mon Feb 6 02:14:13 2012
+++ src/sys/arch/alpha/include/pci_machdep.h Mon Jan 20 15:05:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.h,v 1.15 2012/02/06 02:14:13 matt Exp $ */
+/* $NetBSD: pci_machdep.h,v 1.16 2014/01/20 15:05:13 tsutsui Exp $ */
/*
* Copyright (c) 1996 Carnegie-Mellon University.
@@ -109,3 +109,4 @@ void pci_display_console(bus_space_tag_t
((c)->pc_pciide_compat_intr_establish == NULL ? NULL : \
(*(c)->pc_pciide_compat_intr_establish)((c)->pc_conf_v, (d), (p), \
(ch), (f), (a)))
+void device_pci_register(device_t, void *);
Index: src/sys/arch/alpha/pci/pci_machdep.c
diff -u src/sys/arch/alpha/pci/pci_machdep.c:1.19 src/sys/arch/alpha/pci/pci_machdep.c:1.20
--- src/sys/arch/alpha/pci/pci_machdep.c:1.19 Mon Feb 6 02:14:15 2012
+++ src/sys/arch/alpha/pci/pci_machdep.c Mon Jan 20 15:05:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.19 2012/02/06 02:14:15 matt Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.20 2014/01/20 15:05:14 tsutsui Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -33,7 +33,7 @@
#include /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.19 2012/02/06 02:14:15 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.20 2014/01/20 15:05:14 tsutsui Exp $");
#include
#include
@@ -59,6 +59,8 @@ __KERNEL_RCSID(0, "$NetBSD: pci_machdep.
#include
#endif
+#include
+
void
pci_display_console(bus_space_tag_t iot, bus_space_tag_t memt, pci_chipset_tag_t pc, int bus, int device, int function)
{
@@ -101,3 +103,20 @@ pci_display_console(bus_space_tag_t iot,
panic("pci_display_console: unconfigured device at %d/%d/%d",
bus, device, function);
}
+
+void
+device_pci_register(device_t dev, void *aux)
+{
+ struct pci_attach_args *pa = aux;
+ struct ctb *ctb;
+ prop_dictionary_t dict;
+
+ /* set properties for PCI framebuffers */
+ ctb = (struct ctb *)(((char *)hwrpb) + hwrpb->rpb_ctb_off);
+ if (PCI_CLASS(pa->pa_class) == PCI_CLASS_DISPLAY &&
+ ctb->ctb_term_type == CTB_GRAPHICS) {
+ /* XXX should consider multiple displays? */
+ dict = device_properties(dev);
+ prop_dictionary_set_bool(dict, "is_console", true);
+ }
+}
CVS commit: src/tests/lib/libc/locale
Module Name:src
Committed By: yamt
Date: Mon Jan 20 14:14:56 UTC 2014
Modified Files:
src/tests/lib/libc/locale: t_io.c
Log Message:
- fix funopen usage
- some more checks
- remove a bogus test case (bad_eucJP_getwc) PR/47660 (Julio Merino)
- add XXX comments
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/lib/libc/locale/t_io.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/locale/t_io.c
diff -u src/tests/lib/libc/locale/t_io.c:1.2 src/tests/lib/libc/locale/t_io.c:1.3
--- src/tests/lib/libc/locale/t_io.c:1.2 Sun Mar 17 05:02:13 2013
+++ src/tests/lib/libc/locale/t_io.c Mon Jan 20 14:14:56 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: t_io.c,v 1.2 2013/03/17 05:02:13 jmmv Exp $ */
+/* $NetBSD: t_io.c,v 1.3 2014/01/20 14:14:56 yamt Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include
__COPYRIGHT("@(#) Copyright (c) 2011\
The NetBSD Foundation, inc. All rights reserved.");
-__RCSID("$NetBSD: t_io.c,v 1.2 2013/03/17 05:02:13 jmmv Exp $");
+__RCSID("$NetBSD: t_io.c,v 1.3 2014/01/20 14:14:56 yamt Exp $");
#include
#include
@@ -53,10 +53,11 @@ ATF_TC_HEAD(bad_big5_wprintf, tc)
ATF_TC_BODY(bad_big5_wprintf, tc)
{
+ /* XXX implementation detail knowledge (wchat_t encoding) */
wchar_t ibuf[] = { 0xcf10, 0 };
setlocale(LC_CTYPE, "zh_TW.Big5");
- atf_tc_expect_fail("PR lib/47660");
- ATF_REQUIRE_EQ(wprintf(L"%ls\n", ibuf), -1);
+ ATF_REQUIRE_ERRNO(EILSEQ, wprintf(L"%ls\n", ibuf) < 0);
+ ATF_REQUIRE(ferror(stdout));
}
ATF_TC(bad_big5_swprintf);
@@ -67,10 +68,12 @@ ATF_TC_HEAD(bad_big5_swprintf, tc)
ATF_TC_BODY(bad_big5_swprintf, tc)
{
+ /* XXX implementation detail knowledge (wchat_t encoding) */
wchar_t ibuf[] = { 0xcf10, 0 };
wchar_t obuf[20];
setlocale(LC_CTYPE, "zh_TW.Big5");
- ATF_REQUIRE_EQ(swprintf(obuf, sizeof(obuf), L"%ls\n", ibuf), -1);
+ ATF_REQUIRE_ERRNO(EILSEQ,
+ swprintf(obuf, sizeof(obuf), L"%ls\n", ibuf) < 0);
}
ATF_TC(good_big5_wprintf);
@@ -81,9 +84,9 @@ ATF_TC_HEAD(good_big5_wprintf, tc)
ATF_TC_BODY(good_big5_wprintf, tc)
{
+ /* XXX implementation detail knowledge (wchat_t encoding) */
wchar_t ibuf[] = { 0xcf40, 0 };
setlocale(LC_CTYPE, "zh_TW.Big5");
- // WTF? swprintf() fails, wprintf succeeds?
ATF_REQUIRE_EQ(wprintf(L"%ls\n", ibuf), 2);
}
@@ -95,15 +98,28 @@ ATF_TC_HEAD(good_big5_swprintf, tc)
ATF_TC_BODY(good_big5_swprintf, tc)
{
+ /* XXX implementation detail knowledge (wchat_t encoding) */
wchar_t ibuf[] = { 0xcf40, 0 };
wchar_t obuf[20];
setlocale(LC_CTYPE, "zh_TW.Big5");
ATF_REQUIRE_EQ(swprintf(obuf, sizeof(obuf), L"%ls\n", ibuf), 2);
}
-static int readfn(void *p, char *buf, int len) {
- memcpy(buf, p, MIN(len, 2));
- return 2;
+struct ibuf {
+ off_t off;
+ size_t buflen;
+ const char *buf;
+};
+
+static int
+readfn(void *vp, char *buf, int len)
+{
+ struct ibuf *ib = vp;
+ size_t todo = MIN((size_t)len, ib->buflen - ib->off);
+
+ memcpy(buf, ib->buf + ib->off, todo);
+ ib->off += todo;
+ return todo;
}
ATF_TC(good_big5_getwc);
@@ -114,11 +130,16 @@ ATF_TC_HEAD(good_big5_getwc, tc)
ATF_TC_BODY(good_big5_getwc, tc)
{
- char ibuf[] = { 0xcf, 0x40 };
- FILE *fp = funopen(ibuf, readfn, NULL, NULL, NULL);
+ const char buf[] = { 0xcf, 0x40 };
+ struct ibuf ib = {
+ .buf = buf,
+ .buflen = sizeof(buf),
+ };
+ FILE *fp = funopen(&ib, readfn, NULL, NULL, NULL);
ATF_REQUIRE(fp != NULL);
setlocale(LC_CTYPE, "zh_TW.Big5");
+ /* XXX implementation detail knowledge (wchat_t encoding) */
ATF_REQUIRE_EQ(getwc(fp), 0xcf40);
fclose(fp);
}
@@ -131,8 +152,12 @@ ATF_TC_HEAD(bad_big5_getwc, tc)
ATF_TC_BODY(bad_big5_getwc, tc)
{
- char ibuf[] = { 0xcf, 0x20 };
- FILE *fp = funopen(ibuf, readfn, NULL, NULL, NULL);
+ const char buf[] = { 0xcf, 0x20 };
+ struct ibuf ib = {
+ .buf = buf,
+ .buflen = sizeof(buf),
+ };
+ FILE *fp = funopen(&ib, readfn, NULL, NULL, NULL);
ATF_REQUIRE(fp != NULL);
setlocale(LC_CTYPE, "zh_TW.Big5");
@@ -140,26 +165,6 @@ ATF_TC_BODY(bad_big5_getwc, tc)
fclose(fp);
}
-ATF_TC(bad_eucJP_getwc);
-ATF_TC_HEAD(bad_eucJP_getwc, tc)
-{
- atf_tc_set_md_var(tc, "descr", "Test bad eucJP wchar getwc");
-}
-
-ATF_TC_BODY(bad_eucJP_getwc, tc)
-{
- char ibuf[] = { 0xcf, 0x20 };
- FILE *fp = funopen(ibuf, readfn, NULL, NULL, NULL);
-
- ATF_REQUIRE(fp != NULL);
- setlocale(LC_CTYPE, "ja_JP.eucJP");
- // WTF? Not even returning what it read?
- ATF_CHECK_EQ(getwc(fp), 0xcf20);
- atf_tc_expect_fail("PR lib/47660");
- ATF_REQUIRE_EQ(getwc(fp), WEOF);
- fclose(fp);
-}
-
ATF_TP_ADD_TCS(tp)
{
ATF_TP_ADD_TC(tp, bad_big5_wprintf);
@@ -168,7 +173,6 @@ ATF_TP_ADD_TCS(tp)
ATF_TP_ADD_TC(tp, good_big5_swprintf);
ATF_TP_ADD_TC(tp, good_big5_getwc);
ATF_TP_ADD_TC(tp, bad_big5_getwc);
- ATF_TP_ADD_TC(tp, bad_eucJP_getwc);
return atf_no_error();
}
CVS commit: src/lib/libc/stdio
Module Name:src
Committed By: yamt
Date: Mon Jan 20 14:11:03 UTC 2014
Modified Files:
src/lib/libc/stdio: vfwprintf.c
Log Message:
vfwprintf: fix error propagation
PR/47660 (Julio Merino)
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/lib/libc/stdio/vfwprintf.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/stdio/vfwprintf.c
diff -u src/lib/libc/stdio/vfwprintf.c:1.33 src/lib/libc/stdio/vfwprintf.c:1.34
--- src/lib/libc/stdio/vfwprintf.c:1.33 Mon Sep 23 12:41:37 2013
+++ src/lib/libc/stdio/vfwprintf.c Mon Jan 20 14:11:03 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: vfwprintf.c,v 1.33 2013/09/23 12:41:37 pooka Exp $ */
+/* $NetBSD: vfwprintf.c,v 1.34 2014/01/20 14:11:03 yamt Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93";
__FBSDID("$FreeBSD: src/lib/libc/stdio/vfwprintf.c,v 1.27 2007/01/09 00:28:08 imp Exp $");
#else
-__RCSID("$NetBSD: vfwprintf.c,v 1.33 2013/09/23 12:41:37 pooka Exp $");
+__RCSID("$NetBSD: vfwprintf.c,v 1.34 2014/01/20 14:11:03 yamt Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -712,7 +712,10 @@ WDECL(__vf,printf_unlocked_l)(FILE *fp,
#ifndef NARROW
#define PRINT(ptr, len) do { \
for (n3 = 0; n3 < (len); n3++) \
- __xfputwc((ptr)[n3], fp, loc); \
+ if (__xfputwc((ptr)[n3], fp, loc) == END_OF_FILE) { \
+ fp->_flags |= __SERR; \
+ goto error; \
+ }\
} while (/*CONSTCOND*/0)
#define FLUSH()
#else
CVS commit: src/bin/sh
Module Name:src
Committed By: roy
Date: Mon Jan 20 14:05:52 UTC 2014
Modified Files:
src/bin/sh: expand.c sh.1
Log Message:
Add wctype(3) support to Shell Patterns.
Obtained from FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/bin/sh/expand.c
cvs rdiff -u -r1.111 -r1.112 src/bin/sh/sh.1
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/expand.c
diff -u src/bin/sh/expand.c:1.90 src/bin/sh/expand.c:1.91
--- src/bin/sh/expand.c:1.90 Sun Oct 6 21:05:50 2013
+++ src/bin/sh/expand.c Mon Jan 20 14:05:51 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.90 2013/10/06 21:05:50 ast Exp $ */
+/* $NetBSD: expand.c,v 1.91 2014/01/20 14:05:51 roy Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95";
#else
-__RCSID("$NetBSD: expand.c,v 1.90 2013/10/06 21:05:50 ast Exp $");
+__RCSID("$NetBSD: expand.c,v 1.91 2014/01/20 14:05:51 roy Exp $");
#endif
#endif /* not lint */
@@ -51,6 +51,7 @@ __RCSID("$NetBSD: expand.c,v 1.90 2013/1
#include
#include
#include
+#include
/*
* Routines to expand arguments to commands. We have to deal with
@@ -1365,6 +1366,37 @@ msort(struct strlist *list, int len)
}
+/*
+ * See if a character matches a character class, starting at the first colon
+ * of "[:class:]".
+ * If a valid character class is recognized, a pointer to the next character
+ * after the final closing bracket is stored into *end, otherwise a null
+ * pointer is stored into *end.
+ */
+static int
+match_charclass(char *p, wchar_t chr, char **end)
+{
+ char name[20];
+ char *nameend;
+ wctype_t cclass;
+
+ *end = NULL;
+ p++;
+ nameend = strstr(p, ":]");
+ if (nameend == NULL || (size_t)(nameend - p) >= sizeof(name) ||
+ nameend == p)
+ return 0;
+ memcpy(name, p, nameend - p);
+ name[nameend - p] = '\0';
+ *end = nameend + 2;
+ cclass = wctype(name);
+ /* An unknown class matches nothing but is valid nevertheless. */
+ if (cclass == 0)
+ return 0;
+ return iswctype(chr, cclass);
+}
+
+
/*
* Returns true if the pattern matches the string.
@@ -1385,7 +1417,7 @@ patmatch(char *pattern, char *string, in
STATIC int
pmatch(char *pattern, char *string, int squoted)
{
- char *p, *q;
+ char *p, *q, *end;
char c;
p = pattern;
@@ -1465,6 +1497,11 @@ pmatch(char *pattern, char *string, int
do {
if (c == CTLQUOTEMARK)
continue;
+if (c == '[' && *p == ':') {
+ found |= match_charclass(p, chr, &end);
+ if (end != NULL)
+ p = end;
+}
if (c == CTLESC)
c = *p++;
if (*p == '-' && p[1] != ']') {
Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.111 src/bin/sh/sh.1:1.112
--- src/bin/sh/sh.1:1.111 Wed Oct 2 20:42:56 2013
+++ src/bin/sh/sh.1 Mon Jan 20 14:05:51 2014
@@ -1,4 +1,4 @@
-.\" $NetBSD: sh.1,v 1.111 2013/10/02 20:42:56 christos Exp $
+.\" $NetBSD: sh.1,v 1.112 2014/01/20 14:05:51 roy Exp $
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
.\"
@@ -31,7 +31,7 @@
.\"
.\" @(#)sh.1 8.6 (Berkeley) 5/4/95
.\"
-.Dd October 2, 2013
+.Dd January 20, 2014
.Dt SH 1
.Os
.Sh NAME
@@ -1157,6 +1157,15 @@ matches a
.Dq \&[
rather than introducing a character class.
A character class matches any of the characters between the square brackets.
+A named class of characters (see
+.Xr wctype 3 )
+may be specified by surrounding the name with
+.Pq Dq [:
+and
+.Pq Dq :] .
+For example,
+.Pq Dq [[:alpha:]]
+is a shell pattern that matches a single letter.
A range of characters may be specified using a minus sign
.Pq Dq - .
The character class may be complemented
CVS commit: src/gnu/usr.bin/gettext
Module Name:src
Committed By: apb
Date: Mon Jan 20 10:57:38 UTC 2014
Modified Files:
src/gnu/usr.bin/gettext/libnlspr: Makefile
src/gnu/usr.bin/gettext/msginit: Makefile
Log Message:
Don't include ${DESTDIR} in -DLIBDIR=..., -DGETTEXTDATADIR=...,
and a few other variables.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/gnu/usr.bin/gettext/libnlspr/Makefile
cvs rdiff -u -r1.3 -r1.4 src/gnu/usr.bin/gettext/msginit/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/gnu/usr.bin/gettext/libnlspr/Makefile
diff -u src/gnu/usr.bin/gettext/libnlspr/Makefile:1.9 src/gnu/usr.bin/gettext/libnlspr/Makefile:1.10
--- src/gnu/usr.bin/gettext/libnlspr/Makefile:1.9 Thu May 26 12:56:28 2011
+++ src/gnu/usr.bin/gettext/libnlspr/Makefile Mon Jan 20 10:57:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2011/05/26 12:56:28 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2014/01/20 10:57:38 apb Exp $
LIBISPRIVATE= yes
@@ -70,9 +70,9 @@ write-tcl.c
.PATH: ${DIST}/gettext/gettext-tools/src ${DIST}/gettext/gettext-tools/lib
CPPFLAGS+=-I${DIST}/gettext/gettext-runtime/intl
CPPFLAGS+=-I${DIST}/gettext/gettext-tools/src
-CPPFLAGS+=-DLIBDIR=\"${DESTDIR}/usr/share\"
-CPPFLAGS+=-DGETTEXTJAR=\"${DESTDIR}/usr/share/gettext/gettext.jar\"
-CPPFLAGS+=-DGETTEXTDATADIR=\"${DESTDIR}/usr/share/gettext\"
+CPPFLAGS+=-DLIBDIR=\"/usr/share\"
+CPPFLAGS+=-DGETTEXTJAR=\"/usr/share/gettext/gettext.jar\"
+CPPFLAGS+=-DGETTEXTDATADIR=\"/usr/share/gettext\"
COPTS.format-java.c = -Wno-stack-protector
COPTS.msgl-cat.c = -Wno-stack-protector
Index: src/gnu/usr.bin/gettext/msginit/Makefile
diff -u src/gnu/usr.bin/gettext/msginit/Makefile:1.3 src/gnu/usr.bin/gettext/msginit/Makefile:1.4
--- src/gnu/usr.bin/gettext/msginit/Makefile:1.3 Fri Nov 10 17:36:08 2006
+++ src/gnu/usr.bin/gettext/msginit/Makefile Mon Jan 20 10:57:38 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/11/10 17:36:08 christos Exp $
+# $NetBSD: Makefile,v 1.4 2014/01/20 10:57:38 apb Exp $
PROG= msginit
SRCS+= msginit.c \
@@ -9,9 +9,9 @@ localename.c
.include "${.CURDIR}/../Makefile.inc.prog"
CPPFLAGS+=-I${DIST}/gettext/gettext-runtime/intl
-CPPFLAGS+=-DLIBDIR=\"${DESTDIR}/usr/share\" \
--DPROJECTSDIR=\"${DESTDIR}/usr/share\" \
--DLOCALE_ALIAS_PATH=\"${DESTDIR}/usr/share/locale\"
+CPPFLAGS+=-DLIBDIR=\"/usr/share\" \
+-DPROJECTSDIR=\"/usr/share\" \
+-DLOCALE_ALIAS_PATH=\"/usr/share/locale\"
COPTS.msginit.c = -Wno-stack-protector
COPTS.localealias.c = -Wno-stack-protector
CVS commit: src/external/gpl3/gdb/lib/libbfd
Module Name:src
Committed By: apb
Date: Mon Jan 20 10:49:33 UTC 2014
Modified Files:
src/external/gpl3/gdb/lib/libbfd: Makefile
Log Message:
Don't embed ${DESTDIR} in the -DDEBUGDIR=... value.
DEBUGDIR should refer to a directory on the running system,
not the staging area used during a build.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gdb/lib/libbfd/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/gdb/lib/libbfd/Makefile
diff -u src/external/gpl3/gdb/lib/libbfd/Makefile:1.4 src/external/gpl3/gdb/lib/libbfd/Makefile:1.5
--- src/external/gpl3/gdb/lib/libbfd/Makefile:1.4 Tue Aug 13 19:29:45 2013
+++ src/external/gpl3/gdb/lib/libbfd/Makefile Mon Jan 20 10:49:33 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2013/08/13 19:29:45 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/20 10:49:33 apb Exp $
.include
.include "../Makefile.inc"
@@ -12,7 +12,7 @@ LIB= bfd
GCPPFLAGS= ${G_archdefs} ${G_DEFS} ${G_INCLUDES} ${G_TDEFAULTS}
CPPFLAGS+= -I${.CURDIR}/arch/${GDB_MACHINE_ARCH} -I${DIST}/include -I. \
-I${DIST}/bfd ${GCPPFLAGS:M-D*} ${GCPPFLAGS:M-I*:N-I.*} \
- -DDEBUGDIR=\"${DESTDIR}/usr/libdata/debug\"
+ -DDEBUGDIR=\"/usr/libdata/debug\"
GSRCS= ${G_libbfd_la_OBJECTS:libbfd.lo=lib_bfd.lo} \
${G_libbfd_la_DEPENDENCIES:M*.lo}
