Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd linux: Move BUILD_BUG_* to common linux/bui...



details:   https://anonhg.NetBSD.org/src/rev/0b2699fbc954
branches:  trunk
changeset: 1028493:0b2699fbc954
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:10:41 2021 +0000

description:
linux: Move BUILD_BUG_* to common linux/build_bug.h.

diffstat:

 sys/external/bsd/common/include/asm/bug.h         |  15 +------
 sys/external/bsd/common/include/linux/build_bug.h |  47 +++++++++++++++++++++++
 2 files changed, 49 insertions(+), 13 deletions(-)

diffs (84 lines):

diff -r 95228018c660 -r 0b2699fbc954 sys/external/bsd/common/include/asm/bug.h
--- a/sys/external/bsd/common/include/asm/bug.h Sun Dec 19 11:10:25 2021 +0000
+++ b/sys/external/bsd/common/include/asm/bug.h Sun Dec 19 11:10:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bug.h,v 1.2 2021/12/19 11:01:37 riastradh Exp $        */
+/*     $NetBSD: bug.h,v 1.3 2021/12/19 11:10:41 riastradh Exp $        */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -35,22 +35,11 @@
 #include <sys/cdefs.h>
 #include <sys/systm.h>
 
-/*
- * static_assert is violated with runtime-only compiler semantics in a few
- * places. Instead of breaking the build, stop asserting these corner cases.
- */
-
-#define DRMCTASSERT(x) CTASSERT((__builtin_choose_expr(                \
-                       __builtin_constant_p(x), (x), 1)))
+#include <linux/build_bug.h>   /* XXX */
 
 #define        BUG()                   panic("%s:%d: BUG!", __FILE__, __LINE__)
 #define        BUG_ON(CONDITION)       KASSERT(!(CONDITION))
 
-#define        BUILD_BUG()             do {} while (0)
-#define        BUILD_BUG_ON(CONDITION) DRMCTASSERT(!(CONDITION))
-#define        BUILD_BUG_ON_MSG(CONDITION,MSG) DRMCTASSERT(!(CONDITION))
-#define        BUILD_BUG_ON_INVALID(EXPR)      ((void)sizeof((long)(EXPR)))
-
 /* XXX Rate limit?  */
 #define WARN(CONDITION, FMT, ...)                                      \
        linux_warning((CONDITION)?                                      \
diff -r 95228018c660 -r 0b2699fbc954 sys/external/bsd/common/include/linux/build_bug.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/external/bsd/common/include/linux/build_bug.h Sun Dec 19 11:10:41 2021 +0000
@@ -0,0 +1,47 @@
+/*     $NetBSD: build_bug.h,v 1.1 2021/12/19 11:10:41 riastradh Exp $  */
+
+/*-
+ * Copyright (c) 2020 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * 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.
+ */
+
+#ifndef        _LINUX_BUILD_BUG_H_
+#define        _LINUX_BUILD_BUG_H_
+
+#include <lib/libkern/libkern.h>
+
+/*
+ * static_assert is violated with runtime-only compiler semantics in a few
+ * places. Instead of breaking the build, stop asserting these corner cases.
+ */
+
+#define DRMCTASSERT(x) CTASSERT((__builtin_choose_expr(                \
+                       __builtin_constant_p(x), (x), 1)))
+
+#define        BUILD_BUG()             do {} while (0)
+#define        BUILD_BUG_ON(CONDITION) DRMCTASSERT(!(CONDITION))
+#define        BUILD_BUG_ON_MSG(CONDITION,MSG) DRMCTASSERT(!(CONDITION))
+#define        BUILD_BUG_ON_INVALID(EXPR)      ((void)sizeof((long)(EXPR)))
+
+#endif /* _LINUX_BUILD_BUG_H_ */



Home | Main Index | Thread Index | Old Index