From patchwork Wed Jul 14 14:59:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 476752 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp653271jao; Wed, 14 Jul 2021 08:04:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzEb4Kt7q4B8Zx7+ssEGph1gQAAywSRoojj63gtzkBQH1vbSENjYwgIqpuSWjrSKcGVOaXR X-Received: by 2002:a05:6102:22ca:: with SMTP id a10mr14473172vsh.3.1626275081340; Wed, 14 Jul 2021 08:04:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626275081; cv=none; d=google.com; s=arc-20160816; b=jwBK1pbSU/tV0cu+Quv/X7HOuQ+n8LCyfEgrCmZZ+ut5zL8UGPcSweBzeXZpRwTqmP cEn4sFedtgRvS8xuY/ujXhOGiySdiQnQ2oB4pcvKJgSTMf0hX2OOLzWDchW3U6xMRHd1 r4K3DIwUgD/fJLyN5xMa5k8NX4+qb8uM0WrQcSNQyTb9U9vsF2ptF84JUMIAE9jhnEnC zmWhAy5jr3oxMC4k9jIxBlLLeC3kiqUs1AVCsJISv6t9MccLBrn6jP/EB8lqHpsRcRWQ RbDxlrxNyxbo8+8dJ7VsArNO2F3711L0LqoB8p3qpUcsv7r7pXBldHil+ZMw20S6cNrp 4KoA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=7QlwsDUzHRky2/jFVyHRCsmVdgTIo09E0XCwj4H/aaU=; b=isN5jAxqWxYEHFxGzwT+XFzahKC9pbZwZ+vaKajZIO+36B7+qD3Q9Vv3q64CsezICQ LEs8q8WKGWjt3zGLX4HUIssRNEUe4rjKTTpYI+KegBz83fGt2iUBz3d9E9GH7PXQWx8d pBx412GLSkGGdX8C3FLfvOTt1LjAuSfTRgph3OCRPmNUn/RafG17lf9SDIhASP+kKoGB Sf9wdNGs0BRm5klWSGMD2inpgtvR9usHiMLtsWJFU5bav48Hyz+QzzHlAxu2O14cQnBO OIG4iEMpvEFIWL+rLWWs5Cc3nQ5fAum74k/W9MpQQonr1OlA0V1gl/zipUt9f/zhl67L e7zw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tiGNv0CR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d1si3308780uam.215.2021.07.14.08.04.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 14 Jul 2021 08:04:41 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=tiGNv0CR; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:55740 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m3gRE-00069w-JQ for patch@linaro.org; Wed, 14 Jul 2021 11:04:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m3gNY-00079s-8j for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:52 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:42675) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m3gNW-0007UV-Cs for qemu-devel@nongnu.org; Wed, 14 Jul 2021 11:00:51 -0400 Received: by mail-wm1-x32b.google.com with SMTP id l4-20020a05600c4f04b0290220f8455631so1642247wmq.1 for ; Wed, 14 Jul 2021 08:00:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7QlwsDUzHRky2/jFVyHRCsmVdgTIo09E0XCwj4H/aaU=; b=tiGNv0CRuJcAGEFuEJtYQEigvp2UlYc59hBbf1Pg8ON8z6x38/jUnvQEgWOiJvIENW CtECJK751xJsHNJPz+A5h61avDQson7y/nCXUkbVhFUA+s77DaGxFvK3AabNvQH8kkEm OJeQ2JlCat2FGUbqrsdf7KXZwGrt9v7LUJHn3f3MUA64S9nuDY+5PbQPuMEfSQuiK0ZD x8gjvbr+lZZDZ4OtRNqMlF/8dFm9UKMrJpQouPKJk7rX4VDqzjsj7bdl4oCM74CkRyFy BJdwPwPzV2XAggL1wQfUqXrf0h4LZA7xPl3xcrXEHT0W8Btt3Vb4y55Yk6ASkrtGQQ3x URrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7QlwsDUzHRky2/jFVyHRCsmVdgTIo09E0XCwj4H/aaU=; b=GAbGITNySZ7MkZ5GyzIJQ/GRpPOrHjRG+rJP3dm1jEAHSRXb0gzn+DCWSTHr+iZJY4 fL0AI8Mqiox4AD9vt3vKtR69sgy1d4V9ozwtHNn6U3/DdNu7cgTX6B51RSnmb2v19yhM jz5ekOC5jYrEjudnvAB/7VdqRznD81JFmtuOm/3vAmIpGqKmA3Rt+PNV1c/3B1RA1fnL axTuuguLWMjrIcsisAiBxN0KWg3wdeKq95n1ut6cE8by++JtMnHXI3bPEwiaGB/pu+JV k3f5iQb8cD2narpjCmIpkjo8Xdwn6iTzrKuAqWvW019qEIaAxFJeMroA5L8BUYfnuvIA ENbQ== X-Gm-Message-State: AOAM531Q4Tv7B1okJteTPY7TG7lR5tYYvc+vZ85HfRdbYCvVImw9qosj 34V5Cfo08JH5mCWMaEfyAqS4nQ== X-Received: by 2002:a1c:1bd0:: with SMTP id b199mr11521091wmb.108.1626274849072; Wed, 14 Jul 2021 08:00:49 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id s6sm3555423wrt.45.2021.07.14.08.00.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 08:00:42 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6D0F81FF93; Wed, 14 Jul 2021 16:00:37 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= 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> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210714150036.21060-1-alex.bennee@linaro.org> References: <20210714150036.21060-1-alex.bennee@linaro.org> MIME-Version: 1.0 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 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Paolo Bonzini 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 Message-Id: <20210712122208.456264-1-pbonzini@redhat.com> [AJB: manually merged typo fix] Signed-off-by: Alex Bennée -- 2.20.1 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