diff mbox series

[PULL,v5,07/44] disable modular TCG on Darwin

Message ID	20210714150036.21060-8-alex.bennee@linaro.org
State	Accepted
Commit	a1b176f9046a94ae963099a055cde2323dc7c012
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Subject: [PULL v5 07/44] disable modular TCG on Darwin Date: Wed, 14 Jul 2021 15:59:59 +0100 Message-Id: <20210714150036.21060-8-alex.bennee@linaro.org> In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action Precedence: list Cc: Paolo Bonzini <pbonzini@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	testing, build and plugin updates \| expand [PULL,v5,00/44] testing, build and plugin updates [PULL,v5,01/44] Jobs based on custom runners: documentation and configuration placeholder [PULL,v5,02/44] Jobs based on custom runners: build environment docs and playbook [PULL,v5,03/44] Jobs based on custom runners: docs and gitlab-runner setup playbook [PULL,v5,04/44] Jobs based on custom runners: add job definitions for QEMU's machines [PULL,v5,05/44] tests/tcg: also disable the signals test for plugins [PULL,v5,06/44] meson: fix condition for io_uring stubs [PULL,v5,07/44] disable modular TCG on Darwin [PULL,v5,08/44] build: validate that system capstone works before using it [PULL,v5,09/44] gitlab: support for FreeBSD 12, 13 and macOS 11 via cirrus-run [PULL,v5,10/44] cirrus: delete FreeBSD and macOS jobs [PULL,v5,11/44] hw/usb/ccid: remove references to NSS [PULL,v5,12/44] tests/docker: don't use BUILDKIT in GitLab either [PULL,v5,13/44] tests/docker: use project specific container registries [PULL,v5,14/44] tests/docker: use explicit docker.io registry [PULL,v5,15/44] tests/docker: remove FEATURES env var from templates [PULL,v5,16/44] tests/docker: fix sorting in package lists [PULL,v5,17/44] tests/docker: fix mistakes in centos package lists [PULL,v5,18/44] tests/docker: fix mistakes in fedora package list [PULL,v5,19/44] tests/docker: fix mistakes in ubuntu package lists [PULL,v5,20/44] tests/docker: remove mingw packages from Fedora [PULL,v5,21/44] tests/docker: expand centos8 package list [PULL,v5,22/44] tests/docker: expand fedora package list [PULL,v5,23/44] tests/docker: expand ubuntu1804 package list [PULL,v5,24/44] tests/docker: expand ubuntu2004 package list [PULL,v5,25/44] tests/docker: expand opensuse-leap package list [PULL,v5,26/44] tests/vm: update NetBSD to 9.2 [PULL,v5,27/44] tests/vm: update openbsd to release 6.9 [PULL,v5,28/44] tests/tcg: make test-mmap a little less aggressive [PULL,v5,29/44] plugins: fix-up handling of internal hostaddr for 32 bit [PULL,v5,30/44] meson.build: move TCG plugin summary output [PULL,v5,31/44] meson.build: relax the libdl test to one for the function dlopen [PULL,v5,32/44] tcg/plugins: remove some stale entries from the symbol list [PULL,v5,33/44] configure: don't allow plugins to be enabled for a non-TCG build [PULL,v5,34/44] configure: add an explicit static and plugins check [PULL,v5,35/44] configure: stop user enabling plugins on Windows for now [PULL,v5,36/44] tcg/plugins: enable by default for most TCG builds [PULL,v5,37/44] contrib/plugins: enable -Wall for building plugins [PULL,v5,38/44] contrib/plugins: add execlog to log instruction execution and memory access [PULL,v5,39/44] docs/devel: tcg-plugins: add execlog plugin description [PULL,v5,40/44] plugins: Added a new cache modelling plugin [PULL,v5,41/44] plugins/cache: Enable cache parameterization [PULL,v5,42/44] plugins/cache: Added FIFO and LRU eviction policies [PULL,v5,43/44] docs/devel: Added cache plugin to the plugins docs [PULL,v5,44/44] MAINTAINERS: Added myself as a reviewer for TCG Plugins

Commit Message

Alex Bennée July 14, 2021, 2:59 p.m. UTC

From: Paolo Bonzini <pbonzini@redhat.com>


Accelerator modularity does not work on Darwin:

ld: illegal thread local variable reference to regular symbol _current_cpu for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Fix by avoiding modular TCG builds.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

Message-Id: <20210712122208.456264-1-pbonzini@redhat.com>
[AJB: manually merged typo fix]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


-- 
2.20.1

diff mbox series

Patch

diff --git a/meson.build b/meson.build
index b0e2b9a8a0..512ee2e926 100644
--- a/meson.build
+++ b/meson.build
@@ -92,7 +92,11 @@  if cpu in ['x86', 'x86_64']
   }
 endif
 
-modular_tcg = ['i386-softmmu', 'x86_64-softmmu']
+modular_tcg = []
+# Darwin does not support references to thread-local variables in modules
+if targetos != 'darwin'
+  modular_tcg = ['i386-softmmu', 'x86_64-softmmu']
+endif
 
 edk2_targets = [ 'arm-softmmu', 'aarch64-softmmu', 'i386-softmmu', 'x86_64-softmmu' ]
 install_edk2_blobs = false