Remove overlooked __sun_attr__ based macros

The __NORETURN, __CONST, and __PURE macros in the FreeBSD platform
code were based on the __sun_attr__ macro which was removed in
commit 5dbf6c5a6.  This caused a build failure because the
__NORETURN macro was still used in one place in kernel code.
The __CONST and __PURE macros were entirely unused.

Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Reviewed-by: George Melikov <mail@gmelikov.ru>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #12435

diff --git a/include/os/freebsd/spl/sys/ccompile.h b/include/os/freebsd/spl/sys/ccompile.h
index 9970443103bf8266f7362dffc978064e1dceb87d..23e637983475a013213db9f7056aa7403ca2fe99 100644 (file)
--- a/include/os/freebsd/spl/sys/ccompile.h
+++ b/include/os/freebsd/spl/sys/ccompile.h
@@ -36,12 +36,6 @@
 extern "C" {
 #endif
 
-#if    defined(_KERNEL) || defined(_STANDALONE)
-#define        __NORETURN              __sun_attr__((__noreturn__))
-#endif /* _KERNEL || _STANDALONE */
-#define        __CONST                 __sun_attr__((__const__))
-#define        __PURE                  __sun_attr__((__pure__))
-
 #if defined(INVARIANTS) && !defined(ZFS_DEBUG)
 #define        ZFS_DEBUG
 #undef         NDEBUG

diff --git a/include/os/freebsd/spl/sys/cmn_err.h b/include/os/freebsd/spl/sys/cmn_err.h
index bf41ecdb286db57ef84fa283832c624cdd955a87..ddc2f0049e59acf577414d559a148285be4f3a8c 100644 (file)
--- a/include/os/freebsd/spl/sys/cmn_err.h
+++ b/include/os/freebsd/spl/sys/cmn_err.h
@@ -71,7 +71,7 @@ extern void vuprintf(const char *, __va_list)
     __attribute__((format(printf, 1, 0)));
 
 extern void panic(const char *, ...)
-    __attribute__((format(printf, 1, 2))) __NORETURN;
+    __attribute__((format(printf, 1, 2)));
 
 #endif /* !_ASM */