Date: Mon, 22 Aug 2022 11:53:36 GMT From: "Tobias C. Berner" <tcberner@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fb49e0f87bec - main - qt6: fix build on i386 Message-ID: <202208221153.27MBra01072814@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=fb49e0f87bec9d93bc94d1ba54dde9e33b177e6c commit fb49e0f87bec9d93bc94d1ba54dde9e33b177e6c Author: Tobias C. Berner <tcberner@FreeBSD.org> AuthorDate: 2022-08-22 11:23:15 +0000 Commit: Tobias C. Berner <tcberner@FreeBSD.org> CommitDate: 2022-08-22 11:52:45 +0000 qt6: fix build on i386 --- devel/qt6-base/files/patch-src_corelib_thread_qthread.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/devel/qt6-base/files/patch-src_corelib_thread_qthread.h b/devel/qt6-base/files/patch-src_corelib_thread_qthread.h new file mode 100644 index 000000000000..76928aa5a1ce --- /dev/null +++ b/devel/qt6-base/files/patch-src_corelib_thread_qthread.h @@ -0,0 +1,17 @@ +--- src/corelib/thread/qthread.h.orig 2022-08-20 09:18:52 UTC ++++ src/corelib/thread/qthread.h +@@ -191,12 +191,12 @@ inline Qt::HANDLE QThread::currentThreadId() noexcept + Qt::HANDLE tid; // typedef to void* + static_assert(sizeof(tid) == sizeof(void*)); + // See https://akkadia.org/drepper/tls.pdf for x86 ABI +-#if defined(Q_PROCESSOR_X86_32) && defined(Q_OS_LINUX) && defined(__GLIBC__) // x86 32-bit always uses GS ++#if defined(Q_PROCESSOR_X86_32) && ((defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)) // x86 32-bit always uses GS + __asm__("movl %%gs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : ); + #elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_DARWIN64) + // 64bit macOS uses GS, see https://github.com/apple/darwin-xnu/blob/master/libsyscall/os/tsd.h + __asm__("movq %%gs:0, %0" : "=r" (tid) : : ); +-#elif defined(Q_PROCESSOR_X86_64) && (defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD) ++#elif defined(Q_PROCESSOR_X86_64) && ((defined(Q_OS_LINUX) && defined(__GLIBC__)) || defined(Q_OS_FREEBSD)) + // x86_64 Linux, BSD uses FS + __asm__("movq %%fs:%c1, %0" : "=r" (tid) : "i" (2 * sizeof(void*)) : ); + #elif defined(Q_PROCESSOR_X86_64) && defined(Q_OS_WIN)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208221153.27MBra01072814>