CVS commit: src/external/lgpl3/mpfr/lib/libmpfr
Module Name:src
Committed By: matt
Date: Tue Aug 20 00:20:55 UTC 2013
Modified Files:
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
Log Message:
Add dropped v
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/lgpl3/mpfr/lib/libmpfr/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/lgpl3/mpfr/lib/libmpfr/Makefile
diff -u src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.13 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.14
--- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.13 Mon Aug 19 22:25:32 2013
+++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Tue Aug 20 00:20:55 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2013/08/19 22:25:32 matt Exp $
+# $NetBSD: Makefile,v 1.14 2013/08/20 00:20:55 matt Exp $
.include
@@ -476,7 +476,7 @@ CPPFLAGS+= -I. \
-DHAVE_ATTRIBUTE_MODE=1
# Find
-GMP_MACHINE_ARCH=${MACHINE_ARCH:S/earmv4/arm/:C/arm[5-7]/arm/}
+GMP_MACHINE_ARCH=${MACHINE_ARCH:S/earmv4/arm/:C/armv[5-7]/arm/}
CPPFLAGS+= -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}
# XXX
CVS commit: src/lib/libc
Module Name:src
Committed By: joerg
Date: Mon Aug 19 22:43:28 UTC 2013
Modified Files:
src/lib/libc/citrus: citrus_lc_ctype.c
src/lib/libc/gen: isctype.c
src/lib/libc/locale: global_locale.c setlocale_local.h
Log Message:
Remove most LC_CTYPE specific parts of locale.cache.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/citrus/citrus_lc_ctype.c
cvs rdiff -u -r1.24 -r1.25 src/lib/libc/gen/isctype.c
cvs rdiff -u -r1.18 -r1.19 src/lib/libc/locale/global_locale.c
cvs rdiff -u -r1.12 -r1.13 src/lib/libc/locale/setlocale_local.h
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/citrus/citrus_lc_ctype.c
diff -u src/lib/libc/citrus/citrus_lc_ctype.c:1.12 src/lib/libc/citrus/citrus_lc_ctype.c:1.13
--- src/lib/libc/citrus/citrus_lc_ctype.c:1.12 Sun Aug 18 20:03:48 2013
+++ src/lib/libc/citrus/citrus_lc_ctype.c Mon Aug 19 22:43:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_lc_ctype.c,v 1.12 2013/08/18 20:03:48 joerg Exp $ */
+/* $NetBSD: citrus_lc_ctype.c,v 1.13 2013/08/19 22:43:28 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: citrus_lc_ctype.c,v 1.12 2013/08/18 20:03:48 joerg Exp $");
+__RCSID("$NetBSD: citrus_lc_ctype.c,v 1.13 2013/08/19 22:43:28 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include "reentrant.h"
@@ -103,15 +103,7 @@ _PREFIX(build_cache)(struct _locale_cach
_DIAGASSERT(cache->items != NULL);
_DIAGASSERT(data != NULL);
- cache->ctype_tab = data->rl_ctype_tab;
- cache->tolower_tab = data->rl_tolower_tab;
- cache->toupper_tab = data->rl_toupper_tab;
- cache->mb_cur_max = _citrus_ctype_get_mb_cur_max(data->rl_citrus_ctype);
cache->items[(size_t)CODESET] = data->rl_codeset;
-
-#ifdef __BUILD_LEGACY
- cache->compat_bsdctype = data->rl_compat_bsdctype;
-#endif
}
static __inline void
Index: src/lib/libc/gen/isctype.c
diff -u src/lib/libc/gen/isctype.c:1.24 src/lib/libc/gen/isctype.c:1.25
--- src/lib/libc/gen/isctype.c:1.24 Fri May 17 12:55:57 2013
+++ src/lib/libc/gen/isctype.c Mon Aug 19 22:43:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: isctype.c,v 1.24 2013/05/17 12:55:57 joerg Exp $ */
+/* $NetBSD: isctype.c,v 1.25 2013/08/19 22:43:28 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: isctype.c,v 1.24 2013/05/17 12:55:57 joerg Exp $");
+__RCSID("$NetBSD: isctype.c,v 1.25 2013/08/19 22:43:28 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -44,20 +44,22 @@ __RCSID("$NetBSD: isctype.c,v 1.24 2013/
#error "EOF != -1"
#endif
+#include "runetype_local.h"
#include "setlocale_local.h"
-#define _CTYPE_TAB(table, i) ((_current_cache()->table + 1)[i])
+#define _RUNE_LOCALE(loc) \
+((_RuneLocale *)((loc)->part_impl[(size_t)LC_CTYPE]))
#define _ISCTYPE_FUNC(name, bit) \
int \
is##name(int c) \
{ \
- return (int)(_CTYPE_TAB(ctype_tab, c) & (bit)); \
+ return (int)_ctype_tab_[c + 1] & (bit); \
} \
int \
is##name ## _l(int c, locale_t loc) \
{ \
- return (int)(((loc->cache->ctype_tab + 1)[c]) & (bit)); \
+ return (int)((_RUNE_LOCALE(loc)->rl_ctype_tab[c + 1]) & (bit)); \
}
_ISCTYPE_FUNC(alnum, (_CTYPE_A|_CTYPE_D))
@@ -76,25 +78,25 @@ _ISCTYPE_FUNC(xdigit, _CTYPE_X)
int
toupper(int c)
{
- return (int)_CTYPE_TAB(toupper_tab, c);
+ return (int)_toupper_tab_[c + 1];
}
int
toupper_l(int c, locale_t loc)
{
- return (int)(((loc->cache->toupper_tab + 1)[c]));
+ return (int)(_RUNE_LOCALE(loc)->rl_toupper_tab[c + 1]);
}
int
tolower(int c)
{
- return (int)_CTYPE_TAB(tolower_tab, c);
+ return (int)_tolower_tab_[c + 1];
}
int
tolower_l(int c, locale_t loc)
{
- return (int)(((loc->cache->tolower_tab + 1)[c]));
+ return (int)(_RUNE_LOCALE(loc)->rl_tolower_tab[c + 1]);
}
int
Index: src/lib/libc/locale/global_locale.c
diff -u src/lib/libc/locale/global_locale.c:1.18 src/lib/libc/locale/global_locale.c:1.19
--- src/lib/libc/locale/global_locale.c:1.18 Sun Aug 18 20:03:48 2013
+++ src/lib/libc/locale/global_locale.c Mon Aug 19 22:43:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: global_locale.c,v 1.18 2013/08/18 20:03:48 joerg Exp $ */
+/* $NetBSD: global_locale.c,v 1.19 2013/08/19 22:43:28 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -28,7 +28,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: global_locale.c,v 1.18 2013/08/18 20:03:48 joerg Exp $");
+__RCSID("$NetBSD: global_locale.c,v 1.19 2013/08/19 22:43:28 joerg Exp $");
#endif /* LIBC_SCCS and not lint */
#include
@@ -198,16 +198,8 @@ static const char * const _C_items [(siz
};
static struct _locale_cache_t _global_cache = {
-.ctype_tab = (const unsigned short *)&_C_ctype_tab_[0],
-.tolower_tab = (const short *)&_C_tolower_tab_[0],
-.toupper_tab = (const sh
CVS commit: src/share/locale
Module Name:src Committed By: joerg Date: Mon Aug 19 22:34:41 UTC 2013 Modified Files: src/share/locale: Makefile.locale Log Message: Remove duplicate zh entry. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/share/locale/Makefile.locale Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/locale/Makefile.locale diff -u src/share/locale/Makefile.locale:1.3 src/share/locale/Makefile.locale:1.4 --- src/share/locale/Makefile.locale:1.3 Sun Aug 11 22:09:40 2013 +++ src/share/locale/Makefile.locale Mon Aug 19 22:34:41 2013 @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.locale,v 1.3 2013/08/11 22:09:40 joerg Exp $ +# $NetBSD: Makefile.locale,v 1.4 2013/08/19 22:34:41 joerg Exp $ LANGUAGE= af be bg ca cs da de el en es \ et eu fi fr hr hu hy is it ja \ kk ko lt nb nl nn pt pl ro ru \ - sk sl sr_Cyrl sr_Latn sv tr uk zh zh + sk sl sr_Cyrl sr_Latn sv tr uk zh TERRITORY= AM AT AU BE BG BR BY CA CH CN \ CZ DE DK EE ES FI FR GB GR HK \
CVS commit: src/sys/arch/evbarm/nslu2
Module Name:src
Committed By: matt
Date: Mon Aug 19 22:26:10 UTC 2013
Modified Files:
src/sys/arch/evbarm/nslu2: nslu2_leds.c nslu2_machdep.c
Log Message:
Fix lossage
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/nslu2/nslu2_leds.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/nslu2/nslu2_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/evbarm/nslu2/nslu2_leds.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_leds.c:1.9 src/sys/arch/evbarm/nslu2/nslu2_leds.c:1.10
--- src/sys/arch/evbarm/nslu2/nslu2_leds.c:1.9 Sun Oct 14 14:20:58 2012
+++ src/sys/arch/evbarm/nslu2/nslu2_leds.c Mon Aug 19 22:26:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_leds.c,v 1.9 2012/10/14 14:20:58 msaitoh Exp $ */
+/* $NetBSD: nslu2_leds.c,v 1.10 2013/08/19 22:26:09 matt Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nslu2_leds.c,v 1.9 2012/10/14 14:20:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_leds.c,v 1.10 2013/08/19 22:26:09 matt Exp $");
#include
#include
@@ -38,8 +38,8 @@ __KERNEL_RCSID(0, "$NetBSD: nslu2_leds.c
#include
#include
#include
-
-#include
+#include
+#include
#include
#include
@@ -144,11 +144,11 @@ slugled_intr2(void *arg)
static int
slugled_tmr(void *arg)
{
- struct clockframe *frame = arg;
+ struct clockframe *cf = arg;
uint32_t reg, bit;
int is;
- if (CLKF_INTR(frame) || sched_curcpu_runnable_p() ||
+ if (CLKF_INTR(cf) || sched_curcpu_runnable_p() ||
(curlwp != NULL && curlwp != curcpu()->ci_data.cpu_idlelwp))
bit = LEDBITS_STATUS;
else
Index: src/sys/arch/evbarm/nslu2/nslu2_machdep.c
diff -u src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.23 src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.24
--- src/sys/arch/evbarm/nslu2/nslu2_machdep.c:1.23 Mon Nov 12 18:00:39 2012
+++ src/sys/arch/evbarm/nslu2/nslu2_machdep.c Mon Aug 19 22:26:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nslu2_machdep.c,v 1.23 2012/11/12 18:00:39 skrll Exp $ */
+/* $NetBSD: nslu2_machdep.c,v 1.24 2013/08/19 22:26:09 matt Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -94,7 +94,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.23 2012/11/12 18:00:39 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nslu2_machdep.c,v 1.24 2013/08/19 22:26:09 matt Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -110,6 +110,8 @@ __KERNEL_RCSID(0, "$NetBSD: nslu2_machde
#include
#include
#include
+#include
+#include
#include
@@ -120,9 +122,7 @@ __KERNEL_RCSID(0, "$NetBSD: nslu2_machde
#include
#include
-#include
-#include
-#include
+#include
#include
#include
CVS commit: src/external/lgpl3
Module Name:src
Committed By: matt
Date: Mon Aug 19 22:25:32 UTC 2013
Modified Files:
src/external/lgpl3/gmp/lib/libgmp: Makefile
src/external/lgpl3/mpfr/lib/libmpfr: Makefile
Log Message:
always compile GMP and MPFR as ARM
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/external/lgpl3/gmp/lib/libgmp/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/lgpl3/mpfr/lib/libmpfr/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/lgpl3/gmp/lib/libgmp/Makefile
diff -u src/external/lgpl3/gmp/lib/libgmp/Makefile:1.16 src/external/lgpl3/gmp/lib/libgmp/Makefile:1.17
--- src/external/lgpl3/gmp/lib/libgmp/Makefile:1.16 Tue Aug 6 05:35:57 2013
+++ src/external/lgpl3/gmp/lib/libgmp/Makefile Mon Aug 19 22:25:32 2013
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.16 2013/08/06 05:35:57 matt Exp $
+# $NetBSD: Makefile,v 1.17 2013/08/19 22:25:32 matt Exp $
.include
# We don't install gmp, just provide it for GCC.
LIBISPRIVATE?= yes
-GMP_MACHINE_ARCH?= ${MACHINE_ARCH:S/earmv4/arm/:C/armv[67]/arm/}
+GMP_MACHINE_ARCH?= ${MACHINE_ARCH:S/earmv4/arm/:C/armv[5-7]/arm/}
.if ${LIBISPRIVATE} != "yes"
INCS= gmp.h
@@ -228,5 +228,8 @@ CLEANFILES+= mpn_${_build}
# Don't warn about functions which cannot be stack smash protected as
# there are a lot of them.
COPTS += -Wno-stack-protector
+.if !empty(GMP_MACHINE_ARCH:M*arm*)
+COPTS += -marm
+.endif
CWARNFLAGS.clang+= -Wno-unused-value -Wno-tautological-compare
Index: src/external/lgpl3/mpfr/lib/libmpfr/Makefile
diff -u src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.12 src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.13
--- src/external/lgpl3/mpfr/lib/libmpfr/Makefile:1.12 Tue Aug 6 05:35:57 2013
+++ src/external/lgpl3/mpfr/lib/libmpfr/Makefile Mon Aug 19 22:25:32 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2013/08/06 05:35:57 matt Exp $
+# $NetBSD: Makefile,v 1.13 2013/08/19 22:25:32 matt Exp $
.include
@@ -476,7 +476,7 @@ CPPFLAGS+= -I. \
-DHAVE_ATTRIBUTE_MODE=1
# Find
-GMP_MACHINE_ARCH=${MACHINE_ARCH:C/armv[4-7]/arm/}
+GMP_MACHINE_ARCH=${MACHINE_ARCH:S/earmv4/arm/:C/arm[5-7]/arm/}
CPPFLAGS+= -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}
# XXX
@@ -515,6 +515,9 @@ CLEANFILES+= mparam.h
.PATH: ${.CURDIR}/../../dist
+.if !empty(MACHINE_ARCH:M*arm*)
+COPTS += -marm
+.endif
.if ${MACHINE_ARCH} == "vax"
COPTS.set_ld.c+= -Wno-error
.endif
CVS commit: src/external/gpl3/binutils/dist/gas/config
Module Name:src
Committed By: matt
Date: Mon Aug 19 22:23:12 UTC 2013
Modified Files:
src/external/gpl3/binutils/dist/gas/config: tc-arm.c
Log Message:
Add cortex-a7
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/dist/gas/config/tc-arm.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/gpl3/binutils/dist/gas/config/tc-arm.c
diff -u src/external/gpl3/binutils/dist/gas/config/tc-arm.c:1.4 src/external/gpl3/binutils/dist/gas/config/tc-arm.c:1.5
--- src/external/gpl3/binutils/dist/gas/config/tc-arm.c:1.4 Sat Oct 1 19:25:24 2011
+++ src/external/gpl3/binutils/dist/gas/config/tc-arm.c Mon Aug 19 22:23:12 2013
@@ -22556,6 +22556,9 @@ static const struct arm_cpu_option_table
{"arm1176jzf-s", ARM_ARCH_V6ZK, FPU_ARCH_VFP_V2, NULL},
{"cortex-a5", ARM_ARCH_V7A_MP_SEC,
FPU_NONE, "Cortex-A5"},
+ {"cortex-a7", ARM_ARCH_V7A_IDIV_MP_SEC_VIRT,
+ FPU_ARCH_NEON_VFP_V4,
+ "Cortex-A7"},
{"cortex-a8", ARM_ARCH_V7A_SEC,
ARM_FEATURE (0, FPU_VFP_V3
| FPU_NEON_EXT_V1),
CVS commit: src/lib/libc_vfp
Module Name:src Committed By: matt Date: Mon Aug 19 22:22:23 UTC 2013 Modified Files: src/lib/libc_vfp: Makefile Log Message: Always compile as arm code. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc_vfp/Makefile 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_vfp/Makefile diff -u src/lib/libc_vfp/Makefile:1.2 src/lib/libc_vfp/Makefile:1.3 --- src/lib/libc_vfp/Makefile:1.2 Mon Jan 28 18:57:10 2013 +++ src/lib/libc_vfp/Makefile Mon Aug 19 22:22:23 2013 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2013/01/28 18:57:10 matt Exp $ +# $NetBSD: Makefile,v 1.3 2013/08/19 22:22:23 matt Exp $ # LIB= c_vfp @@ -7,7 +7,7 @@ USE_SHLIBDIR= yes .include -CPUFLAGS+= -mfpu=vfp +CPUFLAGS+= -mfpu=vfp -marm SRCS= vfpsf.S vfpdf.S
CVS commit: src/lib/csu/common
Module Name:src
Committed By: matt
Date: Mon Aug 19 22:15:13 UTC 2013
Modified Files:
src/lib/csu/common: crtbegin.c
Log Message:
Put the ctors code in .text.startup and dtors code in .text.exit
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/csu/common/crtbegin.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/csu/common/crtbegin.c
diff -u src/lib/csu/common/crtbegin.c:1.3 src/lib/csu/common/crtbegin.c:1.4
--- src/lib/csu/common/crtbegin.c:1.3 Thu Jun 27 21:24:39 2013
+++ src/lib/csu/common/crtbegin.c Mon Aug 19 22:15:13 2013
@@ -27,7 +27,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: crtbegin.c,v 1.3 2013/06/27 21:24:39 matt Exp $");
+__RCSID("$NetBSD: crtbegin.c,v 1.4 2013/08/19 22:15:13 matt Exp $");
typedef void (*fptr_t)(void);
@@ -65,7 +65,7 @@ static long dwarf_eh_object[8];
static void __do_global_ctors_aux(void) __used;
-static void
+static void __section(".text.startup")
__do_global_ctors_aux(void)
{
static unsigned char __initialized;
@@ -100,7 +100,7 @@ __dso_hidden extern const fptr_t __DTOR_
static void __do_global_dtors_aux(void) __used;
-static void
+static void __section(".text.exit")
__do_global_dtors_aux(void)
{
static unsigned char __finished;
CVS commit: src/lib/libc
Module Name:src
Committed By: matt
Date: Mon Aug 19 22:14:37 UTC 2013
Modified Files:
src/lib/libc/arch/arm/misc: arm_initfini.c
src/lib/libc/misc: initfini.c stack_protector.c
src/lib/libc/stdlib: _env.c atexit.c
src/lib/libc/thread-stub: thread-stub-init.c
src/lib/libc/tls: tls.c
Log Message:
Put the startup code in .text.startup
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/arm/misc/arm_initfini.c
cvs rdiff -u -r1.10 -r1.11 src/lib/libc/misc/initfini.c
cvs rdiff -u -r1.8 -r1.9 src/lib/libc/misc/stack_protector.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/stdlib/_env.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libc/stdlib/atexit.c
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/thread-stub/thread-stub-init.c
cvs rdiff -u -r1.6 -r1.7 src/lib/libc/tls/tls.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/arm/misc/arm_initfini.c
diff -u src/lib/libc/arch/arm/misc/arm_initfini.c:1.4 src/lib/libc/arch/arm/misc/arm_initfini.c:1.5
--- src/lib/libc/arch/arm/misc/arm_initfini.c:1.4 Fri Aug 16 17:09:27 2013
+++ src/lib/libc/arch/arm/misc/arm_initfini.c Mon Aug 19 22:14:37 2013
@@ -29,7 +29,7 @@
#include
-__RCSID("$NetBSD: arm_initfini.c,v 1.4 2013/08/16 17:09:27 matt Exp $");
+__RCSID("$NetBSD: arm_initfini.c,v 1.5 2013/08/19 22:14:37 matt Exp $");
#include "namespace.h"
@@ -51,7 +51,7 @@ static bool _libc_aapcs_initialized;
void _libc_aapcs_init(void) __attribute__((__constructor__, __used__));
-void
+void __section(".text.startup")
_libc_aapcs_init(void)
{
if (!_libc_aapcs_initialized) {
Index: src/lib/libc/misc/initfini.c
diff -u src/lib/libc/misc/initfini.c:1.10 src/lib/libc/misc/initfini.c:1.11
--- src/lib/libc/misc/initfini.c:1.10 Thu Feb 16 23:00:39 2012
+++ src/lib/libc/misc/initfini.c Mon Aug 19 22:14:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: initfini.c,v 1.10 2012/02/16 23:00:39 joerg Exp $ */
+/* $NetBSD: initfini.c,v 1.11 2013/08/19 22:14:37 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: initfini.c,v 1.10 2012/02/16 23:00:39 joerg Exp $");
+__RCSID("$NetBSD: initfini.c,v 1.11 2013/08/19 22:14:37 matt Exp $");
#ifdef _LIBC
#include "namespace.h"
@@ -80,7 +80,7 @@ struct ps_strings *__ps_strings;
* _libc_init is called twice. The first time explicitly by crt0.o
* (for newer versions) and the second time as indirectly via _init().
*/
-void
+void __section(".text.startup")
_libc_init(void)
{
Index: src/lib/libc/misc/stack_protector.c
diff -u src/lib/libc/misc/stack_protector.c:1.8 src/lib/libc/misc/stack_protector.c:1.9
--- src/lib/libc/misc/stack_protector.c:1.8 Tue Mar 13 21:13:39 2012
+++ src/lib/libc/misc/stack_protector.c Mon Aug 19 22:14:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: stack_protector.c,v 1.8 2012/03/13 21:13:39 christos Exp $ */
+/* $NetBSD: stack_protector.c,v 1.9 2013/08/19 22:14:37 matt Exp $ */
/* $OpenBSD: stack_protector.c,v 1.10 2006/03/31 05:34:44 deraadt Exp $ */
/*
@@ -28,7 +28,7 @@
*
*/
#include
-__RCSID("$NetBSD: stack_protector.c,v 1.8 2012/03/13 21:13:39 christos Exp $");
+__RCSID("$NetBSD: stack_protector.c,v 1.9 2013/08/19 22:14:37 matt Exp $");
#ifdef _LIBC
#include "namespace.h"
@@ -53,7 +53,7 @@ static void __fail(const char *) __attri
__dead void __stack_chk_fail_local(void);
void __guard_setup(void);
-void
+void __section(".text.startup")
__guard_setup(void)
{
static const int mib[2] = { CTL_KERN, KERN_ARND };
Index: src/lib/libc/stdlib/_env.c
diff -u src/lib/libc/stdlib/_env.c:1.6 src/lib/libc/stdlib/_env.c:1.7
--- src/lib/libc/stdlib/_env.c:1.6 Thu Oct 6 20:31:41 2011
+++ src/lib/libc/stdlib/_env.c Mon Aug 19 22:14:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: _env.c,v 1.6 2011/10/06 20:31:41 christos Exp $ */
+/* $NetBSD: _env.c,v 1.7 2013/08/19 22:14:37 matt Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: _env.c,v 1.6 2011/10/06 20:31:41 christos Exp $");
+__RCSID("$NetBSD: _env.c,v 1.7 2013/08/19 22:14:37 matt Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -400,7 +400,7 @@ __unlockenv(void)
#endif
/* Initialize environment memory RB tree. */
-void
+void __section(".text.startup")
__libc_env_init(void)
{
rb_tree_init(&env_tree, &env_tree_ops);
Index: src/lib/libc/stdlib/atexit.c
diff -u src/lib/libc/stdlib/atexit.c:1.25 src/lib/libc/stdlib/atexit.c:1.26
--- src/lib/libc/stdlib/atexit.c:1.25 Fri Apr 26 18:29:55 2013
+++ src/lib/libc/stdlib/atexit.c Mon Aug 19 22:14:37 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: atexit.c,v 1.25 2013/04/26 18:29:55 christos Exp $ */
+/* $NetBSD: atexit.c,v 1.26 2013/08/19 22:14:37 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(LIBC_SC
CVS commit: src/lib/libc/arch/arm
Module Name:src Committed By: matt Date: Mon Aug 19 22:13:34 UTC 2013 Modified Files: src/lib/libc/arch/arm: SYS.h Log Message: Group all syscalls together. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/lib/libc/arch/arm/SYS.h 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/arm/SYS.h diff -u src/lib/libc/arch/arm/SYS.h:1.14 src/lib/libc/arch/arm/SYS.h:1.15 --- src/lib/libc/arch/arm/SYS.h:1.14 Fri Aug 16 22:30:28 2013 +++ src/lib/libc/arch/arm/SYS.h Mon Aug 19 22:13:34 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: SYS.h,v 1.14 2013/08/16 22:30:28 matt Exp $ */ +/* $NetBSD: SYS.h,v 1.15 2013/08/19 22:13:34 matt Exp $ */ /*- * Copyright (c) 1990 The Regents of the University of California. @@ -34,6 +34,8 @@ * from: @(#)SYS.h 5.5 (Berkeley) 5/7/91 */ +#define _TEXT_SECTION .section .text.hot, "ax" + #include #include #include
CVS commit: src/lib/libc/compat/arch/arm
Module Name:src
Committed By: matt
Date: Mon Aug 19 22:11:50 UTC 2013
Modified Files:
src/lib/libc/compat/arch/arm/gen: compat_setjmp.S compat_sigsetjmp.S
src/lib/libc/compat/arch/arm/sys: compat_Ovfork.S compat___sigtramp1.S
compat_sigpending.S compat_sigprocmask.S compat_sigsuspend.S
Log Message:
Use _INVOKE_CERROR() and movs
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/arch/arm/gen/compat_setjmp.S
cvs rdiff -u -r1.1 -r1.2 src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/compat/arch/arm/sys/compat_Ovfork.S \
src/lib/libc/compat/arch/arm/sys/compat___sigtramp1.S \
src/lib/libc/compat/arch/arm/sys/compat_sigpending.S \
src/lib/libc/compat/arch/arm/sys/compat_sigprocmask.S \
src/lib/libc/compat/arch/arm/sys/compat_sigsuspend.S
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/compat/arch/arm/gen/compat_setjmp.S
diff -u src/lib/libc/compat/arch/arm/gen/compat_setjmp.S:1.2 src/lib/libc/compat/arch/arm/gen/compat_setjmp.S:1.3
--- src/lib/libc/compat/arch/arm/gen/compat_setjmp.S:1.2 Fri Jan 11 13:55:26 2013
+++ src/lib/libc/compat/arch/arm/gen/compat_setjmp.S Mon Aug 19 22:11:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_setjmp.S,v 1.2 2013/01/11 13:55:26 matt Exp $ */
+/* $NetBSD: compat_setjmp.S,v 1.3 2013/08/19 22:11:50 matt Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -47,14 +47,12 @@
ENTRY(setjmp)
/* Block all signals and retrieve the old signal mask */
- stmfd sp!, {r0, r14}
- mov r0, #0x
+ push {r0, lr}
+ movs r0, #0x
bl PIC_SYM(_C_LABEL(sigblock), PLT)
mov r1, r0
- ldmfd sp!, {r0, r14}
-
/* Store signal mask */
str r1, [r0, #(_JB_SIGMASK * 4)]
@@ -62,52 +60,96 @@ ENTRY(setjmp)
str r1, [r0]
/* Store integer registers */
- add r0, r0, #(_JB_REG_R4 * 4)
-stmia r0, {r4-r14}
-mov r0, #0x
-RET
-
-.Lsetjmp_magic:
- .word _JB_MAGIC_SETJMP
-
+ adds r0, r0, #(_JB_REG_R4 * 4)
+#ifdef __thumb__
+#ifdef _ARM_ARCH_7
+stmia r0!, {r4-r12}
+ str sp, [r0, #0]
+ str lr, [r0, #4]
+#else
+stmia r0!, {r4-r7}
+ mov r2, r8
+ mov r3, r9
+ stmia r0!, {r2-r3}
+ mov r1, r10
+ mov r2, r11
+ mov r3, r12
+ stmia r0!, {r1-r3}
+ mov r2, sp
+ mov r3, lr
+ stmia r0!, {r2-r3}
+#endif
+#else
+stmia r0, {r4-lr}
+#endif
+movs r0, #0
+ pop {r3, pc}
+END(setjmp)
ENTRY(longjmp)
ldr r2, .Lsetjmp_magic
ldr r3, [r0]
- teq r2, r3
+ cmp r2, r3
bne botch
/* Fetch signal mask */
ldr r2, [r0, #(_JB_SIGMASK * 4)]
/* Set signal mask */
- stmfd sp!, {r0, r1, r14}
- sub sp, sp, #4 /* align the stack */
+ push {r0, r1} /* don't care about lr */
mov r0, r2
bl PIC_SYM(_C_LABEL(sigsetmask), PLT)
- add sp, sp, #4 /* unalign the stack */
- ldmfd sp!, {r0, r1, r14}
+ pop {r0, r1}
/* Restore integer registers */
- add r0, r0, #(_JB_REG_R4 * 4)
-ldmia r0, {r4-r14}
+ adds r0, r0, #(_JB_REG_R4 * 4)
+#if !defined(__thumb__) || defined(_ARM_ARCH_7)
+ldmia r0!, {r4-r12}
+#else
+ldmia r0!, {r4-r7}
+ldmia r0!, {r2-r3}
+ mov r8, r2
+ mov r9, r3
+ldmia r0!, {r1-r3}
+ mov r10, r2
+ mov r11, r3
+ldmia r0!, {r2}
+ mov r12, r2
+#endif
+
+ ldmia r0!, {r2-r3} /* r2 = sp, r3 = lr */
- /* Validate sp and r14 */
- teq sp, #0
- teqne r14, #0
+ /* Validate sp */
+ cmp r2, #0
beq botch
+ mov sp, r2
- /* Set return value */
+ /* Validate lr */
+ cmp r3, #0
+ beq botch
+ mov lr, r3
+ /* Set return value */
mov r0, r1
- teq r0, #0x
- moveq r0, #0x0001
+ cmp r0, #0
+#ifdef __thumb__
+ bne 1f
+ movs r0, #1
+1:
+#else
+ moveq r0, #1
+#endif
RET
/* validation failed, die die die. */
botch:
bl PIC_SYM(_C_LABEL(longjmperror), PLT)
bl PIC_SYM(_C_LABEL(abort), PLT)
- b . - 8 /* Cannot get here */
+2: b 2b /* Cannot get here */
+
+ .align 0
+.Lsetjmp_magic:
+ .word _JB_MAGIC_SETJMP
+END(longjmp)
Index: src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S
diff -u src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S:1.1 src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S:1.2
--- src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S:1.1 Sun Oct 16 17:27:50 2005
+++ src/lib/libc/compat/arch/arm/gen/compat_sigsetjmp.S Mon Aug 19 22:11:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_sigsetjmp.S,v 1.1 2005/10/16 17:27:50 christos Exp $ */
+/* $NetBSD: compat_sigsetjmp.S,v 1.2 2013/08/19 22:11:50 matt Exp $ */
/*
* Copyright (c) 1997 Mark Brinicombe
@@ -46,16 +46,46 @@
*/
ENTRY(sigsetjmp)
- teq r1, #0
- beq PIC_SYM(_C_LABEL(_setjmp), PLT)
- b PIC_SYM(_C_LABEL(setjmp), PLT)
-
-.L_setjmp_magic:
- .word _JB_MAGIC__SETJMP
+#if defined(__thumb__) && defined(_ARM_ARCH_T2)
+ cbnz r1, 1f
+ b PLT_SYM(_C_LABEL(_setjmp))
+1: b PLT_SYM(_C_LABEL(setjmp))
+#elif !defined(__thumb__)
+ cmp r1, #0
+ beq PLT_SYM(_C_LABEL(_setjmp))
+ b PLT_SYM(_C_LABEL(setjmp
CVS commit: src/lib/libc/arch/arm/sys
Module Name:src Committed By: matt Date: Mon Aug 19 22:10:51 UTC 2013 Modified Files: src/lib/libc/arch/arm/sys: __aeabi_read_tp.S Log Message: Always compile as ARM even if -mthumb is given. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libc/arch/arm/sys/__aeabi_read_tp.S 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/arm/sys/__aeabi_read_tp.S diff -u src/lib/libc/arch/arm/sys/__aeabi_read_tp.S:1.4 src/lib/libc/arch/arm/sys/__aeabi_read_tp.S:1.5 --- src/lib/libc/arch/arm/sys/__aeabi_read_tp.S:1.4 Sat Aug 17 01:08:35 2013 +++ src/lib/libc/arch/arm/sys/__aeabi_read_tp.S Mon Aug 19 22:10:51 2013 @@ -1,17 +1,14 @@ -/* $NetBSD: __aeabi_read_tp.S,v 1.4 2013/08/17 01:08:35 matt Exp $ */ +/* $NetBSD: __aeabi_read_tp.S,v 1.5 2013/08/19 22:10:51 matt Exp $ */ +#undef __thumb__ #include "SYS.h" -#if defined(__thumb__) && !defined(_ARM_ARCH_T2) -#error Thumb only supported on armv7 -#endif - /* * Implementations of this function should corrupt only the result register * (r0) and the non-parameter integer core registers allowed to be corrupted * by the [AAPCS] (ip, lr, and CPSR). */ -ENTRY(__aeabi_read_tp) +ARM_ENTRY(__aeabi_read_tp) mrc p15, 0, r0, c13, c0, 3 #ifndef _ARM_ARCH_6 cmp r0, #0 /* was it zero? */
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Mon Aug 19 22:08:31 UTC 2013 Modified Files: src/sys/arch/arm/include: asm.h Log Message: Do alternative text sections better, add a _TEXT_SECTION which defaults to .text but can be overridden before gets included. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/arm/include/asm.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/arm/include/asm.h diff -u src/sys/arch/arm/include/asm.h:1.22 src/sys/arch/arm/include/asm.h:1.23 --- src/sys/arch/arm/include/asm.h:1.22 Sun Aug 18 05:06:49 2013 +++ src/sys/arch/arm/include/asm.h Mon Aug 19 22:08:31 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.22 2013/08/18 05:06:49 matt Exp $ */ +/* $NetBSD: asm.h,v 1.23 2013/08/19 22:08:31 matt Exp $ */ /* * Copyright (c) 1990 The Regents of the University of California. @@ -65,6 +65,9 @@ # define _ALIGN_TEXT .align 2 #endif +#ifndef _TEXT_SECTION +#define _TEXT_SECTION .text +#endif /* * gas/arm uses @ as a single comment character and thus cannot be used here * Instead it recognised the # instead of an @ symbols in .type directives @@ -73,20 +76,16 @@ */ #define _ASM_TYPE_FUNCTION %function #define _ASM_TYPE_OBJECT %object -#define _THUMB_ENTRY_NS(x) \ - _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; \ +#define _THUMB_ENTRY(x) \ + _TEXT_SECTION; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; \ .thumb_func; .code 16; x: -#define _THUMB_ENTRY(x) .text; _THUMB_ENTRY_NS(x) -#define _ARM_ENTRY_NS(x) \ - _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; \ +#define _ARM_ENTRY(x) \ + _TEXT_SECTION; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; \ .code 32; x: -#define _ARM_ENTRY(x) .text; _ARM_ENTRY_NS(x) #ifdef __thumb__ #define _ENTRY(x) _THUMB_ENTRY(x) -#define _ENTRY_NS(x) _THUMB_ENTRY_NS(x) #else #define _ENTRY(x) _ARM_ENTRY(x) -#define _ENTRY_NS(x) _ARM_ENTRY_NS(x) #endif #define _END(x) .size x,.-x
CVS commit: src/lib/libc/locale
Module Name:src
Committed By: joerg
Date: Mon Aug 19 20:41:15 UTC 2013
Modified Files:
src/lib/libc/locale: wcsftime.c
Log Message:
Missing locale specific change.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/locale/wcsftime.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/locale/wcsftime.c
diff -u src/lib/libc/locale/wcsftime.c:1.4 src/lib/libc/locale/wcsftime.c:1.5
--- src/lib/libc/locale/wcsftime.c:1.4 Mon Aug 19 08:03:34 2013
+++ src/lib/libc/locale/wcsftime.c Mon Aug 19 20:41:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: wcsftime.c,v 1.4 2013/08/19 08:03:34 joerg Exp $ */
+/* $NetBSD: wcsftime.c,v 1.5 2013/08/19 20:41:15 joerg Exp $ */
/*-
* Copyright (c) 2002 Tim J. Robbins
* All rights reserved.
@@ -26,7 +26,7 @@
*/
#include
-__RCSID("$NetBSD: wcsftime.c,v 1.4 2013/08/19 08:03:34 joerg Exp $");
+__RCSID("$NetBSD: wcsftime.c,v 1.5 2013/08/19 20:41:15 joerg Exp $");
#define __SETLOCALE_SOURCE__
#include "namespace.h"
@@ -93,7 +93,7 @@ wcsftime_l(wchar_t *wcs, size_t maxsize,
errno = EINVAL;
goto error;
}
- dst = malloc(maxsize * MB_CUR_MAX);
+ dst = malloc(maxsize * MB_CUR_MAX_L(loc));
if (dst == NULL)
goto error;
if (strftime_l(dst, maxsize, sformat, timeptr, loc) == 0)
CVS commit: src/common/lib/libc/arch/arm/string
Module Name:src
Committed By: matt
Date: Mon Aug 19 17:50:04 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/string: strchr_arm.S
Log Message:
Add two thumb2 bits.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/arm/string/strchr_arm.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/string/strchr_arm.S
diff -u src/common/lib/libc/arch/arm/string/strchr_arm.S:1.7 src/common/lib/libc/arch/arm/string/strchr_arm.S:1.8
--- src/common/lib/libc/arch/arm/string/strchr_arm.S:1.7 Mon Aug 19 17:41:47 2013
+++ src/common/lib/libc/arch/arm/string/strchr_arm.S Mon Aug 19 17:50:04 2013
@@ -29,7 +29,11 @@
#include
-RCSID("$NetBSD: strchr_arm.S,v 1.7 2013/08/19 17:41:47 matt Exp $")
+RCSID("$NetBSD: strchr_arm.S,v 1.8 2013/08/19 17:50:04 matt Exp $")
+
+#if defined(__thumb__) && !defined(_ARM_ARCH_T2)
+#error Only Thumb2 or ARM supported
+#endif
#ifdef __ARMEL__
#define BYTE0 0x00ff
@@ -92,13 +96,20 @@ ENTRY(strchr)
* We've encountered a NUL or a match but we don't know which happened
* first.
*/
+#if defined(__thumb__) && defined(_ARM_ARCH_T2)
+ cbz r2, .Lfind_match /* searching for NUL? yes, find it */
+#else
cmp r2, #0 /* searching for NUL? */
beq .Lfind_match /* yes, find the match */
+#endif
mvns r1, r1 /* did we encounter a NUL? */
beq .Lfind_match /* no, find the match */
bics r3, r3, r1 /* clear match for the NUL(s) */
beq .Lnomatch /* any left set? if not, no match */
lshis r1, r1, #8 /* replicate NUL bit to other bytes */
+#ifdef __thumb__
+ itt ne
+#endif
orrne r1, r1, r1, lshi #8 /* replicate NUL bit to other bytes */
orrne r1, r1, r1, lshi #8 /* replicate NUL bit to other bytes */
bics r3, r3, r1 /* clear any match bits after the NUL */
CVS commit: src/common/lib/libc/arch/arm/string
Module Name:src
Committed By: matt
Date: Mon Aug 19 17:41:47 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/string: strchr_arm.S
Log Message:
Missing one teq -> cmp
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/common/lib/libc/arch/arm/string/strchr_arm.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/string/strchr_arm.S
diff -u src/common/lib/libc/arch/arm/string/strchr_arm.S:1.6 src/common/lib/libc/arch/arm/string/strchr_arm.S:1.7
--- src/common/lib/libc/arch/arm/string/strchr_arm.S:1.6 Mon Aug 19 17:38:47 2013
+++ src/common/lib/libc/arch/arm/string/strchr_arm.S Mon Aug 19 17:41:47 2013
@@ -29,7 +29,7 @@
#include
-RCSID("$NetBSD: strchr_arm.S,v 1.6 2013/08/19 17:38:47 matt Exp $")
+RCSID("$NetBSD: strchr_arm.S,v 1.7 2013/08/19 17:41:47 matt Exp $")
#ifdef __ARMEL__
#define BYTE0 0x00ff
@@ -92,7 +92,7 @@ ENTRY(strchr)
* We've encountered a NUL or a match but we don't know which happened
* first.
*/
- teq r2, #0 /* searching for NUL? */
+ cmp r2, #0 /* searching for NUL? */
beq .Lfind_match /* yes, find the match */
mvns r1, r1 /* did we encounter a NUL? */
beq .Lfind_match /* no, find the match */
CVS commit: src/common/lib/libc/arch/arm/string
Module Name:src
Committed By: matt
Date: Mon Aug 19 17:38:47 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/string: strchr_arm.S
Log Message:
Swap use of r1 and ip
teq -> cmp.
add s to few instructions
(thumbify part 1)
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/common/lib/libc/arch/arm/string/strchr_arm.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/string/strchr_arm.S
diff -u src/common/lib/libc/arch/arm/string/strchr_arm.S:1.5 src/common/lib/libc/arch/arm/string/strchr_arm.S:1.6
--- src/common/lib/libc/arch/arm/string/strchr_arm.S:1.5 Fri Feb 8 02:19:35 2013
+++ src/common/lib/libc/arch/arm/string/strchr_arm.S Mon Aug 19 17:38:47 2013
@@ -29,7 +29,7 @@
#include
-RCSID("$NetBSD: strchr_arm.S,v 1.5 2013/02/08 02:19:35 matt Exp $")
+RCSID("$NetBSD: strchr_arm.S,v 1.6 2013/08/19 17:38:47 matt Exp $")
#ifdef __ARMEL__
#define BYTE0 0x00ff
@@ -37,12 +37,14 @@ RCSID("$NetBSD: strchr_arm.S,v 1.5 2013/
#define BYTE2 0x00ff
#define BYTE3 0xff00
#define lshi lsl
+#define lshis lsls
#else
#define BYTE0 0xff00
#define BYTE1 0x00ff
#define BYTE2 0xff00
#define BYTE3 0x00ff
#define lshi lsr
+#define lshis lsrs
#endif
.text
@@ -53,20 +55,20 @@ ENTRY(strchr)
ldrb r3, [r0], #1 /* load a byte */
cmp r3, r2 /* is it a match? */
beq 2f /* yes, return current ptr - 1 */
- teq r3, #0 /* no, was it 0? */
+ cmp r3, #0 /* no, was it 0? */
bne 1b /* no, try next byte */
- mov r0, #0 /* yes, set return value to NULL */
+ movs r0, #0 /* yes, set return value to NULL */
RET/* return */
-2: sub r0, r0, #1 /* back up by one */
+2: subs r0, r0, #1 /* back up by one */
RET/* return */
.Lpre_main_loop:
#if defined(_ARM_ARCH_7)
- movw r1, #0xfefe /* magic constant; 254 in each byte */
- movt r1, #0xfefe /* magic constant; 254 in each byte */
+ movw ip, #0xfefe /* magic constant; 254 in each byte */
+ movt ip, #0xfefe /* magic constant; 254 in each byte */
#elif defined(_ARM_ARCH_6)
- mov r1, #0xfe /* put 254 in low byte */
- orr r1, r1, r1, lsl #8 /* move to next byte */
- orr r1, r1, r1, lsl #16 /* move to next halfword */
+ mov ip, #0xfe /* put 254 in low byte */
+ orr ip, ip, ip, lsl #8 /* move to next byte */
+ orr ip, ip, ip, lsl #16 /* move to next halfword */
#endif /* _ARM_ARCH_6 */
orr r2, r2, r2, lsl #8 /* move to next byte */
orr r2, r2, r2, lsl #16 /* move to next halfword */
@@ -79,10 +81,10 @@ ENTRY(strchr)
* become 255. For NUL, it will be 254. When we complement the
* result, if the result is non-0 then we must have encountered a NUL.
*/
- uqadd8 ip, r3, r1 /* NUL detection happens here */
- eor r3, r3, r2 /* xor to clear each lane */
- uqadd8 r3, r3, r1 /* char detection happens here */
- and r3, r3, ip /* merge results */
+ uqadd8 r1, r3, ip /* NUL detection happens here */
+ eors r3, r3, r2 /* xor to clear each lane */
+ uqadd8 r3, r3, ip /* char detection happens here */
+ ands r3, r3, r1 /* merge results */
mvns r3, r3 /* is the complement non-0? */
beq .Lmain_loop /*no, then keep going */
@@ -92,14 +94,14 @@ ENTRY(strchr)
*/
teq r2, #0 /* searching for NUL? */
beq .Lfind_match /* yes, find the match */
- mvns ip, ip /* did we encounter a NUL? */
+ mvns r1, r1 /* did we encounter a NUL? */
beq .Lfind_match /* no, find the match */
- bics r3, r3, ip /* clear match for the NUL(s) */
+ bics r3, r3, r1 /* clear match for the NUL(s) */
beq .Lnomatch /* any left set? if not, no match */
- movs ip, ip, lshi #8 /* replicate NUL bit to other bytes */
- orrne ip, ip, ip, lshi #8 /* replicate NUL bit to other bytes */
- orrne ip, ip, ip, lshi #8 /* replicate NUL bit to other bytes */
- bics r3, r3, ip /* clear any match bits after the NUL */
+ lshis r1, r1, #8 /* replicate NUL bit to other bytes */
+ orrne r1, r1, r1, lshi #8 /* replicate NUL bit to other bytes */
+ orrne r1, r1, r1, lshi #8 /* replicate NUL bit to other bytes */
+ bics r3, r3, r1 /* clear any match bits after the NUL */
beq .Lnomatch /* any left set? if not, no match */
.Lfind_match:
#ifdef __ARMEL__
@@ -107,49 +109,49 @@ ENTRY(strchr)
#endif
clz r3, r3 /* count how many leading zeros */
add r0, r0, r3, lsr #3 /* divide that by 8 and add to count */
- sub r0, r0, #4 /* compensate for the post-inc */
+ subs r0, r0, #4 /* compensate for the post-inc */
RET
.Lnomatch:
- mov r0, #0
+ movs r0, #0
RET
#else
/*
* No fancy shortcuts so just test each byte lane for a NUL.
* (other tests for NULs in a word take more instructions/cycles).
*/
- eor ip, r3, r2 /* xor .. */
+ eor r1, r3, r2 /* xor .. */
tst r3, #BYTE0 /* is this byte NUL? */
- tstne ip, #BYTE0 /* no, does this byte match? */
+ tstne r1, #BYTE0 /* no, does this byte match? */
tstne r3, #BYTE1 /* no, is this byte NU
CVS commit: src/common/lib/libc/arch/arm/string
Module Name:src
Committed By: matt
Date: Mon Aug 19 17:02:25 UTC 2013
Modified Files:
src/common/lib/libc/arch/arm/string: strcat_naive.S strchr_naive.S
strlen_naive.S strrchr_naive.S
Log Message:
cbnz/cbz can not branch backwards so nuke 'em.
Use the same register usage in strlen as in strnlen
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/arm/string/strcat_naive.S
cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/arm/string/strchr_naive.S \
src/common/lib/libc/arch/arm/string/strrchr_naive.S
cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/arm/string/strlen_naive.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/string/strcat_naive.S
diff -u src/common/lib/libc/arch/arm/string/strcat_naive.S:1.2 src/common/lib/libc/arch/arm/string/strcat_naive.S:1.3
--- src/common/lib/libc/arch/arm/string/strcat_naive.S:1.2 Mon Aug 19 02:54:02 2013
+++ src/common/lib/libc/arch/arm/string/strcat_naive.S Mon Aug 19 17:02:25 2013
@@ -29,30 +29,22 @@
#include
-RCSID("$NetBSD: strcat_naive.S,v 1.2 2013/08/19 02:54:02 matt Exp $")
+RCSID("$NetBSD: strcat_naive.S,v 1.3 2013/08/19 17:02:25 matt Exp $")
ENTRY(strcat)
mov ip, r0 /* need to preserve r0 */
#if defined(__thumb__)
1: ldrb r2, [r0] /* load next byte */
adds r0, r0, #1 /* advance */
-#if defined(_ARM_ARCH_T2)
- cbnz r2, 1b /* was it a NUL? no, get next byte */
-#else
cmp r2, #0 /* was it a NUL? */
bne 1b /* no, get next byte */
-#endif
subs r0, r0, #1 /* back up one to the NUL */
subs r1, r1, r0 /* save one increment */
2: ldrb r2, [r1, r0] /* load next byte from append */
strb r2, [r0] /* store it */
adds r0, r0, #1 /* advance */
-#if defined(_ARM_ARCH_T2)
- cbnz r2, 1b /* was it a NUL? no, get next byte */
-#else
cmp r2, #0 /* was it a NUL? */
bne 2b /* no, get next byte */
-#endif
mov r0, ip /* restore dst address */
RET/* return */
#else /* !__thumb__ */
Index: src/common/lib/libc/arch/arm/string/strchr_naive.S
diff -u src/common/lib/libc/arch/arm/string/strchr_naive.S:1.3 src/common/lib/libc/arch/arm/string/strchr_naive.S:1.4
--- src/common/lib/libc/arch/arm/string/strchr_naive.S:1.3 Mon Aug 19 02:22:25 2013
+++ src/common/lib/libc/arch/arm/string/strchr_naive.S Mon Aug 19 17:02:25 2013
@@ -28,7 +28,7 @@
*/
#include
-RCSID("$NetBSD: strchr_naive.S,v 1.3 2013/08/19 02:22:25 matt Exp $")
+RCSID("$NetBSD: strchr_naive.S,v 1.4 2013/08/19 17:02:25 matt Exp $")
/* LINTSTUB: char * strchr(const char *, int) */
ENTRY(strchr)
@@ -39,12 +39,8 @@ ENTRY(strchr)
cmp r3, r1 /* does it match? */
beq 2f /* yes, set return value */
adds r0, r0, #1 /* advance to next byte */
-#ifdef _ARM_ARCH_T2
- cbnz r3, 1b /* was it a NUL? no, get next byte */
-#else
cmp r3, #0 /* was it a NUL? */
bne 1b /* no, get next byte */
-#endif
movs r0, #0 /* set return to NULL */
2: RET /* return */
#else
Index: src/common/lib/libc/arch/arm/string/strrchr_naive.S
diff -u src/common/lib/libc/arch/arm/string/strrchr_naive.S:1.3 src/common/lib/libc/arch/arm/string/strrchr_naive.S:1.4
--- src/common/lib/libc/arch/arm/string/strrchr_naive.S:1.3 Mon Aug 19 02:36:27 2013
+++ src/common/lib/libc/arch/arm/string/strrchr_naive.S Mon Aug 19 17:02:25 2013
@@ -28,7 +28,7 @@
*/
#include
-RCSID("$NetBSD: strrchr_naive.S,v 1.3 2013/08/19 02:36:27 matt Exp $")
+RCSID("$NetBSD: strrchr_naive.S,v 1.4 2013/08/19 17:02:25 matt Exp $")
/* LINTSTUB: char * strrchr(const char *, int) */
ENTRY(strrchr)
@@ -42,12 +42,8 @@ ENTRY(strrchr)
bne 2f /* no, go and advance */
mov r0, r2 /* yes, set return value to point to it */
2: adds r2, r2, #1 /* advance to next byte */
-#ifdef _ARM_ARCH_T2
- cbnz r3, 1b /* was it a NUL? no, get next byte */
-#else
cmp r3, #0 /* was it a NUL? */
bne 1b /* no, get next byte */
-#endif
#else
and r1, r1, #0xff /* restrict to a byte value */
1: ldrb r3, [r2], #1 /* read a byte */
Index: src/common/lib/libc/arch/arm/string/strlen_naive.S
diff -u src/common/lib/libc/arch/arm/string/strlen_naive.S:1.7 src/common/lib/libc/arch/arm/string/strlen_naive.S:1.8
--- src/common/lib/libc/arch/arm/string/strlen_naive.S:1.7 Mon Aug 19 02:13:13 2013
+++ src/common/lib/libc/arch/arm/string/strlen_naive.S Mon Aug 19 17:02:25 2013
@@ -28,7 +28,7 @@
*/
#include
-RCSID("$NetBSD: strlen_naive.S,v 1.7 2013/08/19 02:13:13 matt Exp $")
+RCSID("$NetBSD: strlen_naive.S,v 1.8 2013/08/19 17:02:25 matt Exp $")
#ifdef STRNLEN
/* LINTSTUB: size_t strnlen(const char *, size_t) */
@@ -58,17 +58,17 @@ END(strnlen)
#else /* STRNLEN */
/* LINTSTUB: size_t strlen(const char *) */
ENTRY(strlen)
- adds r2, r0, #1 /* start of src + NUL */
+ adds r3, r0, #1 /* start of src + NUL */
1:
#ifdef __thumb__
- ldrb r3, [r0] /* read a byte */
+ ldrb r2, [r0] /* read a byte */
adds r0, r0, #1
#els
CVS commit: src
Module Name:src
Committed By: matt
Date: Mon Aug 19 16:34:30 UTC 2013
Modified Files:
src/etc: Makefile
Added Files:
src/distrib/sets/lists/etc: md.evbarm
src/etc/etc.evbarm: ld.so.conf
Log Message:
if softfloat, Install a ld.so.conf to use libc_vfp.so if there is a VFP on
evbarm (no other arm ports a CPU supporting VFP).
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 src/distrib/sets/lists/etc/md.evbarm
cvs rdiff -u -r1.409 -r1.410 src/etc/Makefile
cvs rdiff -u -r0 -r1.1 src/etc/etc.evbarm/ld.so.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.409 src/etc/Makefile:1.410
--- src/etc/Makefile:1.409 Wed May 1 15:57:44 2013
+++ src/etc/Makefile Mon Aug 19 16:34:29 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.409 2013/05/01 15:57:44 agc Exp $
+# $NetBSD: Makefile,v 1.410 2013/08/19 16:34:29 matt Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -105,7 +105,7 @@ BIN1+= etc.${MACHINE}/disktab
BIN1+= disktab
.endif
-.if exists(etc.${MACHINE}/ld.so.conf)
+.if exists(etc.${MACHINE}/ld.so.conf) && empty(MACHINE_ARCH:M*arm*hf*)
BIN1+= etc.${MACHINE}/ld.so.conf
.endif
Added files:
Index: src/distrib/sets/lists/etc/md.evbarm
diff -u /dev/null src/distrib/sets/lists/etc/md.evbarm:1.3
--- /dev/null Mon Aug 19 16:34:30 2013
+++ src/distrib/sets/lists/etc/md.evbarm Mon Aug 19 16:34:30 2013
@@ -0,0 +1,2 @@
+# $NetBSD: md.evbarm,v 1.3 2013/08/19 16:34:30 matt Exp $
+./etc/ld.so.conf etc-sys-etc softfloat
Index: src/etc/etc.evbarm/ld.so.conf
diff -u /dev/null src/etc/etc.evbarm/ld.so.conf:1.1
--- /dev/null Mon Aug 19 16:34:30 2013
+++ src/etc/etc.evbarm/ld.so.conf Mon Aug 19 16:34:30 2013
@@ -0,0 +1 @@
+libc.so.12 machdep.fpu_present 1:libc_vfp.so.0,libc.so.12
CVS commit: src/sys/dev/ata
Module Name:src
Committed By: skrll
Date: Mon Aug 19 14:58:57 UTC 2013
Modified Files:
src/sys/dev/ata: wd.c
Log Message:
Don't return EPASSTHROUGH when succeeding in ODIOCGDINFO or ODIOCGDEFLABEL
To generate a diff of this commit:
cvs rdiff -u -r1.404 -r1.405 src/sys/dev/ata/wd.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/ata/wd.c
diff -u src/sys/dev/ata/wd.c:1.404 src/sys/dev/ata/wd.c:1.405
--- src/sys/dev/ata/wd.c:1.404 Tue Aug 6 19:13:13 2013
+++ src/sys/dev/ata/wd.c Mon Aug 19 14:58:57 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: wd.c,v 1.404 2013/08/06 19:13:13 soren Exp $ */
+/* $NetBSD: wd.c,v 1.405 2013/08/19 14:58:57 skrll Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.404 2013/08/06 19:13:13 soren Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wd.c,v 1.405 2013/08/19 14:58:57 skrll Exp $");
#include "opt_ata.h"
@@ -1169,7 +1169,7 @@ wdioctl(dev_t dev, u_long xfer, void *ad
{
struct wd_softc *wd =
device_lookup_private(&wd_cd, WDUNIT(dev));
- int error = 0, s;
+ int error, s;
#ifdef __HAVE_OLD_DISKLABEL
struct disklabel *newlabel = NULL;
#endif
@@ -1183,6 +1183,7 @@ wdioctl(dev_t dev, u_long xfer, void *ad
if (error != EPASSTHROUGH)
return (error);
+ error = 0;
switch (xfer) {
#ifdef HAS_BAD144_HANDLING
case DIOCSBAD:
CVS commit: src
Module Name:src
Committed By: joerg
Date: Mon Aug 19 13:03:12 UTC 2013
Modified Files:
src/include: string.h
src/lib/libc/include: extern.h namespace.h
src/lib/libc/string: strerror.c strerror_r.c
Log Message:
Add strerror_l.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/include/string.h
cvs rdiff -u -r1.22 -r1.23 src/lib/libc/include/extern.h
cvs rdiff -u -r1.167 -r1.168 src/lib/libc/include/namespace.h
cvs rdiff -u -r1.14 -r1.15 src/lib/libc/string/strerror.c
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/string/strerror_r.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/string.h
diff -u src/include/string.h:1.44 src/include/string.h:1.45
--- src/include/string.h:1.44 Mon Jun 24 04:21:20 2013
+++ src/include/string.h Mon Aug 19 13:03:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: string.h,v 1.44 2013/06/24 04:21:20 riastradh Exp $ */
+/* $NetBSD: string.h,v 1.45 2013/08/19 13:03:12 joerg Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -122,6 +122,7 @@ typedef struct _locale *locale_t;
__BEGIN_DECLS
int strcoll_l(const char *, const char *, locale_t);
size_t strxfrm_l(char * __restrict, const char * __restrict, size_t, locale_t);
+__aconst char *strerror_l(int, locale_t);
__END_DECLS
#endif /* _POSIX_C_SOURCE || _NETBSD_SOURCE */
Index: src/lib/libc/include/extern.h
diff -u src/lib/libc/include/extern.h:1.22 src/lib/libc/include/extern.h:1.23
--- src/lib/libc/include/extern.h:1.22 Sat May 4 18:31:47 2013
+++ src/lib/libc/include/extern.h Mon Aug 19 13:03:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: extern.h,v 1.22 2013/05/04 18:31:47 christos Exp $ */
+/* $NetBSD: extern.h,v 1.23 2013/08/19 13:03:12 joerg Exp $ */
/*
* Copyright (c) 1997 Christos Zoulas. All rights reserved.
@@ -27,12 +27,18 @@
#include
#include
+#ifndef __LOCALE_T_DECLARED
+typedef struct _locale *locale_t;
+#define __LOCALE_T_DECLARED
+#endif /* __LOCALE_T_DECLARED */
+
__BEGIN_DECLS
extern char *__minbrk;
int __getcwd(char *, size_t);
int __getlogin(char *, size_t);
int __setlogin(const char *);
void _resumecontext(void) __dead;
+__dso_hidden int _strerror_lr(int, char *, size_t, locale_t);
const char *__strerror(int , char *, size_t);
const char *__strsignal(int , char *, size_t);
char *__dtoa(double, int, int, int *, int *, char **);
Index: src/lib/libc/include/namespace.h
diff -u src/lib/libc/include/namespace.h:1.167 src/lib/libc/include/namespace.h:1.168
--- src/lib/libc/include/namespace.h:1.167 Mon Aug 19 08:03:33 2013
+++ src/lib/libc/include/namespace.h Mon Aug 19 13:03:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: namespace.h,v 1.167 2013/08/19 08:03:33 joerg Exp $ */
+/* $NetBSD: namespace.h,v 1.168 2013/08/19 13:03:12 joerg Exp $ */
/*-
* Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@@ -57,6 +57,7 @@
#define inet_pton _inet_pton
#define pipe _pipe
#define sbrk _sbrk
+#define strerror_l _strerror_l
#define strerror_r _strerror_r
#define strlcat _strlcat
#define strlcpy _strlcpy
Index: src/lib/libc/string/strerror.c
diff -u src/lib/libc/string/strerror.c:1.14 src/lib/libc/string/strerror.c:1.15
--- src/lib/libc/string/strerror.c:1.14 Thu Jan 26 11:13:42 2006
+++ src/lib/libc/string/strerror.c Mon Aug 19 13:03:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: strerror.c,v 1.14 2006/01/26 11:13:42 kleink Exp $ */
+/* $NetBSD: strerror.c,v 1.15 2013/08/19 13:03:12 joerg Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -30,30 +30,64 @@
*/
#include
-#if defined(LIBC_SCCS) && !defined(lint)
-#if 0
-static char *sccsid = "@(#)strerror.c 5.6 (Berkeley) 5/4/91";
-#else
-__RCSID("$NetBSD: strerror.c,v 1.14 2006/01/26 11:13:42 kleink Exp $");
-#endif
-#endif /* LIBC_SCCS and not lint */
+__RCSID("$NetBSD: strerror.c,v 1.15 2013/08/19 13:03:12 joerg Exp $");
+
+#define __SETLOCALE_SOURCE__
#include "namespace.h"
-#include
-#include
#include
-#include "extern.h"
+#include
+#include
+#include
+#include
-/*
- * Since perror() is not allowed to change the contents of strerror()'s
- * static buffer, both functions supply their own buffers to strerror_r()
- */
+#include "extern.h"
+#ifdef _REENTRANT
+#include "reentrant.h"
+#endif
+#include "setlocale_local.h"
__aconst char *
strerror(int num)
{
+
+ return strerror_l(num, _current_locale());
+}
+
+#ifdef _REENTRANT
+static thread_key_t strerror_key;
+static once_t strerror_once = ONCE_INITIALIZER;
+
+static void
+strerror_setup(void)
+{
+
+ thr_keycreate(&strerror_key, free);
+}
+#endif
+
+__aconst char *
+strerror_l(int num, locale_t loc)
+{
+#ifdef _REENTRANT
+ int error;
+ char *buf;
+
+ thr_once(&strerror_once, strerror_setup);
+ buf = thr_getspecific(strerror_key);
+ if (buf == NULL) {
+ buf = malloc(NL_TEXTMAX);
+ if (buf == NULL) {
+ static char fallback_buf[NL_TEXTMAX];
+ buf = fallback_buf;
+ }
+ thr_setspecific(strerror_key, buf);
+ }
+#else
stat
CVS commit: src/lib/libc/string
Module Name:src
Committed By: joerg
Date: Mon Aug 19 10:59:39 UTC 2013
Modified Files:
src/lib/libc/string: Makefile.inc
Removed Files:
src/lib/libc/string: _strerror_r.c _strlcat.c _strlcpy.c
Log Message:
GC __indr_reference wrappers.
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/lib/libc/string/Makefile.inc
cvs rdiff -u -r1.3 -r0 src/lib/libc/string/_strerror_r.c
cvs rdiff -u -r1.5 -r0 src/lib/libc/string/_strlcat.c \
src/lib/libc/string/_strlcpy.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/string/Makefile.inc
diff -u src/lib/libc/string/Makefile.inc:1.78 src/lib/libc/string/Makefile.inc:1.79
--- src/lib/libc/string/Makefile.inc:1.78 Mon Jun 24 04:21:20 2013
+++ src/lib/libc/string/Makefile.inc Mon Aug 19 10:59:39 2013
@@ -1,5 +1,5 @@
# from: @(#)Makefile.inc 8.1 (Berkeley) 6/4/93
-# $NetBSD: Makefile.inc,v 1.78 2013/06/24 04:21:20 riastradh Exp $
+# $NetBSD: Makefile.inc,v 1.79 2013/08/19 10:59:39 joerg Exp $
# string sources
.PATH: ${ARCHDIR}/string ${.CURDIR}/string
@@ -34,9 +34,6 @@ CPPFLAGS.wcscmp.c+= -I${LIBCDIR}/locale
CPPFLAGS.wcsncmp.c+= -I${LIBCDIR}/locale
CPPFLAGS.wmemcmp.c+= -I${LIBCDIR}/locale
-# namespace protection wrappers
-SRCS+= _strlcat.c _strlcpy.c _strerror_r.c
-
.include "${ARCHDIR}/string/Makefile.inc"
MAN+= bm.3 bcmp.3 bcopy.3 bstring.3 bzero.3 consttime_memequal.3 \
CVS commit: src/lib/libc/locale
Module Name:src
Committed By: joerg
Date: Mon Aug 19 09:12:59 UTC 2013
Modified Files:
src/lib/libc/locale: nb_lc_messages_misc.h nb_lc_monetary_misc.h
nb_lc_numeric_misc.h nb_lc_time_misc.h
Log Message:
Shut up lint.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libc/locale/nb_lc_messages_misc.h \
src/lib/libc/locale/nb_lc_monetary_misc.h \
src/lib/libc/locale/nb_lc_numeric_misc.h
cvs rdiff -u -r1.5 -r1.6 src/lib/libc/locale/nb_lc_time_misc.h
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/locale/nb_lc_messages_misc.h
diff -u src/lib/libc/locale/nb_lc_messages_misc.h:1.4 src/lib/libc/locale/nb_lc_messages_misc.h:1.5
--- src/lib/libc/locale/nb_lc_messages_misc.h:1.4 Sun Aug 18 20:03:48 2013
+++ src/lib/libc/locale/nb_lc_messages_misc.h Mon Aug 19 09:12:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nb_lc_messages_misc.h,v 1.4 2013/08/18 20:03:48 joerg Exp $ */
+/* $NetBSD: nb_lc_messages_misc.h,v 1.5 2013/08/19 09:12:58 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -48,6 +48,7 @@ _PREFIX(build_cache)(struct _locale_cach
cache->items[(size_t)NOEXPR ] = data->noexpr;
}
+/* ARGSUSED */
static __inline void
_PREFIX(update_global)(_MessagesLocale *data)
{
Index: src/lib/libc/locale/nb_lc_monetary_misc.h
diff -u src/lib/libc/locale/nb_lc_monetary_misc.h:1.4 src/lib/libc/locale/nb_lc_monetary_misc.h:1.5
--- src/lib/libc/locale/nb_lc_monetary_misc.h:1.4 Sun Aug 18 20:03:48 2013
+++ src/lib/libc/locale/nb_lc_monetary_misc.h Mon Aug 19 09:12:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nb_lc_monetary_misc.h,v 1.4 2013/08/18 20:03:48 joerg Exp $ */
+/* $NetBSD: nb_lc_monetary_misc.h,v 1.5 2013/08/19 09:12:58 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -72,6 +72,7 @@ _PREFIX(build_cache)(struct _locale_cach
cache->items[(size_t)CRNCYSTR] = NULL; /* NOT IMPLEMENTED YET */
}
+/* ARGSUSED */
static __inline void
_PREFIX(update_global)(_MonetaryLocale *data)
{
Index: src/lib/libc/locale/nb_lc_numeric_misc.h
diff -u src/lib/libc/locale/nb_lc_numeric_misc.h:1.4 src/lib/libc/locale/nb_lc_numeric_misc.h:1.5
--- src/lib/libc/locale/nb_lc_numeric_misc.h:1.4 Sun Aug 18 20:03:48 2013
+++ src/lib/libc/locale/nb_lc_numeric_misc.h Mon Aug 19 09:12:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nb_lc_numeric_misc.h,v 1.4 2013/08/18 20:03:48 joerg Exp $ */
+/* $NetBSD: nb_lc_numeric_misc.h,v 1.5 2013/08/19 09:12:58 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -54,6 +54,7 @@ _PREFIX(build_cache)(struct _locale_cach
cache->items[(size_t)THOUSEP ] = data->thousands_sep;
}
+/* ARGSUSED */
static __inline void
_PREFIX(update_global)(_NumericLocale *data)
{
Index: src/lib/libc/locale/nb_lc_time_misc.h
diff -u src/lib/libc/locale/nb_lc_time_misc.h:1.5 src/lib/libc/locale/nb_lc_time_misc.h:1.6
--- src/lib/libc/locale/nb_lc_time_misc.h:1.5 Sun Aug 18 20:03:48 2013
+++ src/lib/libc/locale/nb_lc_time_misc.h Mon Aug 19 09:12:58 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nb_lc_time_misc.h,v 1.5 2013/08/18 20:03:48 joerg Exp $ */
+/* $NetBSD: nb_lc_time_misc.h,v 1.6 2013/08/19 09:12:58 joerg Exp $ */
/*-
* Copyright (c)2008 Citrus Project,
@@ -74,6 +74,7 @@ _PREFIX(build_cache)(struct _locale_cach
cache->items[(size_t)ALT_DIGITS ] = NULL;
}
+/* ARGSUSED */
static __inline void
_PREFIX(update_global)(_TimeLocale *data)
{
CVS commit: src
Module Name:src Committed By: joerg Date: Mon Aug 19 08:03:34 UTC 2013 Modified Files: src/include: langinfo.h nl_types.h wchar.h src/lib/libc/include: namespace.h src/lib/libc/locale: nl_langinfo.c wcsftime.c src/lib/libc/nls: Makefile.inc catopen.c Removed Files: src/lib/libc/nls: _catclose.c _catgets.c _catopen.c Log Message: Add nl_langinfo_l, catopen_l and wcsftime_l. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/include/langinfo.h cvs rdiff -u -r1.12 -r1.13 src/include/nl_types.h cvs rdiff -u -r1.38 -r1.39 src/include/wchar.h cvs rdiff -u -r1.166 -r1.167 src/lib/libc/include/namespace.h cvs rdiff -u -r1.15 -r1.16 src/lib/libc/locale/nl_langinfo.c cvs rdiff -u -r1.3 -r1.4 src/lib/libc/locale/wcsftime.c cvs rdiff -u -r1.11 -r1.12 src/lib/libc/nls/Makefile.inc cvs rdiff -u -r1.7 -r0 src/lib/libc/nls/_catclose.c \ src/lib/libc/nls/_catopen.c cvs rdiff -u -r1.8 -r0 src/lib/libc/nls/_catgets.c cvs rdiff -u -r1.31 -r1.32 src/lib/libc/nls/catopen.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/langinfo.h diff -u src/include/langinfo.h:1.9 src/include/langinfo.h:1.10 --- src/include/langinfo.h:1.9 Thu Feb 3 04:39:32 2005 +++ src/include/langinfo.h Mon Aug 19 08:03:33 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: langinfo.h,v 1.9 2005/02/03 04:39:32 perry Exp $ */ +/* $NetBSD: langinfo.h,v 1.10 2013/08/19 08:03:33 joerg Exp $ */ /* * Written by J.T. Conklin @@ -88,4 +88,14 @@ __BEGIN_DECLS char *nl_langinfo(nl_item); __END_DECLS +#if defined(_NETBSD_SOURCE) +# ifndef __LOCALE_T_DECLARED +typedef struct _locale *locale_t; +# define __LOCALE_T_DECLARED +# endif +__BEGIN_DECLS +char *nl_langinfo_l(nl_item, locale_t); +__END_DECLS +#endif + #endif /* _LANGINFO_H_ */ Index: src/include/nl_types.h diff -u src/include/nl_types.h:1.12 src/include/nl_types.h:1.13 --- src/include/nl_types.h:1.12 Mon Apr 28 20:22:54 2008 +++ src/include/nl_types.h Mon Aug 19 08:03:33 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: nl_types.h,v 1.12 2008/04/28 20:22:54 martin Exp $ */ +/* $NetBSD: nl_types.h,v 1.13 2013/08/19 08:03:33 joerg Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -83,9 +83,18 @@ typedef long nl_item; __BEGIN_DECLS nl_catd catopen(const char *, int); -char*catgets(nl_catd, int, int, const char *) - __attribute__((__format_arg__(4))); +char*catgets(nl_catd, int, int, const char *) __format_arg(4); int catclose(nl_catd); __END_DECLS +#if defined(_NETBSD_SOURCE) +# ifndef __LOCALE_T_DECLARED +typedef struct _locale *locale_t; +# define __LOCALE_T_DECLARED +# endif +__BEGIN_DECLS +nl_catd catopen_l(const char *, int, locale_t); +__END_DECLS +#endif + #endif /* _NL_TYPES_H_ */ Index: src/include/wchar.h diff -u src/include/wchar.h:1.38 src/include/wchar.h:1.39 --- src/include/wchar.h:1.38 Tue May 28 16:57:56 2013 +++ src/include/wchar.h Mon Aug 19 08:03:33 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: wchar.h,v 1.38 2013/05/28 16:57:56 joerg Exp $ */ +/* $NetBSD: wchar.h,v 1.39 2013/08/19 08:03:33 joerg Exp $ */ /*- * Copyright (c)1999 Citrus Project, @@ -222,6 +222,9 @@ size_t wcsxfrm_l(wchar_t *, const wchar_ int wcsncasecmp_l(const wchar_t *, const wchar_t *, size_t, locale_t); int wcscasecmp_l(const wchar_t *, const wchar_t *, locale_t); +size_t wcsftime_l(wchar_t * __restrict, size_t, const wchar_t * __restrict, + const struct tm * __restrict, locale_t); + float wcstof_l(const wchar_t * __restrict, wchar_t ** __restrict, locale_t); double wcstod_l(const wchar_t * __restrict, wchar_t ** __restrict, locale_t); long double wcstold_l(const wchar_t * __restrict, wchar_t ** __restrict, Index: src/lib/libc/include/namespace.h diff -u src/lib/libc/include/namespace.h:1.166 src/lib/libc/include/namespace.h:1.167 --- src/lib/libc/include/namespace.h:1.166 Tue Apr 30 00:45:04 2013 +++ src/lib/libc/include/namespace.h Mon Aug 19 08:03:33 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: namespace.h,v 1.166 2013/04/30 00:45:04 joerg Exp $ */ +/* $NetBSD: namespace.h,v 1.167 2013/08/19 08:03:33 joerg Exp $ */ /*- * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. @@ -37,6 +37,7 @@ #define catclose _catclose #define catgets _catgets #define catopen _catopen +#define catopen_l _catopen_l #define daylight _daylight #define difftime _difftime #define devname_r _devname_r @@ -486,6 +487,7 @@ #if 0 #define nlist _nlist #endif +#define nl_langinfo_l _nl_langinfo_l #define nrand48 _nrand48 #define ntp_adjtime _ntp_adjtime #define nsdispatch _nsdispatch @@ -741,6 +743,7 @@ #define wcscasecmp _wcscasecmp #define wcscasecmp_l _wcscasecmp_l #define wcsdup _wcsdup +#define wcsftime_l _wcsftime_l #define wcsncasecmp _wcsncasecmp #define wcsncasecmp_l _wcsncasecmp_l #define wcstof _wcstof Index: src/lib/libc/locale/nl_langinfo.c diff -u src/lib/libc/locale/nl_langinfo.c:1.15 src/lib/libc/lo
CVS commit: src
Module Name:src
Committed By: christos
Date: Mon Aug 19 07:18:42 UTC 2013
Modified Files:
src/include: netdb.h
src/lib/libc/net: gethnamaddr.c gethostbyname.3
Log Message:
fix gethostbyaddr prototype per TOG.
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/include/netdb.h
cvs rdiff -u -r1.81 -r1.82 src/lib/libc/net/gethnamaddr.c
cvs rdiff -u -r1.28 -r1.29 src/lib/libc/net/gethostbyname.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/include/netdb.h
diff -u src/include/netdb.h:1.68 src/include/netdb.h:1.69
--- src/include/netdb.h:1.68 Fri May 3 20:37:47 2013
+++ src/include/netdb.h Mon Aug 19 03:18:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: netdb.h,v 1.68 2013/05/04 00:37:47 riz Exp $ */
+/* $NetBSD: netdb.h,v 1.69 2013/08/19 07:18:42 christos Exp $ */
/*
* ++Copyright++ 1980, 1983, 1988, 1993
@@ -320,7 +320,7 @@ void endservent(void);
void freehostent(struct hostent *);
#endif
#endif
-struct hostent *gethostbyaddr(const char *, socklen_t, int);
+struct hostent *gethostbyaddr(const void *, socklen_t, int);
struct hostent *gethostbyname(const char *);
#if defined(_NETBSD_SOURCE)
struct hostent *gethostbyname2(const char *, int);
Index: src/lib/libc/net/gethnamaddr.c
diff -u src/lib/libc/net/gethnamaddr.c:1.81 src/lib/libc/net/gethnamaddr.c:1.82
--- src/lib/libc/net/gethnamaddr.c:1.81 Sun Aug 18 05:57:16 2013
+++ src/lib/libc/net/gethnamaddr.c Mon Aug 19 03:18:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gethnamaddr.c,v 1.81 2013/08/18 09:57:16 christos Exp $ */
+/* $NetBSD: gethnamaddr.c,v 1.82 2013/08/19 07:18:42 christos Exp $ */
/*
* ++Copyright++ 1985, 1988, 1993
@@ -57,7 +57,7 @@
static char sccsid[] = "@(#)gethostnamadr.c 8.1 (Berkeley) 6/4/93";
static char rcsid[] = "Id: gethnamaddr.c,v 8.21 1997/06/01 20:34:37 vixie Exp ";
#else
-__RCSID("$NetBSD: gethnamaddr.c,v 1.81 2013/08/18 09:57:16 christos Exp $");
+__RCSID("$NetBSD: gethnamaddr.c,v 1.82 2013/08/19 07:18:42 christos Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -1530,7 +1530,7 @@ static struct hostent h_ent;
static char h_buf[16384];
struct hostent *
-gethostbyaddr(const char *addr, socklen_t len, int af) {
+gethostbyaddr(const void *addr, socklen_t len, int af) {
return gethostbyaddr_r(addr, len, af, &h_ent, h_buf, sizeof(h_buf),
&h_errno);
}
Index: src/lib/libc/net/gethostbyname.3
diff -u src/lib/libc/net/gethostbyname.3:1.28 src/lib/libc/net/gethostbyname.3:1.29
--- src/lib/libc/net/gethostbyname.3:1.28 Sat Oct 7 17:30:39 2006
+++ src/lib/libc/net/gethostbyname.3 Mon Aug 19 03:18:42 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: gethostbyname.3,v 1.28 2006/10/07 21:30:39 apb Exp $
+.\" $NetBSD: gethostbyname.3,v 1.29 2013/08/19 07:18:42 christos Exp $
.\"
.\" Copyright (c) 1983, 1987, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)gethostbyname.3 8.4 (Berkeley) 5/25/95
.\"
-.Dd October 7, 2006
+.Dd August 19, 2013
.Dt GETHOSTBYNAME 3
.Os
.Sh NAME
@@ -52,7 +52,7 @@
.Ft struct hostent *
.Fn gethostbyname2 "const char *name" "int af"
.Ft struct hostent *
-.Fn gethostbyaddr "const char *addr" "socklen_t len" "int type"
+.Fn gethostbyaddr "const void *addr" "socklen_t len" "int type"
.Ft struct hostent *
.Fn gethostent void
.Ft void
CVS commit: src/sys/arch/arm/pic
Module Name:src
Committed By: skrll
Date: Mon Aug 19 07:06:06 UTC 2013
Modified Files:
src/sys/arch/arm/pic: pic.c
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/pic/pic.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/arm/pic/pic.c
diff -u src/sys/arch/arm/pic/pic.c:1.15 src/sys/arch/arm/pic/pic.c:1.16
--- src/sys/arch/arm/pic/pic.c:1.15 Tue Oct 30 07:42:35 2012
+++ src/sys/arch/arm/pic/pic.c Mon Aug 19 07:06:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pic.c,v 1.15 2012/10/30 07:42:35 msaitoh Exp $ */
+/* $NetBSD: pic.c,v 1.16 2013/08/19 07:06:06 skrll Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.15 2012/10/30 07:42:35 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.16 2013/08/19 07:06:06 skrll Exp $");
#define _INTR_PRIVATE
#include
@@ -257,7 +257,6 @@ pic_dispatch(struct intrsource *is, void
{
int rv;
-
if (__predict_false(is->is_arg == NULL)
&& __predict_true(frame != NULL)) {
rv = (*is->is_func)(frame);
