Module Name: src
Committed By: jmcneill
Date: Sun Nov 10 19:52:01 UTC 2013
Modified Files:
src/sys/arch/usermode/include: ansi.h asm.h bswap.h byte_swap.h cdefs.h
disklabel.h elf_machdep.h endian.h endian_machdep.h genheaders.sh
int_const.h int_fmtio.h int_limits.h int_mwgwtypes.h int_types.h
limits.h netbsd32_machdep.h param.h psl.h ptrace.h vmparam.h
wchar_limits.h
Log Message:
support building on arm
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/usermode/include/ansi.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/usermode/include/asm.h \
src/sys/arch/usermode/include/bswap.h \
src/sys/arch/usermode/include/byte_swap.h \
src/sys/arch/usermode/include/elf_machdep.h \
src/sys/arch/usermode/include/endian.h \
src/sys/arch/usermode/include/endian_machdep.h \
src/sys/arch/usermode/include/int_const.h \
src/sys/arch/usermode/include/int_fmtio.h \
src/sys/arch/usermode/include/int_limits.h \
src/sys/arch/usermode/include/int_mwgwtypes.h \
src/sys/arch/usermode/include/int_types.h \
src/sys/arch/usermode/include/limits.h \
src/sys/arch/usermode/include/netbsd32_machdep.h \
src/sys/arch/usermode/include/wchar_limits.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/usermode/include/cdefs.h
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/usermode/include/disklabel.h \
src/sys/arch/usermode/include/ptrace.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/usermode/include/genheaders.sh
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/usermode/include/param.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/usermode/include/psl.h
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/usermode/include/vmparam.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/usermode/include/ansi.h
diff -u src/sys/arch/usermode/include/ansi.h:1.3 src/sys/arch/usermode/include/ansi.h:1.4
--- src/sys/arch/usermode/include/ansi.h:1.3 Mon Aug 22 21:45:38 2011
+++ src/sys/arch/usermode/include/ansi.h Sun Nov 10 19:52:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ansi.h,v 1.3 2011/08/22 21:45:38 jmcneill Exp $ */
+/* $NetBSD: ansi.h,v 1.4 2013/11/10 19:52:01 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -50,6 +50,11 @@
#define _BSD_PTRDIFF_T_ long
#define _BSD_SIZE_T_ unsigned long
#define _BSD_SSIZE_T_ long
+#elif defined(__arm__)
+#define _BSD_CLOCK_T_ unsigned int
+#define _BSD_PTRDIFF_T_ long int
+#define _BSD_SIZE_T_ unsigned long int
+#define _BSD_SSIZE_T_ long int
#else
#error "platform not supported"
#endif
Index: src/sys/arch/usermode/include/asm.h
diff -u src/sys/arch/usermode/include/asm.h:1.10 src/sys/arch/usermode/include/asm.h:1.11
--- src/sys/arch/usermode/include/asm.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/asm.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: asm.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: asm.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:33 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:57 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_ASM_H
@@ -11,6 +11,8 @@
#include "../../i386/include/asm.h"
#elif defined(__x86_64__)
#include "../../amd64/include/asm.h"
+#elif defined(__arm__)
+#include "../../arm/include/asm.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/bswap.h
diff -u src/sys/arch/usermode/include/bswap.h:1.10 src/sys/arch/usermode/include/bswap.h:1.11
--- src/sys/arch/usermode/include/bswap.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/bswap.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: bswap.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: bswap.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:57 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_BSWAP_H
@@ -11,6 +11,8 @@
#include "../../i386/include/bswap.h"
#elif defined(__x86_64__)
#include "../../amd64/include/bswap.h"
+#elif defined(__arm__)
+#include "../../arm/include/bswap.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/byte_swap.h
diff -u src/sys/arch/usermode/include/byte_swap.h:1.10 src/sys/arch/usermode/include/byte_swap.h:1.11
--- src/sys/arch/usermode/include/byte_swap.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/byte_swap.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: byte_swap.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: byte_swap.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:57 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_BYTE_SWAP_H
@@ -11,6 +11,8 @@
#include "../../i386/include/byte_swap.h"
#elif defined(__x86_64__)
#include "../../amd64/include/byte_swap.h"
+#elif defined(__arm__)
+#include "../../arm/include/byte_swap.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/elf_machdep.h
diff -u src/sys/arch/usermode/include/elf_machdep.h:1.10 src/sys/arch/usermode/include/elf_machdep.h:1.11
--- src/sys/arch/usermode/include/elf_machdep.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/elf_machdep.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: elf_machdep.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: elf_machdep.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:57 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_ELF_MACHDEP_H
@@ -11,8 +11,13 @@
#include "../../i386/include/elf_machdep.h"
#elif defined(__x86_64__)
#include "../../amd64/include/elf_machdep.h"
+#elif defined(__arm__)
+#include "../../arm/include/elf_machdep.h"
#else
#error port me
#endif
+#ifdef ELF_MD_PROBE_FUNC
+#undef ELF_MD_PROBE_FUNC
+#endif
#endif
Index: src/sys/arch/usermode/include/endian.h
diff -u src/sys/arch/usermode/include/endian.h:1.10 src/sys/arch/usermode/include/endian.h:1.11
--- src/sys/arch/usermode/include/endian.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/endian.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: endian.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: endian.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:57 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_ENDIAN_H
@@ -11,6 +11,8 @@
#include "../../i386/include/endian.h"
#elif defined(__x86_64__)
#include "../../amd64/include/endian.h"
+#elif defined(__arm__)
+#include "../../arm/include/endian.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/endian_machdep.h
diff -u src/sys/arch/usermode/include/endian_machdep.h:1.10 src/sys/arch/usermode/include/endian_machdep.h:1.11
--- src/sys/arch/usermode/include/endian_machdep.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/endian_machdep.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: endian_machdep.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: endian_machdep.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:57 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_ENDIAN_MACHDEP_H
@@ -11,6 +11,8 @@
#include "../../i386/include/endian_machdep.h"
#elif defined(__x86_64__)
#include "../../amd64/include/endian_machdep.h"
+#elif defined(__arm__)
+#include "../../arm/include/endian_machdep.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/int_const.h
diff -u src/sys/arch/usermode/include/int_const.h:1.10 src/sys/arch/usermode/include/int_const.h:1.11
--- src/sys/arch/usermode/include/int_const.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/int_const.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: int_const.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: int_const.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:57 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_INT_CONST_H
@@ -11,6 +11,8 @@
#include "../../i386/include/int_const.h"
#elif defined(__x86_64__)
#include "../../amd64/include/int_const.h"
+#elif defined(__arm__)
+#include "../../arm/include/int_const.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/int_fmtio.h
diff -u src/sys/arch/usermode/include/int_fmtio.h:1.10 src/sys/arch/usermode/include/int_fmtio.h:1.11
--- src/sys/arch/usermode/include/int_fmtio.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/int_fmtio.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: int_fmtio.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: int_fmtio.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:58 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_INT_FMTIO_H
@@ -11,6 +11,8 @@
#include "../../i386/include/int_fmtio.h"
#elif defined(__x86_64__)
#include "../../amd64/include/int_fmtio.h"
+#elif defined(__arm__)
+#include "../../arm/include/int_fmtio.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/int_limits.h
diff -u src/sys/arch/usermode/include/int_limits.h:1.10 src/sys/arch/usermode/include/int_limits.h:1.11
--- src/sys/arch/usermode/include/int_limits.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/int_limits.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: int_limits.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: int_limits.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:58 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_INT_LIMITS_H
@@ -11,6 +11,8 @@
#include "../../i386/include/int_limits.h"
#elif defined(__x86_64__)
#include "../../amd64/include/int_limits.h"
+#elif defined(__arm__)
+#include "../../arm/include/int_limits.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/int_mwgwtypes.h
diff -u src/sys/arch/usermode/include/int_mwgwtypes.h:1.10 src/sys/arch/usermode/include/int_mwgwtypes.h:1.11
--- src/sys/arch/usermode/include/int_mwgwtypes.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/int_mwgwtypes.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: int_mwgwtypes.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: int_mwgwtypes.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:58 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_INT_MWGWTYPES_H
@@ -11,6 +11,8 @@
#include "../../i386/include/int_mwgwtypes.h"
#elif defined(__x86_64__)
#include "../../amd64/include/int_mwgwtypes.h"
+#elif defined(__arm__)
+#include "../../arm/include/int_mwgwtypes.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/int_types.h
diff -u src/sys/arch/usermode/include/int_types.h:1.10 src/sys/arch/usermode/include/int_types.h:1.11
--- src/sys/arch/usermode/include/int_types.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/int_types.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: int_types.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: int_types.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:58 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_INT_TYPES_H
@@ -11,6 +11,8 @@
#include "../../i386/include/int_types.h"
#elif defined(__x86_64__)
#include "../../amd64/include/int_types.h"
+#elif defined(__arm__)
+#include "../../arm/include/int_types.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/limits.h
diff -u src/sys/arch/usermode/include/limits.h:1.10 src/sys/arch/usermode/include/limits.h:1.11
--- src/sys/arch/usermode/include/limits.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/limits.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: limits.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: limits.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:58 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_LIMITS_H
@@ -11,6 +11,8 @@
#include "../../i386/include/limits.h"
#elif defined(__x86_64__)
#include "../../amd64/include/limits.h"
+#elif defined(__arm__)
+#include "../../arm/include/limits.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/netbsd32_machdep.h
diff -u src/sys/arch/usermode/include/netbsd32_machdep.h:1.10 src/sys/arch/usermode/include/netbsd32_machdep.h:1.11
--- src/sys/arch/usermode/include/netbsd32_machdep.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/netbsd32_machdep.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: netbsd32_machdep.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: netbsd32_machdep.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:58 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_NETBSD32_MACHDEP_H
@@ -11,6 +11,8 @@
#include "../../i386/include/netbsd32_machdep.h"
#elif defined(__x86_64__)
#include "../../amd64/include/netbsd32_machdep.h"
+#elif defined(__arm__)
+#include "../../arm/include/netbsd32_machdep.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/wchar_limits.h
diff -u src/sys/arch/usermode/include/wchar_limits.h:1.10 src/sys/arch/usermode/include/wchar_limits.h:1.11
--- src/sys/arch/usermode/include/wchar_limits.h:1.10 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/wchar_limits.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: wchar_limits.h,v 1.10 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: wchar_limits.h,v 1.11 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:58 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_WCHAR_LIMITS_H
@@ -11,6 +11,8 @@
#include "../../i386/include/wchar_limits.h"
#elif defined(__x86_64__)
#include "../../amd64/include/wchar_limits.h"
+#elif defined(__arm__)
+#include "../../arm/include/wchar_limits.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/cdefs.h
diff -u src/sys/arch/usermode/include/cdefs.h:1.5 src/sys/arch/usermode/include/cdefs.h:1.6
--- src/sys/arch/usermode/include/cdefs.h:1.5 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/cdefs.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: cdefs.h,v 1.5 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: cdefs.h,v 1.6 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:58 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_CDEFS_H
@@ -11,6 +11,8 @@
#include "../../i386/include/cdefs.h"
#elif defined(__x86_64__)
#include "../../amd64/include/cdefs.h"
+#elif defined(__arm__)
+#include "../../arm/include/cdefs.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/disklabel.h
diff -u src/sys/arch/usermode/include/disklabel.h:1.12 src/sys/arch/usermode/include/disklabel.h:1.13
--- src/sys/arch/usermode/include/disklabel.h:1.12 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/disklabel.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: disklabel.h,v 1.12 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: disklabel.h,v 1.13 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:57 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_DISKLABEL_H
@@ -11,6 +11,8 @@
#include "../../i386/include/disklabel.h"
#elif defined(__x86_64__)
#include "../../amd64/include/disklabel.h"
+#elif defined(__arm__)
+#include "../../arm/include/disklabel.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/ptrace.h
diff -u src/sys/arch/usermode/include/ptrace.h:1.12 src/sys/arch/usermode/include/ptrace.h:1.13
--- src/sys/arch/usermode/include/ptrace.h:1.12 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/ptrace.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: ptrace.h,v 1.12 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: ptrace.h,v 1.13 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:58 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_PTRACE_H
@@ -11,6 +11,8 @@
#include "../../i386/include/ptrace.h"
#elif defined(__x86_64__)
#include "../../amd64/include/ptrace.h"
+#elif defined(__arm__)
+#include "../../arm/include/ptrace.h"
#else
#error port me
#endif
Index: src/sys/arch/usermode/include/genheaders.sh
diff -u src/sys/arch/usermode/include/genheaders.sh:1.8 src/sys/arch/usermode/include/genheaders.sh:1.9
--- src/sys/arch/usermode/include/genheaders.sh:1.8 Sun Feb 5 17:39:18 2012
+++ src/sys/arch/usermode/include/genheaders.sh Sun Nov 10 19:52:01 2013
@@ -39,6 +39,8 @@ for hdr in ${HDRS}; do
#include "../../i386/include/${hdr}"
#elif defined(__x86_64__)
#include "../../amd64/include/${hdr}"
+#elif defined(__arm__)
+#include "../../arm/include/${hdr}"
#else
#error port me
#endif
@@ -56,6 +58,15 @@ EOF
echo "#undef __HAVE_PTRACE_MACHDEP" >> ${hdr}
echo "#undef __HAVE_PROCFS_MACHDEP" >> ${hdr}
elif [ "$hdr" = "param.h" ]; then
+ cat >> ${hdr} << EOF
+#ifdef __arm__
+#define MACHINE "evbarm"
+#define PGSHIFT 12
+#define NBPG (1 << PGSHIFT)
+#define PGOFSET (NBPG - 1)
+#define NKMEMPAGES_MIN_DEFAULT ((8 * 1024 * 1024) >> PAGE_SHIFT)
+#endif
+EOF
echo "#undef UPAGES" >> ${hdr}
echo "#define UPAGES 12" >> ${hdr}
echo "#undef USPACE" >> ${hdr}
@@ -63,6 +74,11 @@ EOF
echo "" >> ${hdr}
echo "#undef NKMEMPAGES_MAX_UNLIMITED" >> ${hdr}
echo "#include \"opt_kmempages.h\"" >> ${hdr}
+ echo "" >> ${hdr}
+ elif [ "$hdr" = "elf_machdep.h" ]; then
+ echo "#ifdef ELF_MD_PROBE_FUNC" >> ${hdr}
+ echo "#undef ELF_MD_PROBE_FUNC" >> ${hdr}
+ echo "#endif" >> ${hdr}
fi
echo >>${hdr}
Index: src/sys/arch/usermode/include/param.h
diff -u src/sys/arch/usermode/include/param.h:1.11 src/sys/arch/usermode/include/param.h:1.12
--- src/sys/arch/usermode/include/param.h:1.11 Sun Feb 5 17:40:08 2012
+++ src/sys/arch/usermode/include/param.h Sun Nov 10 19:52:01 2013
@@ -1,7 +1,7 @@
-/* $NetBSD: param.h,v 1.11 2012/02/05 17:40:08 reinoud Exp $ */
+/* $NetBSD: param.h,v 1.12 2013/11/10 19:52:01 jmcneill Exp $ */
/*
- * Automatically generated by genheaders.sh on Sun Feb 5 18:39:34 CET 2012
+ * Automatically generated by genheaders.sh on Sun Nov 10 15:47:58 AST 2013
* Do not modify directly!
*/
#ifndef _USERMODE_PARAM_H
@@ -11,9 +11,18 @@
#include "../../i386/include/param.h"
#elif defined(__x86_64__)
#include "../../amd64/include/param.h"
+#elif defined(__arm__)
+#include "../../arm/include/param.h"
#else
#error port me
#endif
+#ifdef __arm__
+#define MACHINE "evbarm"
+#define PGSHIFT 12
+#define NBPG (1 << PGSHIFT)
+#define PGOFSET (NBPG - 1)
+#define NKMEMPAGES_MIN_DEFAULT ((8 * 1024 * 1024) >> PAGE_SHIFT)
+#endif
#undef UPAGES
#define UPAGES 12
#undef USPACE
@@ -22,4 +31,5 @@
#undef NKMEMPAGES_MAX_UNLIMITED
#include "opt_kmempages.h"
+
#endif
Index: src/sys/arch/usermode/include/psl.h
diff -u src/sys/arch/usermode/include/psl.h:1.1 src/sys/arch/usermode/include/psl.h:1.2
--- src/sys/arch/usermode/include/psl.h:1.1 Tue Sep 13 11:22:07 2011
+++ src/sys/arch/usermode/include/psl.h Sun Nov 10 19:52:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: psl.h,v 1.1 2011/09/13 11:22:07 reinoud Exp $ */
+/* $NetBSD: psl.h,v 1.2 2013/11/10 19:52:01 jmcneill Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -71,6 +71,9 @@
#define PSL_CLEARSIG (PSL_T | PSL_VM | PSL_AC | PSL_D)
+#elif defined(__arm__)
+
+/* ... */
#else
#error port me
Index: src/sys/arch/usermode/include/vmparam.h
diff -u src/sys/arch/usermode/include/vmparam.h:1.16 src/sys/arch/usermode/include/vmparam.h:1.17
--- src/sys/arch/usermode/include/vmparam.h:1.16 Wed Feb 8 17:55:21 2012
+++ src/sys/arch/usermode/include/vmparam.h Sun Nov 10 19:52:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.16 2012/02/08 17:55:21 reinoud Exp $ */
+/* $NetBSD: vmparam.h,v 1.17 2013/11/10 19:52:01 jmcneill Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcne...@invisible.ca>
@@ -77,6 +77,15 @@ extern paddr_t kmem_user_start, kmem_use
#define MAXDSIZ (8L * 1024 * 1024 * 1024)
#define DFLSSIZ (4 * 1024 * 1024)
#define DFLDSIZ (256 * 1024 * 1024)
+#elif defined(__arm__)
+#define PAGE_SHIFT 12
+#define PAGE_SIZE (1 << PAGE_SHIFT)
+#define PAGE_MASK (PAGE_SIZE - 1)
+#define MAXSSIZ (64 * 1024 * 1024)
+#define MAXTSIZ (64 * 1024 * 1024)
+#define MAXDSIZ (3U * 1024 * 1024 * 1024)
+#define DFLSSIZ (2 * 1024 * 1024)
+#define DFLDSIZ (256 * 1024 * 1024)
#else
#error "platform not supported"
#endif
