Date: Sun, 27 Dec 2020 23:03:40 GMT From: Ryan Libby <rlibby@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: 48184e76619d - main - Merge commit c7500ded3 from openzfs git (by Ryan Libby): Message-ID: <202012272303.0BRN3e5A008663@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by rlibby: URL: https://cgit.FreeBSD.org/src/commit/?id=48184e76619d4ac16300d45cfd9407e4aa388a58 commit 48184e76619d4ac16300d45cfd9407e4aa388a58 Author: Ryan Libby <rlibby@FreeBSD.org> AuthorDate: 2020-12-27 22:33:13 +0000 Commit: Ryan Libby <rlibby@FreeBSD.org> CommitDate: 2020-12-27 22:33:13 +0000 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 --- sys/contrib/openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012272303.0BRN3e5A008663>