diff options
| author | Ryan Libby <rlibby@FreeBSD.org> | 2020-12-27 22:33:13 +0000 |
|---|---|---|
| committer | Ryan Libby <rlibby@FreeBSD.org> | 2020-12-27 22:33:13 +0000 |
| commit | 48184e76619d4ac16300d45cfd9407e4aa388a58 (patch) | |
| tree | cad121c248b04b4d44cf4fa0215f276c7edc0cfe | |
| parent | e67d933d9c068328781cce46df400fc8782e6365 (diff) | |
| download | src-48184e76619d4ac16300d45cfd9407e4aa388a58.tar.gz src-48184e76619d4ac16300d45cfd9407e4aa388a58.zip | |
Merge commit c7500ded3 from openzfs git (by Ryan Libby):
FreeBSD libzfs: gcc requires __thread after static
Building libzfs with gcc on FreeBSD failed because gcc is picky about
the order of keywords in declarations with __thread, whereas clang is
more relaxed.
https://gcc.gnu.org/onlinedocs/gcc/Thread-Local.html
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Ryan Libby <rlibby@FreeBSD.org>
Closes #11331
| -rw-r--r-- | sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c b/sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c index 2de90c7ceea5..0e8a3b12176b 100644 --- a/sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c +++ b/sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c @@ -178,7 +178,7 @@ execvpe(const char *name, char * const argv[], char * const envp[]) #define ERRBUFLEN 256 -__thread static char errbuf[ERRBUFLEN]; +static __thread char errbuf[ERRBUFLEN]; const char * libzfs_error_init(int error) |