CVS commit: src/distrib/common
Module Name:src
Committed By: joerg
Date: Thu Aug 15 12:39:28 UTC 2013
Modified Files:
src/distrib/common: Makefile.mdset
Log Message:
Save space and strip .eh_frame sections for the ramdisks as well.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/distrib/common/Makefile.mdset
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.mdset
diff -u src/distrib/common/Makefile.mdset:1.37 src/distrib/common/Makefile.mdset:1.38
--- src/distrib/common/Makefile.mdset:1.37 Wed Jan 30 13:47:36 2013
+++ src/distrib/common/Makefile.mdset Thu Aug 15 12:39:28 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.mdset,v 1.37 2013/01/30 13:47:36 he Exp $
+# $NetBSD: Makefile.mdset,v 1.38 2013/08/15 12:39:28 joerg Exp $
#
# Makefile snippet to ${TOOL_MDSETIMAGE} file system images into kernels
#
@@ -153,7 +153,7 @@ ${_KERNEL.${_K}.${_F}}: .NOTMAIN ${_KERN
${NM} ${.TARGET}.tmp | gzip -9n ${.TARGET}.symbols.gz
.endif
.if !defined(MDSET_NOSTRIP.${_FILENAME}) !defined(MDSET_NOSTRIP)
- ${STRIP} -R .comment -R .ident ${.TARGET}.tmp
+ ${STRIP} -R .eh_frame -R .eh_frame_hdr -R .comment -R .ident ${.TARGET}.tmp
.endif
@mv ${.TARGET}.tmp ${.TARGET}
.if defined(MDSET_POST.${_FILENAME}) || defined(MDSET_POST)
CVS commit: src/tests/lib/libexecinfo
Module Name:src
Committed By: joerg
Date: Thu Aug 15 12:42:25 UTC 2013
Modified Files:
src/tests/lib/libexecinfo: t_backtrace.c
Log Message:
Now that all architectures default to unwind data, remove the failure
for !amd64.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/lib/libexecinfo/t_backtrace.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/libexecinfo/t_backtrace.c
diff -u src/tests/lib/libexecinfo/t_backtrace.c:1.8 src/tests/lib/libexecinfo/t_backtrace.c:1.9
--- src/tests/lib/libexecinfo/t_backtrace.c:1.8 Fri Jul 5 09:55:39 2013
+++ src/tests/lib/libexecinfo/t_backtrace.c Thu Aug 15 12:42:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: t_backtrace.c,v 1.8 2013/07/05 09:55:39 joerg Exp $ */
+/* $NetBSD: t_backtrace.c,v 1.9 2013/08/15 12:42:25 joerg Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__RCSID($NetBSD: t_backtrace.c,v 1.8 2013/07/05 09:55:39 joerg Exp $);
+__RCSID($NetBSD: t_backtrace.c,v 1.9 2013/08/15 12:42:25 joerg Exp $);
#include atf-c.h
#include atf-c/config.h
@@ -128,12 +128,6 @@ ATF_TC_HEAD(backtrace_fmt_basic, tc)
ATF_TC_BODY(backtrace_fmt_basic, tc)
{
- const char *arch = atf_config_get(atf_arch);
-
-if (strcmp(arch, x86_64) != 0)
- atf_tc_skip(PR toolchain/46490: libexecinfo only
- works on amd64 currently);
-
myfunc(12);
}
CVS commit: src/share/mk
Module Name:src Committed By: martin Date: Thu Aug 15 12:45:50 UTC 2013 Modified Files: src/share/mk: bsd.own.mk Log Message: Add .ARM.extab to the list of sections to be removed when converting to aout format. To generate a diff of this commit: cvs rdiff -u -r1.747 -r1.748 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/mk/bsd.own.mk diff -u src/share/mk/bsd.own.mk:1.747 src/share/mk/bsd.own.mk:1.748 --- src/share/mk/bsd.own.mk:1.747 Mon Aug 12 16:51:14 2013 +++ src/share/mk/bsd.own.mk Thu Aug 15 12:45:50 2013 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.747 2013/08/12 16:51:14 joerg Exp $ +# $NetBSD: bsd.own.mk,v 1.748 2013/08/15 12:45:50 martin Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -486,6 +486,7 @@ OBJCOPY_ELF2AOUT_FLAGS?= \ -R .ident \ -R .ARM.attributes \ -R .ARM.exidx \ + -R .ARM.extab \ -R .arm.atpcs \ -R .comment \ -R .debug_abbrev \
CVS commit: src/sys/arch/shark/conf
Module Name:src
Committed By: martin
Date: Thu Aug 15 12:45:06 UTC 2013
Modified Files:
src/sys/arch/shark/conf: Makefile.shark.inc
Log Message:
Do not explicitly prevent unwind table generation
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/shark/conf/Makefile.shark.inc
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/shark/conf/Makefile.shark.inc
diff -u src/sys/arch/shark/conf/Makefile.shark.inc:1.17 src/sys/arch/shark/conf/Makefile.shark.inc:1.18
--- src/sys/arch/shark/conf/Makefile.shark.inc:1.17 Wed Aug 14 14:45:12 2013
+++ src/sys/arch/shark/conf/Makefile.shark.inc Thu Aug 15 12:45:06 2013
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.shark.inc,v 1.17 2013/08/14 14:45:12 martin Exp $
+# $NetBSD: Makefile.shark.inc,v 1.18 2013/08/15 12:45:06 martin Exp $
CPPFLAGS+= -D${MACHINE}
-CFLAGS+= -fno-unwind-tables
GENASSYM_EXTRAS+= ${THISARM}/shark/genassym.cf
# Need to convert the kernel from ELF to a.out so that OpenFirmware
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: aymeric
Date: Thu Aug 15 15:26:50 UTC 2013
Modified Files:
src/sys/dev/usb: uaudio.c
Log Message:
In the error paths where uaudio_chan_free_buffers() has to be called, acquire
the uaudio spinlock after the call because another spinlock is used indirectly
during the call.
Fixes a panic with LOCKDEBUG when a low-speed uaudio attached to a high-speed
hub is opened.
To generate a diff of this commit:
cvs rdiff -u -r1.136 -r1.137 src/sys/dev/usb/uaudio.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/usb/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.136 src/sys/dev/usb/uaudio.c:1.137
--- src/sys/dev/usb/uaudio.c:1.136 Sun May 12 09:54:55 2013
+++ src/sys/dev/usb/uaudio.c Thu Aug 15 15:26:50 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.136 2013/05/12 09:54:55 wiz Exp $ */
+/* $NetBSD: uaudio.c,v 1.137 2013/08/15 15:26:50 aymeric Exp $ */
/*
* Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uaudio.c,v 1.136 2013/05/12 09:54:55 wiz Exp $);
+__KERNEL_RCSID(0, $NetBSD: uaudio.c,v 1.137 2013/08/15 15:26:50 aymeric Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2593,9 +2593,9 @@ uaudio_trigger_input(void *addr, void *s
}
err = uaudio_chan_open(sc, ch);
- mutex_spin_enter(sc-sc_intr_lock);
if (err) {
uaudio_chan_free_buffers(sc, ch);
+ mutex_spin_enter(sc-sc_intr_lock);
return EIO;
}
@@ -2640,9 +2640,9 @@ uaudio_trigger_output(void *addr, void *
}
err = uaudio_chan_open(sc, ch);
- mutex_spin_enter(sc-sc_intr_lock);
if (err) {
uaudio_chan_free_buffers(sc, ch);
+ mutex_spin_enter(sc-sc_intr_lock);
return EIO;
}
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 20:45:12 UTC 2013 Modified Files: src/sys/rump/include/rump: makerumpdefs.sh Log Message: grab struct dirent To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/rump/include/rump/makerumpdefs.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/rump/include/rump/makerumpdefs.sh diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.18 src/sys/rump/include/rump/makerumpdefs.sh:1.19 --- src/sys/rump/include/rump/makerumpdefs.sh:1.18 Tue Jun 25 21:06:39 2013 +++ src/sys/rump/include/rump/makerumpdefs.sh Thu Aug 15 20:45:12 2013 @@ -8,7 +8,7 @@ echo Generating rumpdefs.h rm -f rumpdefs.h exec rumpdefs.h -printf '/* $NetBSD: makerumpdefs.sh,v 1.18 2013/06/25 21:06:39 stacktic Exp $ */\n\n' +printf '/* $NetBSD: makerumpdefs.sh,v 1.19 2013/08/15 20:45:12 pooka Exp $ */\n\n' printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n' printf '#ifndef _RUMP_RUMPDEFS_H_\n' printf '#define _RUMP_RUMPDEFS_H_\n\n' @@ -95,4 +95,7 @@ getstruct ../../../ufs/ufs/ufsmount.h uf fromvers ../../../fs/sysvbfs/sysvbfs_args.h getstruct ../../../fs/sysvbfs/sysvbfs_args.h sysvbfs_args +fromvers ../../../sys/dirent.h +getstruct ../../../sys/dirent.h dirent + printf '\n#endif /* _RUMP_RUMPDEFS_H_ */\n'
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Thu Aug 15 20:45:38 UTC 2013
Modified Files:
src/sys/rump/include/rump: rumpdefs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/rump/include/rump/rumpdefs.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/rump/include/rump/rumpdefs.h
diff -u src/sys/rump/include/rump/rumpdefs.h:1.22 src/sys/rump/include/rump/rumpdefs.h:1.23
--- src/sys/rump/include/rump/rumpdefs.h:1.22 Tue Jun 25 21:07:22 2013
+++ src/sys/rump/include/rump/rumpdefs.h Thu Aug 15 20:45:38 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdefs.h,v 1.22 2013/06/25 21:07:22 stacktic Exp $ */
+/* $NetBSD: rumpdefs.h,v 1.23 2013/08/15 20:45:38 pooka Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -295,7 +295,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_MSG_IOVUSRSPACE 0x400
#define RUMP_MSG_LENUSRSPACE 0x800
-/* NetBSD: in.h,v 1.88 2013/04/27 21:35:24 joerg Exp */
+/* NetBSD: in.h,v 1.87 2012/06/22 14:54:35 christos Exp */
#define RUMP_IP_OPTIONS 1
#define RUMP_IP_HDRINCL 2
#define RUMP_IP_TOS 3
@@ -480,7 +480,7 @@ struct rump_modctl_load {
size_t ml_propslen;
};
-/* NetBSD: ufsmount.h,v 1.40 2013/06/16 13:33:30 hannken Exp */
+/* NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */
struct rump_ufs_args {
char *fspec; /* block special device to mount */
};
@@ -490,4 +490,17 @@ struct rump_sysvbfs_args {
char *fspec; /* blocks special holding the fs to mount */
};
+/* NetBSD: dirent.h,v 1.28 2011/09/27 01:40:32 christos Exp */
+struct rump_dirent {
+ ino_t d_fileno; /* file number of entry */
+ uint16_t d_reclen; /* length of this record */
+ uint16_t d_namlen; /* length of string in d_name */
+ uint8_t d_type; /* file type, see below */
+#if defined(_NETBSD_SOURCE)
+ char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */
+#else
+ char d_name[511 + 1]; /* name must be no longer than this */
+#endif
+};
+
#endif /* _RUMP_RUMPDEFS_H_ */
CVS commit: src/usr.bin/bdes
Module Name:src
Committed By: joerg
Date: Thu Aug 15 20:48:56 UTC 2013
Modified Files:
src/usr.bin/bdes: bdes.c
Log Message:
Use more static and __dead.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/bdes/bdes.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/bdes/bdes.c
diff -u src/usr.bin/bdes/bdes.c:1.8 src/usr.bin/bdes/bdes.c:1.9
--- src/usr.bin/bdes/bdes.c:1.8 Tue Apr 14 10:11:28 2009
+++ src/usr.bin/bdes/bdes.c Thu Aug 15 20:48:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bdes.c,v 1.8 2009/04/14 10:11:28 lukem Exp $ */
+/* $NetBSD: bdes.c,v 1.9 2013/08/15 20:48:56 joerg Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -46,7 +46,7 @@ __COPYRIGHT(@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = @(#)bdes.c 8.1 (Berkeley) 6/6/93;
#else
-__RCSID($NetBSD: bdes.c,v 1.8 2009/04/14 10:11:28 lukem Exp $);
+__RCSID($NetBSD: bdes.c,v 1.9 2013/08/15 20:48:56 joerg Exp $);
#endif
#endif /* not lint */
@@ -141,44 +141,46 @@ typedef char Desbuf[8];
*/
#define KEY_DEFAULT 0 /* interpret radix of key from key */
#define KEY_ASCII 1 /* key is in ASCII characters */
-int keybase = KEY_DEFAULT; /* how to interpret the key */
+static int keybase = KEY_DEFAULT; /* how to interpret the key */
-enum { /* encrypt, decrypt, authenticate */
+static enum { /* encrypt, decrypt, authenticate */
MODE_ENCRYPT, MODE_DECRYPT, MODE_AUTHENTICATE
} mode = MODE_ENCRYPT;
-enum { /* ecb, cbc, cfb, cfba, ofb? */
+static enum {/* ecb, cbc, cfb, cfba, ofb? */
ALG_ECB, ALG_CBC, ALG_CFB, ALG_OFB, ALG_CFBA
} alg = ALG_CBC;
-Desbuf ivec;/* initialization vector */
-char bits[] = {/* used to extract bits from a char */
+static Desbuf ivec;/* initialization vector */
+static const char bits[] = {/* used to extract bits from a char */
'\200', '\100', '\040', '\020', '\010', '\004', '\002', '\001'
};
-int inverse;/* 0 to encrypt, 1 to decrypt */
-int macbits = -1; /* number of bits in authentication */
-int fbbits = -1; /* number of feedback bits */
-int pflag;/* 1 to preserve parity bits */
-
-int setbits(char *, int);
-void bdes_err(int, const char *);
-int tobinhex(char, int);
-void cvtkey(char *, char *);
-void makekey(Desbuf);
-void ecbenc(void);
-void ecbdec(void);
-void cbcenc(void);
-void cbcdec(void);
-void cbcauth(void);
-void cfbenc(void);
-void cfbdec(void);
-void cfbaenc(void);
-void cfbadec(void);
-void ofbenc(void);
-void ofbdec(void);
-void cfbauth(void);
-void expand(Desbuf, char *);
-void compress(char *, Desbuf);
-void usage(void);
+static int inverse;/* 0 to encrypt, 1 to decrypt */
+static int macbits = -1; /* number of bits in authentication */
+static int fbbits = -1; /* number of feedback bits */
+static int pflag;/* 1 to preserve parity bits */
+
+static int setbits(char *, int);
+static void bdes_err(int, const char *) __dead;
+static int tobinhex(char, int);
+static void cvtkey(char *, char *);
+static void makekey(Desbuf);
+static void ecbenc(void);
+static void ecbdec(void);
+static void cbcenc(void);
+static void cbcdec(void);
+static void cbcauth(void);
+static void cfbenc(void);
+static void cfbdec(void);
+static void cfbaenc(void);
+static void cfbadec(void);
+static void ofbenc(void);
+static void ofbdec(void);
+static void cfbauth(void);
+#ifndef FASTWAY
+static void expand(Desbuf, char *);
+static void compress(char *, Desbuf);
+#endif
+static void usage(void) __dead;
int
main(int ac, char *av[])
@@ -357,7 +359,7 @@ main(int ac, char *av[])
/*
* print a warning message and, possibly, terminate
*/
-void
+static void
bdes_err(int n, const char *s)
{
if (n 0)
@@ -371,7 +373,7 @@ bdes_err(int n, const char *s)
/*
* map a hex character to an integer
*/
-int
+static int
tobinhex(char c, int radix)
{
switch(c) {
@@ -401,7 +403,7 @@ tobinhex(char c, int radix)
/*
* convert the key to a bit pattern
*/
-void
+static void
cvtkey(char *obuf, char *ibuf)
{
register int i, j; /* counter in a for loop */
@@ -468,7 +470,7 @@ cvtkey(char *obuf, char *ibuf)
* 2. must be a valid decimal number
* 3. must be a multiple of mult
*/
-int
+static int
setbits(char *s, int mult)
{
char *p;
@@ -497,7 +499,7 @@ setbits(char *s, int mult)
* systems set the parity (high) bit of each character to 0, and the
* DES ignores the low order bit of each character.
*/
-void
+static void
makekey(Desbuf buf)
{
register int i, j; /* counter in a for loop */
@@ -525,7 +527,7 @@ makekey(Desbuf buf)
/*
* This encrypts using the Electronic Code Book mode of DES
*/
-void
+static void
ecbenc(void)
{
register int n; /* number of bytes actually read */
@@ -554,7 +556,7 @@ ecbenc(void)
/*
* This decrypts using the Electronic Code Book mode of DES
*/
-void
+static void
ecbdec(void)
{
register int n; /* number of bytes actually read */
@@ -587,7 +589,7 @@
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Thu Aug 15 21:00:56 UTC 2013
Modified Files:
src/sys/rump/include/rump: rumpdefs.h
Log Message:
revert pending fix: MAXNAMLEN causes trouble
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/rump/include/rump/rumpdefs.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/rump/include/rump/rumpdefs.h
diff -u src/sys/rump/include/rump/rumpdefs.h:1.23 src/sys/rump/include/rump/rumpdefs.h:1.24
--- src/sys/rump/include/rump/rumpdefs.h:1.23 Thu Aug 15 20:45:38 2013
+++ src/sys/rump/include/rump/rumpdefs.h Thu Aug 15 21:00:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdefs.h,v 1.23 2013/08/15 20:45:38 pooka Exp $ */
+/* $NetBSD: rumpdefs.h,v 1.24 2013/08/15 21:00:56 pooka Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -295,7 +295,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_MSG_IOVUSRSPACE 0x400
#define RUMP_MSG_LENUSRSPACE 0x800
-/* NetBSD: in.h,v 1.87 2012/06/22 14:54:35 christos Exp */
+/* NetBSD: in.h,v 1.88 2013/04/27 21:35:24 joerg Exp */
#define RUMP_IP_OPTIONS 1
#define RUMP_IP_HDRINCL 2
#define RUMP_IP_TOS 3
@@ -480,7 +480,7 @@ struct rump_modctl_load {
size_t ml_propslen;
};
-/* NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */
+/* NetBSD: ufsmount.h,v 1.40 2013/06/16 13:33:30 hannken Exp */
struct rump_ufs_args {
char *fspec; /* block special device to mount */
};
@@ -490,17 +490,4 @@ struct rump_sysvbfs_args {
char *fspec; /* blocks special holding the fs to mount */
};
-/* NetBSD: dirent.h,v 1.28 2011/09/27 01:40:32 christos Exp */
-struct rump_dirent {
- ino_t d_fileno; /* file number of entry */
- uint16_t d_reclen; /* length of this record */
- uint16_t d_namlen; /* length of string in d_name */
- uint8_t d_type; /* file type, see below */
-#if defined(_NETBSD_SOURCE)
- char d_name[MAXNAMLEN + 1]; /* name must be no longer than this */
-#else
- char d_name[511 + 1]; /* name must be no longer than this */
-#endif
-};
-
#endif /* _RUMP_RUMPDEFS_H_ */
CVS commit: src/sys
Module Name:src
Committed By: pooka
Date: Thu Aug 15 21:16:13 UTC 2013
Modified Files:
src/sys/kern: makesyscalls.sh
src/sys/rump/include/rump: rump_syscalls_compat.h
Log Message:
type compat header list doesn't need to be autogenerated
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/kern/makesyscalls.sh
cvs rdiff -u -r1.10 -r1.11 src/sys/rump/include/rump/rump_syscalls_compat.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/kern/makesyscalls.sh
diff -u src/sys/kern/makesyscalls.sh:1.128 src/sys/kern/makesyscalls.sh:1.129
--- src/sys/kern/makesyscalls.sh:1.128 Thu Mar 7 19:17:46 2013
+++ src/sys/kern/makesyscalls.sh Thu Aug 15 21:16:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: makesyscalls.sh,v 1.128 2013/03/07 19:17:46 pooka Exp $
+# $NetBSD: makesyscalls.sh,v 1.129 2013/08/15 21:16:13 pooka Exp $
#
# Copyright (c) 1994, 1996, 2000 Christopher G. Demetriou
# All rights reserved.
@@ -300,10 +300,6 @@ NR == 1 {
printf #ifdef _KERNEL\n rumpcallshdr
printf #error Interface not supported inside kernel\n rumpcallshdr
printf #endif /* _KERNEL */\n\n rumpcallshdr
- printf #include sys/types.h /* typedefs */\n rumpcallshdr
- printf #include sys/select.h /* typedefs */\n rumpcallshdr
- printf #include sys/socket.h /* typedefs */\n\n rumpcallshdr
- printf #include signal.h /* typedefs */\n\n rumpcallshdr
printf #include rump/rump_syscalls_compat.h\n\n rumpcallshdr
printf %s, sysarghdrextra sysarghdr
Index: src/sys/rump/include/rump/rump_syscalls_compat.h
diff -u src/sys/rump/include/rump/rump_syscalls_compat.h:1.10 src/sys/rump/include/rump/rump_syscalls_compat.h:1.11
--- src/sys/rump/include/rump/rump_syscalls_compat.h:1.10 Thu Jan 17 23:21:20 2013
+++ src/sys/rump/include/rump/rump_syscalls_compat.h Thu Aug 15 21:16:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_syscalls_compat.h,v 1.10 2013/01/17 23:21:20 pooka Exp $ */
+/* $NetBSD: rump_syscalls_compat.h,v 1.11 2013/08/15 21:16:12 pooka Exp $ */
/*-
* Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved.
@@ -28,6 +28,12 @@
#ifndef _RUMP_RUMP_SYSCALLS_COMPAT_H_
#define _RUMP_RUMP_SYSCALLS_COMPAT_H_
+#include sys/types.h /* typedefs */
+#include sys/select.h /* typedefs */
+#include sys/socket.h /* typedefs */
+
+#include signal.h /* typedefs */
+
#ifdef __NetBSD__
#include sys/cdefs.h
#include sys/param.h
CVS commit: src/sys/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:19:14 UTC 2013 Modified Files: src/sys/rump/include/rump: rump_syscalls.h src/sys/rump/librump/rumpkern: rump_syscalls.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/rump/include/rump/rump_syscalls.h cvs rdiff -u -r1.87 -r1.88 src/sys/rump/librump/rumpkern/rump_syscalls.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/rump/include/rump/rump_syscalls.h diff -u src/sys/rump/include/rump/rump_syscalls.h:1.62 src/sys/rump/include/rump/rump_syscalls.h:1.63 --- src/sys/rump/include/rump/rump_syscalls.h:1.62 Fri Mar 29 01:51:25 2013 +++ src/sys/rump/include/rump/rump_syscalls.h Thu Aug 15 21:19:14 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls.h,v 1.62 2013/03/29 01:51:25 christos Exp $ */ +/* $NetBSD: rump_syscalls.h,v 1.63 2013/08/15 21:19:14 pooka Exp $ */ /* * System call protos in rump namespace. @@ -14,700 +14,694 @@ #error Interface not supported inside kernel #endif /* _KERNEL */ -#include sys/types.h /* typedefs */ -#include sys/select.h /* typedefs */ -#include sys/socket.h /* typedefs */ +#include rump/rump_syscalls_compat.h -#include signal.h /* typedefs */ +#ifndef RUMP_SYS_RENAME_FGETXATTR +#define RUMP_SYS_RENAME_FGETXATTR rump___sysimpl_fgetxattr +#endif -#include rump/rump_syscalls_compat.h +#ifndef RUMP_SYS_RENAME_IOCTL +#define RUMP_SYS_RENAME_IOCTL rump___sysimpl_ioctl +#endif -#ifndef RUMP_SYS_RENAME_GETSID -#define RUMP_SYS_RENAME_GETSID rump___sysimpl_getsid +#ifndef RUMP_SYS_RENAME_GETPPID +#define RUMP_SYS_RENAME_GETPPID rump___sysimpl_getppid #endif -#ifndef RUMP_SYS_RENAME_UTIMENSAT -#define RUMP_SYS_RENAME_UTIMENSAT rump___sysimpl_utimensat +#ifndef RUMP_SYS_RENAME___QUOTACTL +#define RUMP_SYS_RENAME___QUOTACTL rump___sysimpl___quotactl #endif -#ifndef RUMP_SYS_RENAME_CHFLAGS -#define RUMP_SYS_RENAME_CHFLAGS rump___sysimpl_chflags +#ifndef RUMP_SYS_RENAME_GETPGID +#define RUMP_SYS_RENAME_GETPGID rump___sysimpl_getpgid #endif -#ifndef RUMP_SYS_RENAME_GETGROUPS -#define RUMP_SYS_RENAME_GETGROUPS rump___sysimpl_getgroups +#ifndef RUMP_SYS_RENAME___SETLOGIN +#define RUMP_SYS_RENAME___SETLOGIN rump___sysimpl___setlogin #endif -#ifndef RUMP_SYS_RENAME_SENDTO -#define RUMP_SYS_RENAME_SENDTO rump___sysimpl_sendto +#ifndef RUMP_SYS_RENAME_SETEUID +#define RUMP_SYS_RENAME_SETEUID rump___sysimpl_seteuid #endif -#ifndef RUMP_SYS_RENAME_FHSTATVFS1 -#define RUMP_SYS_RENAME_FHSTATVFS1 rump___sysimpl_fhstatvfs140 +#ifndef RUMP_SYS_RENAME_GETPEERNAME +#define RUMP_SYS_RENAME_GETPEERNAME rump___sysimpl_getpeername #endif -#ifndef RUMP_SYS_RENAME_FEXECVE -#define RUMP_SYS_RENAME_FEXECVE rump___sysimpl_fexecve +#ifndef RUMP_SYS_RENAME_SYMLINK +#define RUMP_SYS_RENAME_SYMLINK rump___sysimpl_symlink #endif -#ifndef RUMP_SYS_RENAME_PWRITEV -#define RUMP_SYS_RENAME_PWRITEV rump___sysimpl_pwritev +#ifndef RUMP_SYS_RENAME_GETUID_WITH_EUID +#define RUMP_SYS_RENAME_GETUID_WITH_EUID rump___sysimpl_getuid #endif -#ifndef RUMP_SYS_RENAME_EXTATTR_GET_LINK -#define RUMP_SYS_RENAME_EXTATTR_GET_LINK rump___sysimpl_extattr_get_link +#ifndef RUMP_SYS_RENAME_READ +#define RUMP_SYS_RENAME_READ rump___sysimpl_read #endif -#ifndef RUMP_SYS_RENAME_MKDIRAT -#define RUMP_SYS_RENAME_MKDIRAT rump___sysimpl_mkdirat +#ifndef RUMP_SYS_RENAME_EXTATTR_GET_FILE +#define RUMP_SYS_RENAME_EXTATTR_GET_FILE rump___sysimpl_extattr_get_file #endif -#ifndef RUMP_SYS_RENAME___GETCWD -#define RUMP_SYS_RENAME___GETCWD rump___sysimpl___getcwd +#ifndef RUMP_SYS_RENAME_EXTATTR_LIST_FD +#define RUMP_SYS_RENAME_EXTATTR_LIST_FD rump___sysimpl_extattr_list_fd #endif #ifndef RUMP_SYS_RENAME_SETRLIMIT #define RUMP_SYS_RENAME_SETRLIMIT rump___sysimpl_setrlimit #endif -#ifndef RUMP_SYS_RENAME_FDATASYNC -#define RUMP_SYS_RENAME_FDATASYNC rump___sysimpl_fdatasync +#ifndef RUMP_SYS_RENAME_GETPID_WITH_PPID +#define RUMP_SYS_RENAME_GETPID_WITH_PPID rump___sysimpl_getpid #endif -#ifndef RUMP_SYS_RENAME_SETSID -#define RUMP_SYS_RENAME_SETSID rump___sysimpl_setsid +#ifndef RUMP_SYS_RENAME_SETGID +#define RUMP_SYS_RENAME_SETGID rump___sysimpl_setgid #endif -#ifndef RUMP_SYS_RENAME_REMOVEXATTR -#define RUMP_SYS_RENAME_REMOVEXATTR rump___sysimpl_removexattr +#ifndef RUMP_SYS_RENAME_LISTEN +#define RUMP_SYS_RENAME_LISTEN rump___sysimpl_listen #endif -#ifndef RUMP_SYS_RENAME_GETVFSSTAT -#define RUMP_SYS_RENAME_GETVFSSTAT rump___sysimpl_getvfsstat +#ifndef RUMP_SYS_RENAME_SYNC +#define RUMP_SYS_RENAME_SYNC rump___sysimpl_sync #endif -#ifndef RUMP_SYS_RENAME_FLOCK -#define RUMP_SYS_RENAME_FLOCK rump___sysimpl_flock +#ifndef RUMP_SYS_RENAME_FUTIMENS +#define RUMP_SYS_RENAME_FUTIMENS rump___sysimpl_futimens #endif -#ifndef RUMP_SYS_RENAME_LISTXATTR -#define RUMP_SYS_RENAME_LISTXATTR rump___sysimpl_listxattr +#ifndef RUMP_SYS_RENAME_MKNODAT +#define RUMP_SYS_RENAME_MKNODAT
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:21:47 UTC 2013 Modified Files: src/sys/rump/include/rump: rump_syscalls_compat.h Log Message: Give includers a way to say yea I'll just deal with the type compat on my own, thank you very many To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/rump/include/rump/rump_syscalls_compat.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/rump/include/rump/rump_syscalls_compat.h diff -u src/sys/rump/include/rump/rump_syscalls_compat.h:1.11 src/sys/rump/include/rump/rump_syscalls_compat.h:1.12 --- src/sys/rump/include/rump/rump_syscalls_compat.h:1.11 Thu Aug 15 21:16:12 2013 +++ src/sys/rump/include/rump/rump_syscalls_compat.h Thu Aug 15 21:21:47 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls_compat.h,v 1.11 2013/08/15 21:16:12 pooka Exp $ */ +/* $NetBSD: rump_syscalls_compat.h,v 1.12 2013/08/15 21:21:47 pooka Exp $ */ /*- * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -28,11 +28,14 @@ #ifndef _RUMP_RUMP_SYSCALLS_COMPAT_H_ #define _RUMP_RUMP_SYSCALLS_COMPAT_H_ +/* should have a smaller hammer here */ +#ifndef RUMP_HOST_NOT_POSIX #include sys/types.h /* typedefs */ #include sys/select.h /* typedefs */ #include sys/socket.h /* typedefs */ #include signal.h /* typedefs */ +#endif #ifdef __NetBSD__ #include sys/cdefs.h
CVS commit: src/sys/rump/librump/rumpvfs
Module Name:src Committed By: pooka Date: Thu Aug 15 21:28:23 UTC 2013 Modified Files: src/sys/rump/librump/rumpvfs: compat.c Log Message: remove includes which haven't been necessary since the cudgel war To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/rump/librump/rumpvfs/compat.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/rump/librump/rumpvfs/compat.c diff -u src/sys/rump/librump/rumpvfs/compat.c:1.9 src/sys/rump/librump/rumpvfs/compat.c:1.10 --- src/sys/rump/librump/rumpvfs/compat.c:1.9 Mon Jan 17 16:20:20 2011 +++ src/sys/rump/librump/rumpvfs/compat.c Thu Aug 15 21:28:23 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: compat.c,v 1.9 2011/01/17 16:20:20 pooka Exp $ */ +/* $NetBSD: compat.c,v 1.10 2013/08/15 21:28:23 pooka Exp $ */ /* * Copyright (c) 2009 Antti Kantee. All Rights Reserved. @@ -28,7 +28,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: compat.c,v 1.9 2011/01/17 16:20:20 pooka Exp $); +__KERNEL_RCSID(0, $NetBSD: compat.c,v 1.10 2013/08/15 21:28:23 pooka Exp $); #include sys/param.h #include sys/kmem.h @@ -39,8 +39,6 @@ __KERNEL_RCSID(0, $NetBSD: compat.c,v 1 #include compat/sys/time.h #include rump/rump.h -#include rump/rump_syscalls_compat.h -#include rump/rumpuser.h #include rump_vfs_private.h
CVS commit: src/sys/rump/include/rump
Module Name:src Committed By: pooka Date: Thu Aug 15 21:29:04 UTC 2013 Modified Files: src/sys/rump/include/rump: rump_syscalls_compat.h Log Message: Explicitly produce an error if the mythical kernel folk try to include this header. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/rump/include/rump/rump_syscalls_compat.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/rump/include/rump/rump_syscalls_compat.h diff -u src/sys/rump/include/rump/rump_syscalls_compat.h:1.12 src/sys/rump/include/rump/rump_syscalls_compat.h:1.13 --- src/sys/rump/include/rump/rump_syscalls_compat.h:1.12 Thu Aug 15 21:21:47 2013 +++ src/sys/rump/include/rump/rump_syscalls_compat.h Thu Aug 15 21:29:04 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: rump_syscalls_compat.h,v 1.12 2013/08/15 21:21:47 pooka Exp $ */ +/* $NetBSD: rump_syscalls_compat.h,v 1.13 2013/08/15 21:29:04 pooka Exp $ */ /*- * Copyright (c) 2010, 2011 Antti Kantee. All Rights Reserved. @@ -25,6 +25,10 @@ * SUCH DAMAGE. */ +#ifdef _KERNEL +#error rump_syscalls_compat is not for kernel consumers +#endif + #ifndef _RUMP_RUMP_SYSCALLS_COMPAT_H_ #define _RUMP_RUMP_SYSCALLS_COMPAT_H_
CVS commit: src/common/lib/libc/arch/arm/gen
Module Name:src Committed By: matt Date: Thu Aug 15 21:40:11 UTC 2013 Modified Files: src/common/lib/libc/arch/arm/gen: modsi3.S umodsi3.S Log Message: Only assemble if !__ARM_EABI__ To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/arm/gen/modsi3.S \ src/common/lib/libc/arch/arm/gen/umodsi3.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/gen/modsi3.S diff -u src/common/lib/libc/arch/arm/gen/modsi3.S:1.3 src/common/lib/libc/arch/arm/gen/modsi3.S:1.4 --- src/common/lib/libc/arch/arm/gen/modsi3.S:1.3 Thu Jun 20 07:16:23 2013 +++ src/common/lib/libc/arch/arm/gen/modsi3.S Thu Aug 15 21:40:11 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: modsi3.S,v 1.3 2013/06/20 07:16:23 matt Exp $ */ +/* $NetBSD: modsi3.S,v 1.4 2013/08/15 21:40:11 matt Exp $ */ /* * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND @@ -16,6 +16,7 @@ #include machine/asm.h +#ifndef __ARM_EABI__ /* * stack is aligned as there's a possibility of branching to .L_overflow * which makes a C call @@ -33,3 +34,5 @@ ENTRY(__modsi3) #endif RET END(__modsi3) + +#endif Index: src/common/lib/libc/arch/arm/gen/umodsi3.S diff -u src/common/lib/libc/arch/arm/gen/umodsi3.S:1.3 src/common/lib/libc/arch/arm/gen/umodsi3.S:1.4 --- src/common/lib/libc/arch/arm/gen/umodsi3.S:1.3 Thu Jun 20 07:16:23 2013 +++ src/common/lib/libc/arch/arm/gen/umodsi3.S Thu Aug 15 21:40:11 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: umodsi3.S,v 1.3 2013/06/20 07:16:23 matt Exp $ */ +/* $NetBSD: umodsi3.S,v 1.4 2013/08/15 21:40:11 matt Exp $ */ /* * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND @@ -16,6 +16,7 @@ #include machine/asm.h +#ifndef __ARM_EABI__ /* * stack is aligned as there's a possibility of branching to .L_overflow * which makes a C call @@ -32,3 +33,5 @@ ENTRY(__umodsi3) ldr lr, [sp], #8 /* pop lr */ #endif RET +END(__umodsi3) +#endif
CVS commit: src/sys/arch
Module Name:src
Committed By: matt
Date: Thu Aug 15 21:41:09 UTC 2013
Modified Files:
src/sys/arch/acorn26/stand: Makefile.buildboot
src/sys/arch/acorn32/stand: Makefile.buildboot
src/sys/arch/evbarm/stand/boot2440: Makefile
src/sys/arch/evbarm/stand/bootimx23: Makefile
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
src/sys/arch/zaurus/stand/zboot: Makefile
Log Message:
Add CPPFLAGS+= -mno-thumb -mno-thumb-interwork
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/acorn26/stand/Makefile.buildboot
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/acorn32/stand/Makefile.buildboot
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/stand/boot2440/Makefile
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/stand/bootimx23/Makefile
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/zaurus/stand/zboot/Makefile
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/acorn26/stand/Makefile.buildboot
diff -u src/sys/arch/acorn26/stand/Makefile.buildboot:1.15 src/sys/arch/acorn26/stand/Makefile.buildboot:1.16
--- src/sys/arch/acorn26/stand/Makefile.buildboot:1.15 Thu May 2 04:22:44 2013
+++ src/sys/arch/acorn26/stand/Makefile.buildboot Thu Aug 15 21:41:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.15 2013/05/02 04:22:44 matt Exp $
+# $NetBSD: Makefile.buildboot,v 1.16 2013/08/15 21:41:08 matt Exp $
S?= ${.CURDIR}/../../../..
@@ -34,8 +34,9 @@ CPPFLAGS+= -D_STANDALONE -DHIMEM=0x28000
CPPFLAGS+= -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
CPPFLAGS+= -I${.CURDIR}/../lib
CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft -march=armv2
+CPPFLAGS+= -mno-thumb -mno-thumb-interwork
CFLAGS= -O2
-CFLAGS+= -ffreestanding
+CFLAGS+= -ffreestanding -fno-unwind-tables
CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes
.if !make(obj) !make(clean) !make(cleandir)
Index: src/sys/arch/acorn32/stand/Makefile.buildboot
diff -u src/sys/arch/acorn32/stand/Makefile.buildboot:1.16 src/sys/arch/acorn32/stand/Makefile.buildboot:1.17
--- src/sys/arch/acorn32/stand/Makefile.buildboot:1.16 Thu May 2 04:22:44 2013
+++ src/sys/arch/acorn32/stand/Makefile.buildboot Thu Aug 15 21:41:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.16 2013/05/02 04:22:44 matt Exp $
+# $NetBSD: Makefile.buildboot,v 1.17 2013/08/15 21:41:08 matt Exp $
S?= ${.CURDIR}/../../../..
@@ -44,9 +44,10 @@ CPPFLAGS+= -D_STANDALONE
CPPFLAGS+= -I. -I${.CURDIR}/../../.. -I${.CURDIR}/../../../..
CPPFLAGS+= -I${.CURDIR}/../lib
CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft -march=armv3m
+CPPFLAGS+= -mno-thumb -mno-thumb-interwork
CPUFLAGS=
CFLAGS= -O2
-CFLAGS+= -ffreestanding
+CFLAGS+= -ffreestanding -fno-unwind-tables
CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes
CLEANFILES+= machine ${MACHINE_ARCH}
Index: src/sys/arch/evbarm/stand/boot2440/Makefile
diff -u src/sys/arch/evbarm/stand/boot2440/Makefile:1.9 src/sys/arch/evbarm/stand/boot2440/Makefile:1.10
--- src/sys/arch/evbarm/stand/boot2440/Makefile:1.9 Sun Jun 23 13:56:40 2013
+++ src/sys/arch/evbarm/stand/boot2440/Makefile Thu Aug 15 21:41:08 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2013/06/23 13:56:40 matt Exp $
+# $NetBSD: Makefile,v 1.10 2013/08/15 21:41:08 matt Exp $
S= ${.CURDIR}/../../../..
@@ -15,6 +15,7 @@ CPPFLAGS+= -DDM9000MAC=0x08,0x08,0x11,0
CPPFLAGS+= -DDEFAULT_BOOTFILE=ld0a:netbsd;net:
CPPFLAGS+= -nostdinc -I. -I${.OBJDIR} -I${S} -I${S}/arch
CPPFLAGS+= -march=armv4 -mabi=apcs-gnu -mfloat-abi=soft
+CPPFLAGS+= -mno-thumb -mno-thumb-interwork
CPUFLAGS=
DBG=
Index: src/sys/arch/evbarm/stand/bootimx23/Makefile
diff -u src/sys/arch/evbarm/stand/bootimx23/Makefile:1.6 src/sys/arch/evbarm/stand/bootimx23/Makefile:1.7
--- src/sys/arch/evbarm/stand/bootimx23/Makefile:1.6 Sun Jun 23 13:57:27 2013
+++ src/sys/arch/evbarm/stand/bootimx23/Makefile Thu Aug 15 21:41:09 2013
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.6 2013/06/23 13:57:27 matt Exp $
+# $Id: Makefile,v 1.7 2013/08/15 21:41:09 matt Exp $
S= ${.CURDIR}/../../../../
PROG= bootimx23
@@ -14,6 +14,7 @@ CPPFLAGS+= -D_STANDALONE -DMEMSIZE=64
CPPFLAGS+= -DKERNEL_BOOT_ARGS=\root=ld0a\
CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -I${.OBJDIR} -I${S} -I${S}/arch
CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft
+CPPFLAGS+= -mno-thumb -mno-thumb-interwork
#CPPFLAGS+= -DDEBUG
#DBG= -g
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.23 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.24
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.23 Sun Jun 23 13:56:01 2013
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Thu Aug 15 21:41:09 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.23 2013/06/23 13:56:01 matt Exp $
+# $NetBSD: Makefile.gzboot,v 1.24 2013/08/15 21:41:09 matt Exp $
NOMAN=
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Thu Aug 15 21:48:05 UTC 2013
Modified Files:
src/sys/rump/include/rump: rumpdefs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/rump/include/rump/rumpdefs.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/rump/include/rump/rumpdefs.h
diff -u src/sys/rump/include/rump/rumpdefs.h:1.24 src/sys/rump/include/rump/rumpdefs.h:1.25
--- src/sys/rump/include/rump/rumpdefs.h:1.24 Thu Aug 15 21:00:56 2013
+++ src/sys/rump/include/rump/rumpdefs.h Thu Aug 15 21:48:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdefs.h,v 1.24 2013/08/15 21:00:56 pooka Exp $ */
+/* $NetBSD: rumpdefs.h,v 1.25 2013/08/15 21:48:05 pooka Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -295,7 +295,7 @@ enum rump_vtype { RUMP_VNON, RUMP_VREG,
#define RUMP_MSG_IOVUSRSPACE 0x400
#define RUMP_MSG_LENUSRSPACE 0x800
-/* NetBSD: in.h,v 1.88 2013/04/27 21:35:24 joerg Exp */
+/* NetBSD: in.h,v 1.87 2012/06/22 14:54:35 christos Exp */
#define RUMP_IP_OPTIONS 1
#define RUMP_IP_HDRINCL 2
#define RUMP_IP_TOS 3
@@ -480,7 +480,7 @@ struct rump_modctl_load {
size_t ml_propslen;
};
-/* NetBSD: ufsmount.h,v 1.40 2013/06/16 13:33:30 hannken Exp */
+/* NetBSD: ufsmount.h,v 1.39 2012/10/19 17:09:08 drochner Exp */
struct rump_ufs_args {
char *fspec; /* block special device to mount */
};
@@ -490,4 +490,13 @@ struct rump_sysvbfs_args {
char *fspec; /* blocks special holding the fs to mount */
};
+/* NetBSD: dirent.h,v 1.28 2011/09/27 01:40:32 christos Exp */
+struct rump_dirent {
+ ino_t d_fileno; /* file number of entry */
+ uint16_t d_reclen; /* length of this record */
+ uint16_t d_namlen; /* length of string in d_name */
+ uint8_t d_type; /* file type, see below */
+ char d_name[511 + 1]; /* name must be no longer than this */
+};
+
#endif /* _RUMP_RUMPDEFS_H_ */
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Thu Aug 15 21:47:46 UTC 2013
Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh
Log Message:
Explicitly avoid MAXNAMELEN. I'm not claiming it's pretty, but most
likely it's more bang for the buck than adding cpp support to the
sed script.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/rump/include/rump/makerumpdefs.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/makerumpdefs.sh
diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.19 src/sys/rump/include/rump/makerumpdefs.sh:1.20
--- src/sys/rump/include/rump/makerumpdefs.sh:1.19 Thu Aug 15 20:45:12 2013
+++ src/sys/rump/include/rump/makerumpdefs.sh Thu Aug 15 21:47:46 2013
@@ -8,7 +8,7 @@ echo Generating rumpdefs.h
rm -f rumpdefs.h
exec rumpdefs.h
-printf '/* $NetBSD: makerumpdefs.sh,v 1.19 2013/08/15 20:45:12 pooka Exp $ */\n\n'
+printf '/* $NetBSD: makerumpdefs.sh,v 1.20 2013/08/15 21:47:46 pooka Exp $ */\n\n'
printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n'
printf '#ifndef _RUMP_RUMPDEFS_H_\n'
printf '#define _RUMP_RUMPDEFS_H_\n\n'
@@ -20,6 +20,7 @@ fromvers () {
}
# not perfect, but works well enough for the cases so far
+# (also has one struct-specific hack for MAXNAMLEN)
getstruct () {
sed -n '/struct[ ]*'$2'[ ]*{/{
a\
@@ -28,7 +29,7 @@ struct rump_'$2' {
n
s/^}.*;$/};/p
t
- /#define/!p
+ /^#/!{/MAXNAMLEN/!p}
b loop
}' $1
}
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Thu Aug 15 22:10:05 UTC 2013
Modified Files:
src/sys/rump/include/rump: makerumpdefs.sh
Log Message:
translate ino_t to a portability-friendlier type
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/rump/include/rump/makerumpdefs.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/include/rump/makerumpdefs.sh
diff -u src/sys/rump/include/rump/makerumpdefs.sh:1.20 src/sys/rump/include/rump/makerumpdefs.sh:1.21
--- src/sys/rump/include/rump/makerumpdefs.sh:1.20 Thu Aug 15 21:47:46 2013
+++ src/sys/rump/include/rump/makerumpdefs.sh Thu Aug 15 22:10:04 2013
@@ -8,7 +8,7 @@ echo Generating rumpdefs.h
rm -f rumpdefs.h
exec rumpdefs.h
-printf '/* $NetBSD: makerumpdefs.sh,v 1.20 2013/08/15 21:47:46 pooka Exp $ */\n\n'
+printf '/* $NetBSD: makerumpdefs.sh,v 1.21 2013/08/15 22:10:04 pooka Exp $ */\n\n'
printf '/*\n *\tAUTOMATICALLY GENERATED. DO NOT EDIT.\n */\n\n'
printf '#ifndef _RUMP_RUMPDEFS_H_\n'
printf '#define _RUMP_RUMPDEFS_H_\n\n'
@@ -29,7 +29,7 @@ struct rump_'$2' {
n
s/^}.*;$/};/p
t
- /^#/!{/MAXNAMLEN/!p}
+ /^#/!{/MAXNAMLEN/!{s/ino_t/uint64_t/;p;}}
b loop
}' $1
}
CVS commit: src/sys/rump/include/rump
Module Name:src
Committed By: pooka
Date: Thu Aug 15 22:10:22 UTC 2013
Modified Files:
src/sys/rump/include/rump: rumpdefs.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/rump/include/rump/rumpdefs.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/rump/include/rump/rumpdefs.h
diff -u src/sys/rump/include/rump/rumpdefs.h:1.25 src/sys/rump/include/rump/rumpdefs.h:1.26
--- src/sys/rump/include/rump/rumpdefs.h:1.25 Thu Aug 15 21:48:05 2013
+++ src/sys/rump/include/rump/rumpdefs.h Thu Aug 15 22:10:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rumpdefs.h,v 1.25 2013/08/15 21:48:05 pooka Exp $ */
+/* $NetBSD: rumpdefs.h,v 1.26 2013/08/15 22:10:22 pooka Exp $ */
/*
* AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -492,7 +492,7 @@ struct rump_sysvbfs_args {
/* NetBSD: dirent.h,v 1.28 2011/09/27 01:40:32 christos Exp */
struct rump_dirent {
- ino_t d_fileno; /* file number of entry */
+ uint64_t d_fileno; /* file number of entry */
uint16_t d_reclen; /* length of this record */
uint16_t d_namlen; /* length of string in d_name */
uint8_t d_type; /* file type, see below */
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: matt
Date: Thu Aug 15 22:13:48 UTC 2013
Modified Files:
src/sys/arch/arm/arm32: arm32_machdep.c
Log Message:
Fix tpyo.
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/arm/arm32/arm32_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/arm/arm32/arm32_machdep.c
diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.94 src/sys/arch/arm/arm32/arm32_machdep.c:1.95
--- src/sys/arch/arm/arm32/arm32_machdep.c:1.94 Wed Jun 12 21:34:12 2013
+++ src/sys/arch/arm/arm32/arm32_machdep.c Thu Aug 15 22:13:48 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: arm32_machdep.c,v 1.94 2013/06/12 21:34:12 matt Exp $ */
+/* $NetBSD: arm32_machdep.c,v 1.95 2013/08/15 22:13:48 matt Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: arm32_machdep.c,v 1.94 2013/06/12 21:34:12 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: arm32_machdep.c,v 1.95 2013/08/15 22:13:48 matt Exp $);
#include opt_modular.h
#include opt_md.h
@@ -138,7 +138,7 @@ arm32_vector_init(vaddr_t va, int which)
*/
#ifndef ARM_HAS_VBAR
if (va == ARM_VECTORS_LOW
- (armreg_pfr1_read() ARM_PFR1_SEC_MASK) != 0) {
+ (armreg_pfr1_read() ARM_PFR1_SEC_MASK) != 0) {
#endif
extern const uint32_t page0rel[];
vector_page = (vaddr_t)page0rel;
CVS commit: src/sys/arch/arm/include
Module Name:src Committed By: matt Date: Thu Aug 15 22:25:10 UTC 2013 Modified Files: src/sys/arch/arm/include: cdefs.h Log Message: Add _ARM_ARCH_T2 to indicate Thumb2 support Don't define _ARM_ARCH_DWORD_OK disappear if compiling for Thumb1 To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/include/cdefs.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/cdefs.h diff -u src/sys/arch/arm/include/cdefs.h:1.7 src/sys/arch/arm/include/cdefs.h:1.8 --- src/sys/arch/arm/include/cdefs.h:1.7 Sun Aug 5 04:13:19 2012 +++ src/sys/arch/arm/include/cdefs.h Thu Aug 15 22:25:10 2013 @@ -1,7 +1,7 @@ -/* $NetBSD: cdefs.h,v 1.7 2012/08/05 04:13:19 matt Exp $ */ +/* $NetBSD: cdefs.h,v 1.8 2013/08/15 22:25:10 matt Exp $ */ -#ifndef _MACHINE_CDEFS_H_ -#define _MACHINE_CDEFS_H_ +#ifndef _ARM_CDEFS_H_ +#define _ARM_CDEFS_H_ #if defined (__ARM_ARCH_7__) || defined (__ARM_ARCH_7A__) || \ defined (__ARM_ARCH_7R__) || defined (__ARM_ARCH_7M__) || \ @@ -9,10 +9,14 @@ #define _ARM_ARCH_7 #endif -#if defined (_ARM_ARCH_7) || defined (__ARM_ARCH_6__) || \ +#if defined (_ARM_ARCH_7) || defined (__ARM_ARCH_6T2__) +#define _ARM_ARCH_T2 /* Thumb2 */ +#endif + +#if defined (_ARM_ARCH_T2) || defined (__ARM_ARCH_6__) || \ defined (__ARM_ARCH_6J__) || defined (__ARM_ARCH_6K__) || \ defined (__ARM_ARCH_6Z__) || defined (__ARM_ARCH_6ZK__) || \ -defined (__ARM_ARCH_6T2__) || defined (__ARM_ARCH_6ZM__) +defined (__ARM_ARCH_6ZM__) #define _ARM_ARCH_6 #endif @@ -26,8 +30,10 @@ #define _ARM_ARCH_4T #endif -#if defined(_ARM_ARCH_6) || defined (__ARM_ARCH_5TE__) || \ -defined (__ARM_ARCH_5TEJ__) +#if defined (_ARM_ARCH_T2) || \ +(!defined (__thumb__) \ + (defined (_ARM_ARCH_6) || defined (__ARM_ARCH_5TE__) || \ + defined (__ARM_ARCH_5TEJ__))) #define _ARM_ARCH_DWORD_OK #endif @@ -37,4 +43,4 @@ #define __ALIGNBYTES (sizeof(int) - 1) #endif -#endif /* !_MACHINE_CDEFS_H_ */ +#endif /* !_ARM_CDEFS_H_ */
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: matt
Date: Thu Aug 15 22:34:59 UTC 2013
Modified Files:
src/sys/arch/arm/include: mcontext.h
Log Message:
If compiling for Thumb1, make __lwp_getprivate_fast call __aeabi_read_tp.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/include/mcontext.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/mcontext.h
diff -u src/sys/arch/arm/include/mcontext.h:1.15 src/sys/arch/arm/include/mcontext.h:1.16
--- src/sys/arch/arm/include/mcontext.h:1.15 Sat Dec 8 06:58:36 2012
+++ src/sys/arch/arm/include/mcontext.h Thu Aug 15 22:34:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mcontext.h,v 1.15 2012/12/08 06:58:36 matt Exp $ */
+/* $NetBSD: mcontext.h,v 1.16 2013/08/15 22:34:59 matt Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -123,6 +123,7 @@ typedef struct {
static __inline void *
__lwp_getprivate_fast(void)
{
+#if !defined(__thumb__) || defined(_ARM_ARCH_T2)
extern void *_lwp_getprivate(void);
void *rv;
__asm(mrc p15, 0, %0, c13, c0, 3 : =r(rv));
@@ -135,6 +136,10 @@ __lwp_getprivate_fast(void)
* syscall.
*/
return _lwp_getprivate();
+#else
+ extern void *__aeabi_read_tp(void);
+ return __aeabi_read_tp();
+#endif /* !__thumb__ || _ARM_ARCH_T2 */
}
#if defined(_KERNEL)
CVS commit: src/lib/libpthread/arch/arm
Module Name:src Committed By: matt Date: Thu Aug 15 22:37:29 UTC 2013 Modified Files: src/lib/libpthread/arch/arm: pthread_md.h Log Message: Use the thumb1 versions of sev/wfe for thumb armv6+. if using armv5t don't do anything for thumb. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/lib/libpthread/arch/arm/pthread_md.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/libpthread/arch/arm/pthread_md.h diff -u src/lib/libpthread/arch/arm/pthread_md.h:1.8 src/lib/libpthread/arch/arm/pthread_md.h:1.9 --- src/lib/libpthread/arch/arm/pthread_md.h:1.8 Wed Sep 19 07:57:14 2012 +++ src/lib/libpthread/arch/arm/pthread_md.h Thu Aug 15 22:37:29 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pthread_md.h,v 1.8 2012/09/19 07:57:14 matt Exp $ */ +/* $NetBSD: pthread_md.h,v 1.9 2013/08/15 22:37:29 matt Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -49,8 +49,16 @@ pthread__sp(void) return (ret); } +#if defined(__thumb__) defined(_ARM_ARCH_6) +#define pthread__smt_pause() __asm __volatile(.inst.n 0xbf20) /* wfe */ +#define pthread__smt_wake() __asm __volatile(.inst.n 0xbf40) /* sev */ +#elif !defined(__thumb__) #define pthread__smt_pause() __asm __volatile(.inst 0xe320f002) /* wfe */ #define pthread__smt_wake() __asm __volatile(.inst 0xe320f004) /* sev */ +#else +#define pthread__smt_pause() +#define pthread__smt_wake() +#endif #define pthread__uc_sp(ucp) ((ucp)-uc_mcontext.__gregs[_REG_SP])
CVS commit: src/lib/libpthread
Module Name:src
Committed By: matt
Date: Thu Aug 15 22:38:24 UTC 2013
Modified Files:
src/lib/libpthread: Makefile
Log Message:
Add support for an optional ARCHSUBDIR/Makefile.inc
To generate a diff of this commit:
cvs rdiff -u -r1.81 -r1.82 src/lib/libpthread/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/libpthread/Makefile
diff -u src/lib/libpthread/Makefile:1.81 src/lib/libpthread/Makefile:1.82
--- src/lib/libpthread/Makefile:1.81 Mon Aug 12 17:15:46 2013
+++ src/lib/libpthread/Makefile Thu Aug 15 22:38:24 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2013/08/12 17:15:46 joerg Exp $
+# $NetBSD: Makefile,v 1.82 2013/08/15 22:38:24 matt Exp $
#
WARNS?= 5
@@ -58,6 +58,9 @@ SRCS+= sem.c
.if exists(${ARCHDIR}/pthread_md.S)
SRCS+= pthread_md.S
.endif
+.if exists(${ARCHDIR}/Makefile.inc)
+.include ${ARCHDIR}/Makefile.inc
+.endif
# The PTHREAD__COMPAT flag builds a libpthread that can be dropped
# into a NetBSD 2/3/4 chroot with a NetBSD 5 or later kernel.
CVS commit: src/sys/arch/arm/include
Module Name:src
Committed By: matt
Date: Thu Aug 15 22:41:15 UTC 2013
Modified Files:
src/sys/arch/arm/include: profile.h
Log Message:
Add an EABI ARM version of MCOUNT that doesn't do ARM26 compat.
Add an EABI Thumb version of MCOUNT (doesn't do ARM26 compat either).
Add .size to all MCOUNT
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/include/profile.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/profile.h
diff -u src/sys/arch/arm/include/profile.h:1.8 src/sys/arch/arm/include/profile.h:1.9
--- src/sys/arch/arm/include/profile.h:1.8 Fri Aug 29 19:08:29 2008
+++ src/sys/arch/arm/include/profile.h Thu Aug 15 22:41:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: profile.h,v 1.8 2008/08/29 19:08:29 matt Exp $ */
+/* $NetBSD: profile.h,v 1.9 2013/08/15 22:41:15 matt Exp $ */
/*
* Copyright (c) 2001 Ben Harris
@@ -47,16 +47,17 @@
#define PLTSYM
#endif
+#if !defined(__thumb__) !defined(__ARM_EABI__)
#define MCOUNT\
- __asm(.text); \
+ __asm(.text); \
__asm(.align 0); \
__asm(.type MCOUNT_ASM_NAME ,%function); \
- __asm(.global MCOUNT_ASM_NAME); \
+ __asm(.global MCOUNT_ASM_NAME);\
__asm(MCOUNT_ASM_NAME :); \
/*\
* Preserve registers that are trashed during mcount \
*/\
- __asm(stmfd sp!, {r0-r3, ip, lr});\
+ __asm(push {r0-r3, ip, lr});\
/* Check what mode we're in. EQ = 32, NE = 26 */ \
__asm(teq r0, r0); \
__asm(teq pc, r15); \
@@ -80,7 +81,74 @@
/*\
* Restore registers that were trashed during mcount \
*/\
- __asm(ldmfd sp!, {r0-r3, lr, pc});
+ __asm(pop {r0-r3, lr, pc});\
+ __asm(.size MCOUNT_ASM_NAME , .- MCOUNT_ASM_NAME);
+#elif !defined(__thumb__) || defined(_ARM_ARCH_T2)
+#define MCOUNT\
+ __asm(.text); \
+ __asm(.align 0); \
+ __asm(.type MCOUNT_ASM_NAME ,%function); \
+ __asm(.global MCOUNT_ASM_NAME);\
+ __asm(MCOUNT_ASM_NAME :); \
+ /*\
+ * Preserve registers that are trashed during mcount \
+ */\
+ __asm(push {r0-r3, ip, lr});\
+ /*\
+ * find the return address for mcount,\
+ * and the return address for mcount's caller. \
+ *\
+ * frompcindex = pc pushed by call into self. \
+ */\
+ __asm(mov r0, ip); \
+ /*\
+ * selfpc = pc pushed by mcount call\
+ */\
+ __asm(mov r1, lr); \
+ /*\
+ * Call the real mcount code \
+ */\
+ __asm(bl ___STRING(_C_LABEL(_mcount)) PLTSYM); \
+ /*\
+ * Restore registers that were trashed during mcount \
+ */\
+ __asm(pop {r0-r3, lr, pc});\
+ __asm(.size MCOUNT_ASM_NAME , .- MCOUNT_ASM_NAME);
+#else
+#define MCOUNT\
+ __asm(.text); \
+ __asm(.align 0); \
+ __asm(.thumb_func); \
+ __asm(.type MCOUNT_ASM_NAME ,%function); \
+ __asm(.global MCOUNT_ASM_NAME);\
+ __asm(MCOUNT_ASM_NAME :); \
+ /*\
+ * Preserve registers that are trashed during mcount \
+ */\
+ __asm(push {r0-r4,lr}); \
+ __asm(mov r4, ip); \
+ /*\
+ * find the return address for mcount,\
+ * and the return address for mcount's caller. \
+ *\
+ * frompcindex = pc pushed by call into self. \
+ */\
+ __asm(mov r0, ip); \
+ /*\
+ * selfpc = pc pushed by mcount call\
+ */\
+ __asm(mov r1, lr); \
+ /*\
+ * Call the real mcount code \
+ */\
+ __asm(bl ___STRING(_C_LABEL(_mcount)) PLTSYM); \
+ /*\
+ * Restore registers that were trashed during mcount \
+ */\
+ __asm(mov lr, r4); \
+ __asm(pop {r0-r4, pc}); \
+ __asm(.size MCOUNT_ASM_NAME , .- MCOUNT_ASM_NAME);
+#endif
#ifdef _KERNEL
#ifdef __PROG26
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: matt
Date: Thu Aug 15 22:42:50 UTC 2013
Added Files:
src/common/lib/libc/arch/arm/atomic: atomic_simplelock.c
Log Message:
When compiling for Thumb1, the swp instruction is not availble. So this
stub is added to provide __cpu_simple_lock and __cpu_simple_lock_try via
thumb interwork support. It is compiled with -mno-thumb.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
src/common/lib/libc/arch/arm/atomic/atomic_simplelock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/common/lib/libc/arch/arm/atomic/atomic_simplelock.c
diff -u /dev/null src/common/lib/libc/arch/arm/atomic/atomic_simplelock.c:1.1
--- /dev/null Thu Aug 15 22:42:50 2013
+++ src/common/lib/libc/arch/arm/atomic/atomic_simplelock.c Thu Aug 15 22:42:50 2013
@@ -0,0 +1,66 @@
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__RCSID($NetBSD: atomic_simplelock.c,v 1.1 2013/08/15 22:42:50 matt Exp $);
+
+#include sys/types.h
+/*
+ * We need to use the inlines so redefine out of the way.
+ */
+#define __cpu_simple_lock __arm_simple_lock
+#define __cpu_simple_lock_try __arm_simple_lock_try
+#include arm/lock.h
+/*
+ * Now get rid of them.
+ */
+#undef __cpu_simple_lock
+#undef __cpu_simple_lock_try
+
+#if !defined(_ARM_ARCH_T2)
+/*
+ * Since we overrode lock.h we have to provide these ourselves.
+ */
+__dso_hidden void __cpu_simple_lock(__cpu_simple_lock_t *);
+__dso_hidden int __cpu_simple_lock_try(__cpu_simple_lock_t *);
+
+void
+__cpu_simple_lock(__cpu_simple_lock_t *alp)
+{
+
+ __arm_simple_lock(alp);
+}
+
+int
+__cpu_simple_lock_try(__cpu_simple_lock_t *alp)
+{
+
+ return __arm_simple_lock_try(alp);
+}
+#endif
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jmcneill
Date: Fri Aug 16 00:03:01 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: beagleboard.conf
Log Message:
support beaglebone and beagleboard with the same image
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/distrib/utils/embedded/conf/beagleboard.conf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/embedded/conf/beagleboard.conf
diff -u src/distrib/utils/embedded/conf/beagleboard.conf:1.11 src/distrib/utils/embedded/conf/beagleboard.conf:1.12
--- src/distrib/utils/embedded/conf/beagleboard.conf:1.11 Wed Feb 20 18:33:37 2013
+++ src/distrib/utils/embedded/conf/beagleboard.conf Fri Aug 16 00:03:01 2013
@@ -1,13 +1,17 @@
-# $NetBSD: beagleboard.conf,v 1.11 2013/02/20 18:33:37 riz Exp $
+# $NetBSD: beagleboard.conf,v 1.12 2013/08/16 00:03:01 jmcneill Exp $
# BeagleBoard customization script used by mkimage
#
board=beagleboard
-kernel=$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub
+
+bboard_kernel=$src/sys/arch/evbarm/compile/obj/BEAGLEBOARD/netbsd.ub
+bbone_kernel=$src/sys/arch/evbarm/compile/obj/BEAGLEBONE/netbsd.ub
. ${DIR}/conf/evbarm.conf
-kernelimg=netbsd.ub
-loadaddr=8100
+bboard_kernelimg=bboard.ub
+bboard_loadaddr=8100
+bbone_kernelimg=bbone.ub
+bbone_loadaddr=8200
make_filesystems() {
make_filesystems_evbarm
@@ -30,20 +34,34 @@ EOF
populate() {
cat ${mnt}/boot/uEnv.txt EOF
-loaduimage=fatload mmc 0 ${loadaddr} ${kernelimg}; bootm ${loadaddr} root=ld0a
+loaduimage=if test $board = am335x; then fatload mmc 0 ${bbone_loadaddr} ${bbone_kernelimg}; bootm ${bbone_loadaddr} root=ld0a; else fatload mmc 0 ${bboard_loadaddr} ${bboard_kernelimg}; bootm ${bboard_loadaddr} root=ld0a; fi
EOF
- if [ ! -f ${kernel} ]; then
- echo ${PROG}: Missing ${kernel} 12
+ if [ ! -f ${bboard_kernel} ]; then
+ echo ${PROG}: Missing ${bboard_kernel} 12
+ exit 1
+ fi
+ if [ ! -f ${bbone_kernel} ]; then
+ echo ${PROG}: Missing ${bbone_kernel} 12
exit 1
fi
echo ${bar} installing BEAGLEBOARD kernel to /boot ${bar}
- case ${kernel} in
+ case ${bboard_kernel} in
+ *.gz)
+ gzip -dc ${bboard_kernel} ${mnt}/boot/${bboard_kernelimg}
+ ;;
+ *)
+ cp ${bboard_kernel} ${mnt}/boot/${bboard_kernelimg}
+ ;;
+ esac
+
+ echo ${bar} installing BEAGLEBONE kernel to /boot ${bar}
+ case ${bbone_kernel} in
*.gz)
- gzip -dc ${kernel} ${mnt}/boot/${kernelimg}
+ gzip -dc ${bbone_kernel} ${mnt}/boot/${bbone_kernelimg}
;;
*)
- cp ${kernel} ${mnt}/boot/${kernelimg}
+ cp ${bbone_kernel} ${mnt}/boot/${bbone_kernelimg}
;;
esac
}
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src Committed By: matt Date: Fri Aug 16 01:47:41 UTC 2013 Modified Files: src/common/lib/libc/arch/arm/atomic: atomic_simplelock.c Log Message: Add a hidden version for libpthread. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/common/lib/libc/arch/arm/atomic/atomic_simplelock.c 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/atomic/atomic_simplelock.c diff -u src/common/lib/libc/arch/arm/atomic/atomic_simplelock.c:1.1 src/common/lib/libc/arch/arm/atomic/atomic_simplelock.c:1.2 --- src/common/lib/libc/arch/arm/atomic/atomic_simplelock.c:1.1 Thu Aug 15 22:42:50 2013 +++ src/common/lib/libc/arch/arm/atomic/atomic_simplelock.c Fri Aug 16 01:47:41 2013 @@ -28,9 +28,11 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: atomic_simplelock.c,v 1.1 2013/08/15 22:42:50 matt Exp $); +__RCSID($NetBSD: atomic_simplelock.c,v 1.2 2013/08/16 01:47:41 matt Exp $); #include sys/types.h + +#if !defined(_ARM_ARCH_T2) /* * We need to use the inlines so redefine out of the way. */ @@ -43,12 +45,16 @@ __RCSID($NetBSD: atomic_simplelock.c,v #undef __cpu_simple_lock #undef __cpu_simple_lock_try -#if !defined(_ARM_ARCH_T2) /* * Since we overrode lock.h we have to provide these ourselves. */ +#ifdef __LIBPTHREAD_SOURCE__ __dso_hidden void __cpu_simple_lock(__cpu_simple_lock_t *); __dso_hidden int __cpu_simple_lock_try(__cpu_simple_lock_t *); +#else +void __cpu_simple_lock(__cpu_simple_lock_t *); +int __cpu_simple_lock_try(__cpu_simple_lock_t *); +#endif void __cpu_simple_lock(__cpu_simple_lock_t *alp)
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Fri Aug 16 02:21:53 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: BEAGLEBONE Log Message: Hardwire ld0 - sdmmc0 and ld1 - sdmmc1. Support local configuration in BEAGLEBONE.local To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/conf/BEAGLEBONE 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/conf/BEAGLEBONE diff -u src/sys/arch/evbarm/conf/BEAGLEBONE:1.19 src/sys/arch/evbarm/conf/BEAGLEBONE:1.20 --- src/sys/arch/evbarm/conf/BEAGLEBONE:1.19 Sun Jun 30 21:38:56 2013 +++ src/sys/arch/evbarm/conf/BEAGLEBONE Fri Aug 16 02:21:53 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: BEAGLEBONE,v 1.19 2013/06/30 21:38:56 rmind Exp $ +# $NetBSD: BEAGLEBONE,v 1.20 2013/08/16 02:21:53 jmcneill Exp $ # # BEAGLEBONE -- TI AM335x board Kernel # @@ -194,8 +194,14 @@ sitaracm0 at obio0 addr 0x44e1 size # from other omap3. (What about omap4?) Need to adapt the omap sdhc # driver to handle this. sdhc0 at obio0 addr 0x48060100 size 0x0f00 intr 64 +sdmmc0 at sdhc0 +ld0 at sdmmc0 sdhc1 at obio0 addr 0x481d8100 size 0x0f00 intr 28 # BB Black +sdmmc1 at sdhc1 +ld1 at sdmmc1 #sdhc2 at obio0 addr 0x47810100 size 0xff00 intr 29 +#sdmmc2 at sdhc2 +#ld2 at sdmmc2 sdmmc* at sdhc? # SD/MMC bus ld* at sdmmc? #options SDMMC_DEBUG @@ -301,3 +307,6 @@ pseudo-device pty # pseudo-terminals #pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms pseudo-device lockstat # lock profiling + +# local configuration +cinclude arch/evbarm/conf/BEAGLEBONE.local
