From b38918d1b42265a4027902f9e25ec6c7020580df Mon Sep 17 00:00:00 2001 From: Jung-uk Kim Date: Fri, 1 Nov 2024 02:30:49 -0400 Subject: [PATCH] FreeBSD: Disable support for "-mtls-dialect" for FreeBSD Clang 19 supports "-mtls-dialect=" but FreeBSD does not support "-mtls-dialect=gnu2". Skip auto-detection for FreeBSD. Part-of: (cherry picked from commit f9fc7392fa49d4481ae70c32b8c69df0834e8ad0) --- .pick_status.json | 2 +- meson.build | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index c0edaef3ad0..1b67bc62986 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1454,7 +1454,7 @@ "description": "FreeBSD: Disable support for \"-mtls-dialect\" for FreeBSD", "nominated": false, "nomination_type": 0, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/meson.build b/meson.build index 597a32e9c98..1bd2bbc0a64 100644 --- a/meson.build +++ b/meson.build @@ -525,6 +525,8 @@ if not have_mtls_dialect # cross-compiling, but because this is just an optimization we can skip it if meson.is_cross_build() and not meson.can_run_host_binaries() warning('cannot auto-detect -mtls-dialect when cross-compiling, using compiler default') + elif host_machine.system() == 'freebsd' + warning('cannot use -mtls-dialect for FreeBSD, using compiler default') else # The way to specify the TLSDESC dialect is architecture-specific. # We probe both because there is not a fallback guaranteed to work for all