[src/trunk]: src/sys/arch/usermode/include support building on arm

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/55a1d1dedecb
branches:  trunk
changeset: 791260:55a1d1dedecb
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Nov 10 19:52:01 2013 +0000

description:
support building on arm

diffstat:

 sys/arch/usermode/include/ansi.h             |   7 ++++++-
 sys/arch/usermode/include/asm.h              |   6 ++++--
 sys/arch/usermode/include/bswap.h            |   6 ++++--
 sys/arch/usermode/include/byte_swap.h        |   6 ++++--
 sys/arch/usermode/include/cdefs.h            |   6 ++++--
 sys/arch/usermode/include/disklabel.h        |   6 ++++--
 sys/arch/usermode/include/elf_machdep.h      |   9 +++++++--
 sys/arch/usermode/include/endian.h           |   6 ++++--
 sys/arch/usermode/include/endian_machdep.h   |   6 ++++--
 sys/arch/usermode/include/genheaders.sh      |  16 ++++++++++++++++
 sys/arch/usermode/include/int_const.h        |   6 ++++--
 sys/arch/usermode/include/int_fmtio.h        |   6 ++++--
 sys/arch/usermode/include/int_limits.h       |   6 ++++--
 sys/arch/usermode/include/int_mwgwtypes.h    |   6 ++++--
 sys/arch/usermode/include/int_types.h        |   6 ++++--
 sys/arch/usermode/include/limits.h           |   6 ++++--
 sys/arch/usermode/include/netbsd32_machdep.h |   6 ++++--
 sys/arch/usermode/include/param.h            |  14 ++++++++++++--
 sys/arch/usermode/include/psl.h              |   5 ++++-
 sys/arch/usermode/include/ptrace.h           |   6 ++++--
 sys/arch/usermode/include/vmparam.h          |  11 ++++++++++-
 sys/arch/usermode/include/wchar_limits.h     |   6 ++++--
 22 files changed, 119 insertions(+), 39 deletions(-)

diffs (truncated from 522 to 300 lines):

diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/ansi.h
--- a/sys/arch/usermode/include/ansi.h  Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/ansi.h  Sun Nov 10 19:52:01 2013 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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
diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/asm.h
--- a/sys/arch/usermode/include/asm.h   Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/asm.h   Sun Nov 10 19:52:01 2013 +0000
@@ -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
diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/bswap.h
--- a/sys/arch/usermode/include/bswap.h Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/bswap.h Sun Nov 10 19:52:01 2013 +0000
@@ -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
diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/byte_swap.h
--- a/sys/arch/usermode/include/byte_swap.h     Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/byte_swap.h     Sun Nov 10 19:52:01 2013 +0000
@@ -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
diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/cdefs.h
--- a/sys/arch/usermode/include/cdefs.h Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/cdefs.h Sun Nov 10 19:52:01 2013 +0000
@@ -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
diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/disklabel.h
--- a/sys/arch/usermode/include/disklabel.h     Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/disklabel.h     Sun Nov 10 19:52:01 2013 +0000
@@ -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
diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/elf_machdep.h
--- a/sys/arch/usermode/include/elf_machdep.h   Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/elf_machdep.h   Sun Nov 10 19:52:01 2013 +0000
@@ -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
diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/endian.h
--- a/sys/arch/usermode/include/endian.h        Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/endian.h        Sun Nov 10 19:52:01 2013 +0000
@@ -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
diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/endian_machdep.h
--- a/sys/arch/usermode/include/endian_machdep.h        Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/endian_machdep.h        Sun Nov 10 19:52:01 2013 +0000
@@ -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
diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/genheaders.sh
--- a/sys/arch/usermode/include/genheaders.sh   Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/genheaders.sh   Sun Nov 10 19:52:01 2013 +0000
@@ -39,6 +39,8 @@
 #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 @@
                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 @@
                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}
diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/int_const.h
--- a/sys/arch/usermode/include/int_const.h     Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/int_const.h     Sun Nov 10 19:52:01 2013 +0000
@@ -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
diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/int_fmtio.h
--- a/sys/arch/usermode/include/int_fmtio.h     Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/int_fmtio.h     Sun Nov 10 19:52:01 2013 +0000
@@ -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
diff -r b33203fc178e -r 55a1d1dedecb sys/arch/usermode/include/int_limits.h
--- a/sys/arch/usermode/include/int_limits.h    Sun Nov 10 19:51:00 2013 +0000
+++ b/sys/arch/usermode/include/int_limits.h    Sun Nov 10 19:52:01 2013 +0000
@@ -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 @@