Module Name: src
Committed By: reinoud
Date: Fri Jun 1 07:19:50 UTC 2018
Modified Files:
src/sys/arch/usermode/include: types.h
Log Message:
Fix compilation errors so NetBSD/usermode compiles under ./build.sh
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/usermode/include/types.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/types.h
diff -u src/sys/arch/usermode/include/types.h:1.13 src/sys/arch/usermode/include/types.h:1.14
--- src/sys/arch/usermode/include/types.h:1.13 Tue May 29 07:35:39 2018
+++ src/sys/arch/usermode/include/types.h Fri Jun 1 07:19:50 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.13 2018/05/29 07:35:39 reinoud Exp $ */
+/* $NetBSD: types.h,v 1.14 2018/06/01 07:19:50 reinoud Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <[email protected]>
@@ -40,9 +40,31 @@ typedef struct label_t {
#endif
#if defined(_KERNEL) || defined(_KMEMUSER) || defined(_KERNTYPES) || defined(_STANDALONE)
+#if defined(__i386__) || defined(__arm__)
typedef unsigned long paddr_t;
typedef unsigned long psize_t;
-typedef unsigned long vaddr_t;
+typedef unsigned long __vaddr_t;
+typedef unsigned long vsize_t;
+typedef int register_t;
+
+#ifndef __x86_64__
+// XXX hack to allow for amd64->i386 crosscompile, why?
+#define PRIxPADDR "lx"
+#define PRIxPSIZE "lx"
+#define PRIuPSIZE "lu"
+#else
+#define PRIxPADDR "llx"
+#define PRIxPSIZE "llx"
+#define PRIuPSIZE "llu"
+#endif
+#define PRIxVADDR "lx"
+#define PRIxVSIZE "lx"
+#define PRIuVSIZE "lu"
+#define PRIxREGISTER "lx"
+#elif defined(__x86_64__)
+typedef unsigned long paddr_t;
+typedef unsigned long psize_t;
+typedef unsigned long __vaddr_t;
typedef unsigned long vsize_t;
typedef long int register_t;
#define PRIxPADDR "lx"
@@ -53,9 +75,11 @@ typedef long int register_t;
#define PRIuVSIZE "lu"
#define PRIxREGISTER "lx"
#endif
+#endif
+typedef __vaddr_t vaddr_t;
typedef unsigned char __cpu_simple_lock_nv_t;
-typedef long int __register_t;
+typedef register_t __register_t;
#define __CPU_SIMPLE_LOCK_PAD
