Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch provide __HAVE_COMPAT_NETBSD32 and fix multiple inc...
details: https://anonhg.NetBSD.org/src/rev/ab8293861033
branches: trunk
changeset: 350911:ab8293861033
user: christos <christos%NetBSD.org@localhost>
date: Thu Jan 26 15:55:08 2017 +0000
description:
provide __HAVE_COMPAT_NETBSD32 and fix multiple include protection consistently.
diffstat:
sys/arch/acorn32/include/types.h | 7 ++++---
sys/arch/algor/include/types.h | 8 +++++++-
sys/arch/amd64/include/types.h | 9 +++++----
sys/arch/arc/include/types.h | 9 +++++++--
sys/arch/arm/include/types.h | 3 ++-
sys/arch/cats/include/types.h | 3 ++-
sys/arch/cobalt/include/types.h | 8 +++++++-
sys/arch/epoc32/include/types.h | 9 ++++++++-
sys/arch/evbarm/include/types.h | 3 ++-
sys/arch/evbmips/include/types.h | 8 +++++++-
sys/arch/evbppc/include/types.h | 8 +++++++-
sys/arch/hpcarm/include/types.h | 3 ++-
sys/arch/iyonix/include/types.h | 3 ++-
sys/arch/mips/include/types.h | 9 +++++----
sys/arch/netwinder/include/types.h | 7 ++++---
sys/arch/ofppc/include/types.h | 8 +++++++-
sys/arch/pmax/include/types.h | 8 +++++++-
sys/arch/powerpc/include/types.h | 9 +++++----
sys/arch/riscv/include/types.h | 3 ++-
sys/arch/sbmips/include/types.h | 8 +++++++-
sys/arch/sgimips/include/types.h | 8 +++++++-
sys/arch/shark/include/types.h | 3 ++-
sys/arch/sparc64/include/types.h | 9 ++++++++-
sys/arch/usermode/include/types.h | 9 +++++----
sys/arch/zaurus/include/types.h | 3 ++-
25 files changed, 123 insertions(+), 42 deletions(-)
diffs (truncated from 477 to 300 lines):
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/acorn32/include/types.h
--- a/sys/arch/acorn32/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/acorn32/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,9 +1,10 @@
-/* $NetBSD: types.h,v 1.7 2008/01/20 18:09:04 joerg Exp $ */
+/* $NetBSD: types.h,v 1.8 2017/01/26 15:55:08 christos Exp $ */
-#ifndef _ARM32_TYPES_H_
-#define _ARM32_TYPES_H_
+#ifndef _ACORN32_TYPES_H_
+#define _ACORN32_TYPES_H_
#include <arm/arm32/types.h>
#define __HAVE_DEVICE_REGISTER
+#define __HAVE_COMPAT_NETBSD32
#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/algor/include/types.h
--- a/sys/arch/algor/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/algor/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,5 +1,11 @@
-/* $NetBSD: types.h,v 1.6 2011/07/13 04:53:39 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.7 2017/01/26 15:55:09 christos Exp $ */
+
+#ifndef _ALGOR_TYPES_H_
+#define _ALGOR_TYPES_H_
#include <mips/types.h>
#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_COMPAT_NETBSD32
+
+#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/amd64/include/types.h
--- a/sys/arch/amd64/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/amd64/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.51 2016/02/27 00:09:45 tls Exp $ */
+/* $NetBSD: types.h,v 1.52 2017/01/26 15:55:09 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -31,8 +31,8 @@
* @(#)types.h 7.5 (Berkeley) 3/9/91
*/
-#ifndef _X86_64_MACHTYPES_H_
-#define _X86_64_MACHTYPES_H_
+#ifndef _X86_64_TYPES_H_
+#define _X86_64_TYPES_H_
#ifdef __x86_64__
@@ -95,6 +95,7 @@
#define __HAVE_COMMON___TLS_GET_ADDR
#define __HAVE_INTR_CONTROL
#define __HAVE_CPU_RNG
+#define __HAVE_COMPAT_NETBSD32
#ifdef _KERNEL_OPT
#define __HAVE_RAS
@@ -117,4 +118,4 @@
#endif /* __x86_64__ */
-#endif /* _X86_64_MACHTYPES_H_ */
+#endif /* _X86_64_TYPES_H_ */
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/arc/include/types.h
--- a/sys/arch/arc/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/arc/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,9 +1,14 @@
-/* $NetBSD: types.h,v 1.23 2011/07/17 01:36:51 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.24 2017/01/26 15:55:09 christos Exp $ */
+
+#ifndef _ARC_TYPES_H_
+#define _ARC_TYPES_H_
#define _MIPS_PADDR_T_64BIT
#include <mips/types.h>
#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_COMPAT_NETBSD32
+#define __HAVE_MIPS_MACHDEP_CACHE_CONFIG
-#define __HAVE_MIPS_MACHDEP_CACHE_CONFIG
+#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/arm/include/types.h
--- a/sys/arch/arm/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/arm/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.32 2016/01/23 22:31:19 christos Exp $ */
+/* $NetBSD: types.h,v 1.33 2017/01/26 15:55:09 christos Exp $ */
/*
* Copyright (c) 1990 The Regents of the University of California.
@@ -90,6 +90,7 @@
#if defined(__ARM_EABI__) && defined(_ARM_ARCH_6)
#define __HAVE_ATOMIC64_OPS
#endif
+#define __HAVE_COMPAT_NETBSD32
#if defined(_KERNEL) || defined(_KMEMUSER)
#define PCU_FPU 0
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/cats/include/types.h
--- a/sys/arch/cats/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/cats/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.13 2013/08/17 20:21:38 matt Exp $ */
+/* $NetBSD: types.h,v 1.14 2017/01/26 15:55:09 christos Exp $ */
#ifndef _CATS_TYPES_H_
#define _CATS_TYPES_H_
@@ -6,5 +6,6 @@
#define __HAVE_FAST_SOFTINTS
#include <arm/arm32/types.h>
#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_COMPAT_NETBSD32
#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/cobalt/include/types.h
--- a/sys/arch/cobalt/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/cobalt/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,5 +1,11 @@
-/* $NetBSD: types.h,v 1.11 2011/07/17 01:36:51 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.12 2017/01/26 15:55:09 christos Exp $ */
+
+#ifndef _COBALT_TYPES_H_
+#define _COBALT_TYPES_H_
#include <mips/types.h>
#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_COMPAT_NETBSD32
+
+#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/epoc32/include/types.h
--- a/sys/arch/epoc32/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/epoc32/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,3 +1,10 @@
-/* $NetBSD: types.h,v 1.3 2013/05/07 20:42:46 matt Exp $ */
+/* $NetBSD: types.h,v 1.4 2017/01/26 15:55:09 christos Exp $ */
+
+#ifndef _EPOC32_TYPES_H_
+#define _EPOC32_TYPES_H_
#include <arm/arm32/types.h>
+
+#define __HAVE_COMPAT_NETBSD32
+
+#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/evbarm/include/types.h
--- a/sys/arch/evbarm/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/evbarm/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.12 2011/11/26 16:31:40 skrll Exp $ */
+/* $NetBSD: types.h,v 1.13 2017/01/26 15:55:09 christos Exp $ */
#ifndef _EVBARM_TYPES_H_
#define _EVBARM_TYPES_H_
@@ -6,5 +6,6 @@
#include <arm/arm32/types.h>
#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_COMPAT_NETBSD32
#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/evbmips/include/types.h
--- a/sys/arch/evbmips/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/evbmips/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,7 +1,13 @@
-/* $NetBSD: types.h,v 1.9 2011/07/17 01:36:51 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.10 2017/01/26 15:55:09 christos Exp $ */
+
+#ifndef _EVBMIPS_TYPES_H_
+#define _EVBMIPS_TYPES_H_
#define _MIPS_PADDR_T_64BIT
#include <mips/types.h>
#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_COMPAT_NETBSD32
+
+#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/evbppc/include/types.h
--- a/sys/arch/evbppc/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/evbppc/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,5 +1,11 @@
-/* $NetBSD: types.h,v 1.10 2011/07/17 23:23:53 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.11 2017/01/26 15:55:09 christos Exp $ */
+
+#ifndef _EVBPPC_TYPES_H_
+#define _EVBPPC_TYPES_H_
#include <powerpc/types.h>
#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_COMPAT_NETBSD32
+
+#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/hpcarm/include/types.h
--- a/sys/arch/hpcarm/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/hpcarm/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.15 2013/05/07 20:42:46 matt Exp $ */
+/* $NetBSD: types.h,v 1.16 2017/01/26 15:55:09 christos Exp $ */
#ifndef _HPCARM_TYPES_H_
#define _HPCARM_TYPES_H_
@@ -6,6 +6,7 @@
#include <arm/arm32/types.h>
#define __HAVE_DEVICE_REGISTER
+#define __HAVE_COMPAT_NETBSD32
#define __GENERIC_SOFT_INTERRUPTS_ALL_LEVELS
#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/iyonix/include/types.h
--- a/sys/arch/iyonix/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/iyonix/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.9 2011/07/17 23:46:49 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.10 2017/01/26 15:55:09 christos Exp $ */
#ifndef _IYONIX_TYPES_H_
#define _IYONIX_TYPES_H_
@@ -6,5 +6,6 @@
#include <arm/arm32/types.h>
#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_COMPAT_NETBSD32
#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/mips/include/types.h
--- a/sys/arch/mips/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/mips/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.64 2016/07/11 16:15:35 matt Exp $ */
+/* $NetBSD: types.h,v 1.65 2017/01/26 15:55:10 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -34,8 +34,8 @@
* @(#)types.h 8.3 (Berkeley) 1/5/94
*/
-#ifndef _MACHTYPES_H_
-#define _MACHTYPES_H_
+#ifndef _MIPS_TYPES_H_
+#define _MIPS_TYPES_H_
#include <sys/cdefs.h>
#include <sys/featuretest.h>
@@ -168,5 +168,6 @@
#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
#define __HAVE_MM_MD_KERNACC
#define __HAVE_MM_MD_CACHE_ALIASING
+#define __HAVE_COMPAT_NETBSD32
-#endif /* _MACHTYPES_H_ */
+#endif /* _MIPS_TYPES_H_ */
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/netwinder/include/types.h
--- a/sys/arch/netwinder/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/netwinder/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,10 +1,11 @@
-/* $NetBSD: types.h,v 1.11 2011/07/17 23:46:49 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.12 2017/01/26 15:55:10 christos Exp $ */
-#ifndef _ARM32_TYPES_H_
-#define _ARM32_TYPES_H_
+#ifndef _NETWINDER_TYPES_H_
+#define _NETWINDER_TYPES_H_
#include <arm/arm32/types.h>
#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_COMPAT_NETBSD32
#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/ofppc/include/types.h
--- a/sys/arch/ofppc/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/ofppc/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,5 +1,11 @@
-/* $NetBSD: types.h,v 1.11 2011/07/17 23:23:53 dyoung Exp $ */
+/* $NetBSD: types.h,v 1.12 2017/01/26 15:55:10 christos Exp $ */
+
+#ifndef _OFPPC_TYPES_H_
+#define _OFPPC_TYPES_H_
#define __HAVE_NEW_STYLE_BUS_H
+#define __HAVE_COMPAT_NETBSD32
#include <powerpc/types.h>
+
+#endif
diff -r 54ea5c2895a6 -r ab8293861033 sys/arch/pmax/include/types.h
--- a/sys/arch/pmax/include/types.h Thu Jan 26 15:54:31 2017 +0000
+++ b/sys/arch/pmax/include/types.h Thu Jan 26 15:55:08 2017 +0000
@@ -1,9 +1,15 @@
Home |
Main Index |
Thread Index |
Old Index