Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
Brian Behlendorf 2021-07-26 17:31:00 -07:00
parent 9776838cfb
commit 4bd99c11d7
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/os/freebsd/spl/sys/ccompile.h
View File

@ -36,12 +36,6 @@
extern "C" { extern "C" {
#endif #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) #if defined(INVARIANTS) && !defined(ZFS_DEBUG)
#define ZFS_DEBUG #define ZFS_DEBUG
#undef NDEBUG #undef NDEBUG

2
include/os/freebsd/spl/sys/cmn_err.h
View File

@ -71,7 +71,7 @@ extern void vuprintf(const char *, __va_list)
__attribute__((format(printf, 1, 0))); __attribute__((format(printf, 1, 0)));
extern void panic(const char *, ...) extern void panic(const char *, ...)
__attribute__((format(printf, 1, 2))) __NORETURN; __attribute__((format(printf, 1, 2)));
#endif /* !_ASM */ #endif /* !_ASM */