diff options
| author | Alex Richardson <arichardson@FreeBSD.org> | 2020-08-07 16:04:21 +0000 |
|---|---|---|
| committer | Alex Richardson <arichardson@FreeBSD.org> | 2020-08-07 16:04:21 +0000 |
| commit | 11412d5bc9215d065730856cea8c8a1b861ab3e7 (patch) | |
| tree | bfa15b46b8822b96e5311fd14e1d4f740dc40171 /sys/cddl/compat/opensolaris | |
| parent | 0d834e0f4dc9612016d8124921d21531c8389088 (diff) | |
| download | src-11412d5bc9215d065730856cea8c8a1b861ab3e7.tar.gz src-11412d5bc9215d065730856cea8c8a1b861ab3e7.zip | |
Fix linker error in libuutil with recent LLVM
Not marking the function as static can result in a linker error:
undefined reference to __assfail [--no-allow-shlib-undefined]
I noticed this error after updating our CHERI LLVM to the latest upstream
LLVM HEAD revision.
This change effectively reverts r329984 and marks dmu_buf_init_user as
static (which keeps the GCC build happy).
Reviewed By: #zfs, asomers, freqlabs, mav
Differential Revision: https://reviews.freebsd.org/D25663
Notes
Notes:
svn path=/head/; revision=364027
Diffstat (limited to 'sys/cddl/compat/opensolaris')
| -rw-r--r-- | sys/cddl/compat/opensolaris/sys/assfail.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/cddl/compat/opensolaris/sys/assfail.h b/sys/cddl/compat/opensolaris/sys/assfail.h index 4f10a878d372..553da6983538 100644 --- a/sys/cddl/compat/opensolaris/sys/assfail.h +++ b/sys/cddl/compat/opensolaris/sys/assfail.h @@ -48,9 +48,7 @@ void assfail3(const char *, uintmax_t, const char *, uintmax_t, const char *, #ifndef HAVE_ASSFAIL extern int aok; -__inline int __assfail(const char *expr, const char *file, int line); - -__inline int +static __inline int __assfail(const char *expr, const char *file, int line) { |